From 12e9f5bb61b8efff18d0bc6c35d3f43f85d3ade4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kayla=20=E3=81=AF=E3=81=AA?= Date: Tue, 28 Apr 2026 12:12:13 -0600 Subject: [PATCH] chore: upgrade to pnpm 10.33 (#24746) --- agent/agentcontainers/dcspec/gen.sh | 4 +- dogfood/coder/ubuntu-22.04/Dockerfile | 2 +- dogfood/coder/ubuntu-26.04/Dockerfile | 10 +- offlinedocs/package.json | 2 +- package.json | 4 +- site/package.json | 8 +- site/static/icon/antigravity.svg | 284 ++++++++------------------ 7 files changed, 96 insertions(+), 218 deletions(-) diff --git a/agent/agentcontainers/dcspec/gen.sh b/agent/agentcontainers/dcspec/gen.sh index 4e24df9211..2e04cd1f11 100755 --- a/agent/agentcontainers/dcspec/gen.sh +++ b/agent/agentcontainers/dcspec/gen.sh @@ -5,7 +5,7 @@ set -euo pipefail # While you can install it using npm, we have it in our devDependencies # in ${PROJECT_ROOT}/package.json. PROJECT_ROOT="$(git rev-parse --show-toplevel)" -if ! pnpm list | grep quicktype &>/dev/null; then +if ! pnpm -C "${PROJECT_ROOT}" list | grep quicktype &>/dev/null; then echo "quicktype is required to run this script!" echo "Ensure that it is present in the devDependencies of ${PROJECT_ROOT}/package.json and then run pnpm install." exit 1 @@ -40,7 +40,7 @@ if [[ " $* " == *" --quiet "* ]] || [[ ${DCSPEC_QUIET:-false} == "true" ]]; then exec 2>"${TMPDIR}/stderr.log" fi -if ! pnpm exec quicktype \ +if ! pnpm -C "${PROJECT_ROOT}" exec quicktype \ --src-lang schema \ --lang go \ --top-level "DevContainer" \ diff --git a/dogfood/coder/ubuntu-22.04/Dockerfile b/dogfood/coder/ubuntu-22.04/Dockerfile index feb0e49aae..439a36f510 100644 --- a/dogfood/coder/ubuntu-22.04/Dockerfile +++ b/dogfood/coder/ubuntu-22.04/Dockerfile @@ -257,7 +257,7 @@ RUN source $NVM_DIR/nvm.sh && \ ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN corepack enable && \ corepack prepare npm@10.8.1 --activate && \ - corepack prepare pnpm@10.14.0 --activate + corepack prepare pnpm@10.33.2 --activate RUN pnpx playwright@1.47.0 install --with-deps chromium diff --git a/dogfood/coder/ubuntu-26.04/Dockerfile b/dogfood/coder/ubuntu-26.04/Dockerfile index 4955d8ec46..9e507996fe 100644 --- a/dogfood/coder/ubuntu-26.04/Dockerfile +++ b/dogfood/coder/ubuntu-26.04/Dockerfile @@ -8,7 +8,7 @@ RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.edge.kernel.org/debian RUN apt-get update && apt-get install -y libssl-dev openssl pkg-config build-essential RUN cargo install jj-cli typos-cli watchexec-cli -FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1 AS go +FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4 AS go # Install Go manually, so that we can control the version ARG GO_VERSION=1.25.9 @@ -27,7 +27,7 @@ ENV PATH=$PATH:/usr/local/go/bin ARG GOPATH="/tmp/" # Install Go utilities. RUN apt-get update && \ - apt-get install --yes gcc && \ + apt-get install --yes build-essential && \ mkdir --parents /usr/local/go && \ tar --extract --gzip --directory=/usr/local/go --file=/usr/local/go.tar.gz --strip-components=1 && \ mkdir --parents "$GOPATH" && \ @@ -67,7 +67,7 @@ RUN apt-get update && \ # mockgen for generating mocks (v0.6.0+ required for Go 1.25) go install go.uber.org/mock/mockgen@v0.6.0 && \ # Reduce image size. - apt-get remove --yes gcc && \ + apt-get remove --yes build-essential && \ apt-get autoremove --yes && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ @@ -83,7 +83,7 @@ RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/d unzip protoc.zip && \ rm protoc.zip -FROM ubuntu:resolute@sha256:cc925e589b7543b910fea57a240468940003fbfc0515245a495dd0ad8fe7cef1 +FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4 SHELL ["/bin/bash", "-c"] @@ -255,7 +255,7 @@ RUN source $NVM_DIR/nvm.sh && \ ENV PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN corepack enable && \ corepack prepare npm@10.8.1 --activate && \ - corepack prepare pnpm@10.14.0 --activate + corepack prepare pnpm@10.33.2 --activate RUN pnpx playwright@1.47.0 install --with-deps chromium diff --git a/offlinedocs/package.json b/offlinedocs/package.json index bdf53466da..5622dbbc49 100644 --- a/offlinedocs/package.json +++ b/offlinedocs/package.json @@ -42,7 +42,7 @@ }, "engines": { "npm": ">=9.0.0 <10.0.0", - "node": ">=18.0.0 <25.0.0" + "node": ">=22.0.0 <25.0.0" }, "pnpm": { "overrides": { diff --git a/package.json b/package.json index 46c56d10e9..e864c25dc8 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "_comment": "This version doesn't matter, it's just to allow importing from other repos.", - "name": "coder", + "name": "@coder/coder", "version": "0.0.0", - "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748", + "packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8", "scripts": { "format-docs": "markdown-table-formatter $(find docs -name '*.md') *.md", "lint-docs": "markdownlint-cli2 --fix $(find docs -name '*.md') *.md", diff --git a/site/package.json b/site/package.json index 93371d44ba..43552bafae 100644 --- a/site/package.json +++ b/site/package.json @@ -1,10 +1,10 @@ { - "name": "coder-v2", - "description": "Coder V2 (Workspaces V2)", + "name": "@coder/coder", + "description": "Coder", "repository": "https://github.com/coder/coder", "private": true, "license": "AGPL-3.0", - "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748", + "packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8", "scripts": { "build": "NODE_ENV=production pnpm vite build", "check": "biome check --error-on-warnings .", @@ -195,7 +195,7 @@ }, "engines": { "pnpm": ">=10.0.0 <11.0.0", - "node": ">=18.0.0 <25.0.0" + "node": ">=22.0.0 <25.0.0" }, "pnpm": { "overrides": { diff --git a/site/static/icon/antigravity.svg b/site/static/icon/antigravity.svg index 27a6fd53a2..085b15f8f3 100644 --- a/site/static/icon/antigravity.svg +++ b/site/static/icon/antigravity.svg @@ -1,219 +1,97 @@ - - - - + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +