From 55ed70999042847faa88ace84eda2a0cee8b05a0 Mon Sep 17 00:00:00 2001 From: Christian Fehmer Date: Thu, 22 Jan 2026 16:06:58 +0100 Subject: [PATCH 1/2] chore: update pnpm to 10.28.1 (@fehmer) --- .github/workflows/check-formatting.yml | 2 +- .github/workflows/fix-formatting.yml | 2 +- .github/workflows/monkey-ci.yml | 2 +- backend/docker/compose.yml | 2 +- docker/backend/Dockerfile | 4 ++-- docs/CONTRIBUTING_ADVANCED.md | 2 +- frontend/docker/compose.dev.yml | 2 +- package.json | 2 +- pnpm-workspace.yaml | 19 ++++++++++++++++--- 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index f425ff868a46..3b3c400a4937 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -1,7 +1,7 @@ name: Check formatting env: - PNPM_VERSION: "9.6.0" + PNPM_VERSION: "10.28.1" NODE_VERSION: "24.11.0" on: diff --git a/.github/workflows/fix-formatting.yml b/.github/workflows/fix-formatting.yml index f0b03e0def30..792f30e8e510 100644 --- a/.github/workflows/fix-formatting.yml +++ b/.github/workflows/fix-formatting.yml @@ -1,7 +1,7 @@ name: Fix formatting env: - PNPM_VERSION: "9.6.0" + PNPM_VERSION: "10.28.1" NODE_VERSION: "24.11.0" permissions: diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index b746ed1c504a..02217993414e 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -1,7 +1,7 @@ name: Monkey CI env: - PNPM_VERSION: "9.6.0" + PNPM_VERSION: "10.28.1" NODE_VERSION: "24.11.0" RECAPTCHA_SITE_KEY: "6Lc-V8McAAAAAJ7s6LGNe7MBZnRiwbsbiWts87aj" diff --git a/backend/docker/compose.yml b/backend/docker/compose.yml index 6b42b72c273b..8b76224c1328 100644 --- a/backend/docker/compose.yml +++ b/backend/docker/compose.yml @@ -24,7 +24,7 @@ services: build: dockerfile_inline: | FROM node:24.11.0 - RUN npm i -g pnpm@9.6.0 + RUN npm i -g pnpm@10.28.1 RUN mkdir /pnpm-store && chown -R 1000:1000 /pnpm-store user: "node" ##this works as long as your local user has uid=1000 restart: on-failure diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 4180d247e8a9..9ba0cf3f83ab 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -8,12 +8,12 @@ COPY packages packages COPY backend backend #gimme pnpm + build -RUN npm i -g pnpm && \ +RUN npm i -g pnpm@10.28.1 && \ pnpm i --frozen-lockfile && \ npm run build #deploy (install all non-dev dependencies in a single node_module folder) -RUN pnpm deploy --filter backend --prod /prod/backend +RUN pnpm deploy --legacy --filter backend --prod /prod/backend #--------------------------------- diff --git a/docs/CONTRIBUTING_ADVANCED.md b/docs/CONTRIBUTING_ADVANCED.md index b9b855a986b2..6291fc31ab73 100644 --- a/docs/CONTRIBUTING_ADVANCED.md +++ b/docs/CONTRIBUTING_ADVANCED.md @@ -38,7 +38,7 @@ If you use `nvm` (if you use Windows, use [nvm-windows](https://github.com/corey Alternatively, you can navigate to the NodeJS [website](https://nodejs.org/en/) to download it from there. -For package management, we use `pnpm` instead of `npm` or `yarn`. You can install it by running `npm i -g pnpm@9.6.0`. This will install `pnpm` globally on your machine. +For package management, we use `pnpm` instead of `npm` or `yarn`. You can install it by running `npm i -g pnpm@10.28.1`. This will install `pnpm` globally on your machine. ### Docker (Recommended but Optional) diff --git a/frontend/docker/compose.dev.yml b/frontend/docker/compose.dev.yml index 1eae287800f2..d4178e9bf1e2 100644 --- a/frontend/docker/compose.dev.yml +++ b/frontend/docker/compose.dev.yml @@ -5,7 +5,7 @@ services: build: dockerfile_inline: | FROM node:24.11.0 - RUN npm i -g pnpm@9.6.0 + RUN npm i -g pnpm@10.28.1 RUN mkdir /pnpm-store && chown -R 1000:1000 /pnpm-store user: "node" ##this works as long as your local user has uid=1000 # restart: on-failure diff --git a/package.json b/package.json index 3a6f76666466..b4aadcfe0e53 100644 --- a/package.json +++ b/package.json @@ -83,5 +83,5 @@ "engines": { "node": "24.11.0 || 22.21.0" }, - "packageManager": "pnpm@9.6.0" + "packageManager": "pnpm@10.28.1" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b18ec1b7e6df..02a2b45a2fdb 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,17 @@ packages: - - "frontend" - - "backend" - - "packages/*" + - frontend + - backend + - packages/* + +onlyBuiltDependencies: + - "@firebase/util" + - "@fortawesome/fontawesome-free" + - "@sentry/cli" + - bcrypt + - core-js + - cpu-features + - esbuild + - msgpackr-extract + - protobufjs + - re2 + - ssh2 From c4159676b3a5164f7fe1a318a30f442ea731919b Mon Sep 17 00:00:00 2001 From: Christian Fehmer Date: Thu, 22 Jan 2026 16:21:52 +0100 Subject: [PATCH 2/2] fix lint-json --- package.json | 2 +- turbo.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b4aadcfe0e53..6bbcb85e3686 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "hotfix-dry": "monkeytype-release --hotfix --dry", "format-check": "oxfmt . --check", "format-fix": "oxfmt .", - "lint-json-assets": "cd frontend && eslint \"./static/**/*.json\"", + "lint-json-assets": "turbo lint-json --filter @monkeytype/frontend", "check-assets": "turbo check-assets --filter @monkeytype/frontend", "check-assets-quotes": "turbo check-assets --filter @monkeytype/frontend -- quotes", "check-assets-languages": "turbo check-assets --filter @monkeytype/frontend -- languages", diff --git a/turbo.json b/turbo.json index 94da8df75702..bafe58ab9413 100644 --- a/turbo.json +++ b/turbo.json @@ -37,6 +37,9 @@ "@monkeytype/frontend#check-assets": { "dependsOn": ["^parallel", "@monkeytype/schemas#build"] }, + "@monkeytype/frontend#lint-json": { + "dependsOn": ["^parallel"] + }, "@monkeytype/frontend#build": { "dependsOn": ["^build"], "env": ["BACKEND_URL", "RECAPTCHA_SITE_KEY", "SENTRY"],