Skip to content

Commit 12e9f5b

Browse files
aslilacaslilac
authored
chore: upgrade to pnpm 10.33 (#24746)
1 parent 5afb297 commit 12e9f5b

7 files changed

Lines changed: 96 additions & 218 deletions

File tree

‎agent/agentcontainers/dcspec/gen.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
# While you can install it using npm, we have it in our devDependencies
66
# in ${PROJECT_ROOT}/package.json.
77
PROJECT_ROOT="$(git rev-parse --show-toplevel)"
8-
if ! pnpm list | grep quicktype &>/dev/null; then
8+
if ! pnpm -C "${PROJECT_ROOT}" list | grep quicktype &>/dev/null; then
99
echo "quicktype is required to run this script!"
1010
echo "Ensure that it is present in the devDependencies of ${PROJECT_ROOT}/package.json and then run pnpm install."
1111
exit 1
@@ -40,7 +40,7 @@ if [[ " $* " == *" --quiet "* ]] || [[ ${DCSPEC_QUIET:-false} == "true" ]]; then
4040
exec 2>"${TMPDIR}/stderr.log"
4141
fi
4242

43-
if ! pnpm exec quicktype \
43+
if ! pnpm -C "${PROJECT_ROOT}" exec quicktype \
4444
--src-lang schema \
4545
--lang go \
4646
--top-level "DevContainer" \

‎dogfood/coder/ubuntu-22.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ RUN source $NVM_DIR/nvm.sh && \
257257
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
258258
RUN corepack enable && \
259259
corepack prepare npm@10.8.1 --activate && \
260-
corepack prepare pnpm@10.14.0 --activate
260+
corepack prepare pnpm@10.33.2 --activate
261261

262262
RUN pnpx playwright@1.47.0 install --with-deps chromium
263263

‎dogfood/coder/ubuntu-26.04/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.edge.kernel.org/debian
88
RUN apt-get update && apt-get install -y libssl-dev openssl pkg-config build-essential
99
RUN cargo install jj-cli typos-cli watchexec-cli
1010

11-
FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1 AS go
11+
FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4 AS go
1212

1313
# Install Go manually, so that we can control the version
1414
ARG GO_VERSION=1.25.9
@@ -27,7 +27,7 @@ ENV PATH=$PATH:/usr/local/go/bin
2727
ARG GOPATH="/tmp/"
2828
# Install Go utilities.
2929
RUN apt-get update && \
30-
apt-get install --yes gcc && \
30+
apt-get install --yes build-essential && \
3131
mkdir --parents /usr/local/go && \
3232
tar --extract --gzip --directory=/usr/local/go --file=/usr/local/go.tar.gz --strip-components=1 && \
3333
mkdir --parents "$GOPATH" && \
@@ -67,7 +67,7 @@ RUN apt-get update && \
6767
# mockgen for generating mocks (v0.6.0+ required for Go 1.25)
6868
go install go.uber.org/mock/mockgen@v0.6.0 && \
6969
# Reduce image size.
70-
apt-get remove --yes gcc && \
70+
apt-get remove --yes build-essential && \
7171
apt-get autoremove --yes && \
7272
apt-get clean && \
7373
rm -rf /var/lib/apt/lists/* && \
@@ -83,7 +83,7 @@ RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/d
8383
unzip protoc.zip && \
8484
rm protoc.zip
8585

86-
FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1
86+
FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
8787

8888
SHELL ["/bin/bash", "-c"]
8989

@@ -255,7 +255,7 @@ RUN source $NVM_DIR/nvm.sh && \
255255
ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
256256
RUN corepack enable && \
257257
corepack prepare npm@10.8.1 --activate && \
258-
corepack prepare pnpm@10.14.0 --activate
258+
corepack prepare pnpm@10.33.2 --activate
259259

260260
RUN pnpx playwright@1.47.0 install --with-deps chromium
261261

‎offlinedocs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"engines": {
4444
"npm": ">=9.0.0 <10.0.0",
45-
"node": ">=18.0.0 <25.0.0"
45+
"node": ">=22.0.0 <25.0.0"
4646
},
4747
"pnpm": {
4848
"overrides": {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"_comment": "This version doesn't matter, it's just to allow importing from other repos.",
3-
"name": "coder",
3+
"name": "@coder/coder",
44
"version": "0.0.0",
5-
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
5+
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8",
66
"scripts": {
77
"format-docs": "markdown-table-formatter $(find docs -name '*.md') *.md",
88
"lint-docs": "markdownlint-cli2 --fix $(find docs -name '*.md') *.md",

‎site/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "coder-v2",
3-
"description": "Coder V2 (Workspaces V2)",
2+
"name": "@coder/coder",
3+
"description": "Coder",
44
"repository": "https://github.com/coder/coder",
55
"private": true,
66
"license": "AGPL-3.0",
7-
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
7+
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8",
88
"scripts": {
99
"build": "NODE_ENV=production pnpm vite build",
1010
"check": "biome check --error-on-warnings .",
@@ -195,7 +195,7 @@
195195
},
196196
"engines": {
197197
"pnpm": ">=10.0.0 <11.0.0",
198-
"node": ">=18.0.0 <25.0.0"
198+
"node": ">=22.0.0 <25.0.0"
199199
},
200200
"pnpm": {
201201
"overrides": {

0 commit comments

Comments
 (0)