From 1d71a61acc600cc5ec67f2f683ae821816a510e2 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 3 Feb 2025 12:15:11 -0500 Subject: [PATCH 1/3] Bump PNPM to 9.15.5 PNPM v9.15.5 brings in several bugfixes, at least one of which (running preprepare scripts from packages on pnpm install, and "preprepare" is not a typo) we'll probably want to have when we upgrade our SvelteKit dependency. --- frontend/https-proxy/package.json | 2 +- frontend/package.json | 2 +- frontend/viewer/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/https-proxy/package.json b/frontend/https-proxy/package.json index 9408af865..6bebe34e1 100644 --- a/frontend/https-proxy/package.json +++ b/frontend/https-proxy/package.json @@ -2,7 +2,7 @@ "name": "https-proxy", "version": "0.0.1", "private": true, - "packageManager": "pnpm@9.11.0", + "packageManager": "pnpm@9.15.5", "engines": { "node": ">=20", "pnpm": ">=9" diff --git a/frontend/package.json b/frontend/package.json index 4ffd9efc7..7f89adcbf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -2,7 +2,7 @@ "name": "frontend", "version": "0.0.1", "private": true, - "packageManager": "pnpm@9.11.0", + "packageManager": "pnpm@9.15.5", "engines": { "node": ">=20", "pnpm": ">=9" diff --git a/frontend/viewer/package.json b/frontend/viewer/package.json index ab26159ec..093183f07 100644 --- a/frontend/viewer/package.json +++ b/frontend/viewer/package.json @@ -1,7 +1,7 @@ { "name": "viewer", "private": true, - "packageManager": "pnpm@9.11.0", + "packageManager": "pnpm@9.15.5", "engines": { "node": ">=20", "pnpm": ">=9" From 7aa249b414850c57c7acbf2167e465169e77c4e3 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 3 Feb 2025 12:41:16 -0500 Subject: [PATCH 2/3] Prep for PNPM 10: add "prepare": "svelte-kit sync" --- frontend/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/package.json b/frontend/package.json index 7f89adcbf..589165f0e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,6 +10,7 @@ "scripts": { "dev": "vite dev", "lexbox-dev": "vite dev --port 3000 --host 0.0.0.0", + "prepare": "svelte-kit sync", "build": "vite build", "preview": "vite preview", "pretest": "playwright install", From 00fea224942b4d2e3b9bbe215ffce04a2b38e538 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Tue, 4 Feb 2025 10:50:37 -0500 Subject: [PATCH 3/3] Work around corepack bug preventing PNPM install --- frontend/Dockerfile | 2 ++ frontend/dev.Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index bb5534906..4554fe13c 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -2,6 +2,8 @@ # TODO: can't use vanilla alpine version since python is needed for gql-codegen stuff. FROM node:20 AS builder-base WORKDIR /app +# Version of corepack distributed with node currently (2025-02-04) has a bug that prevents PNPM installation; latest version has the bugfix +RUN npm install -g corepack@latest RUN corepack enable && corepack prepare pnpm@9.11.0 --activate FROM builder-base AS builder-viewer diff --git a/frontend/dev.Dockerfile b/frontend/dev.Dockerfile index 654713eea..27a9e8098 100644 --- a/frontend/dev.Dockerfile +++ b/frontend/dev.Dockerfile @@ -2,6 +2,8 @@ # TODO: can't use vanilla alpine version since python is needed for gql-codegen stuff. FROM node:20 AS builder +# Version of corepack distributed with node currently (2025-02-04) has a bug that prevents PNPM installation; latest version has the bugfix +RUN npm install -g corepack@latest RUN corepack enable && corepack prepare pnpm@9.11.0 --activate WORKDIR /app