diff --git a/README.md b/README.md index 18e73b632b..b631634479 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ There are some additional urls below to access specific parts of the system. ### Local workflow #### Prerequisites -- The SvelteKit UI requires: node v20+ +- The SvelteKit UI requires: node v26+ - The .NET API requires: dotnet sdk v8+ #### Running the project diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 00278ba3bf..879eacd8be 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,10 +1,8 @@ # syntax=docker/dockerfile:1 # TODO: can't use vanilla alpine version since python is needed for gql-codegen stuff. -FROM node:20 AS builder-base +FROM node:26 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@10.24.0 --activate +RUN npm install -g pnpm@10.24.0 FROM builder-base AS builder @@ -19,7 +17,7 @@ ENV VITE_APP_VERSION=$APP_VERSION RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm run build -FROM node:20-alpine +FROM node:26-alpine # container would not receive SIGTERM from docker when shutting down so Docker would force kill # the container after 10s. This will make shutdown faster because the SIGTERM will be handled appropriately. # https://maximorlov.com/process-signals-inside-docker-containers/ diff --git a/frontend/README.md b/frontend/README.md index 5ff034b8cc..c466e1df72 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -6,7 +6,7 @@ Requests come into a node app managed by Sveltekit for static, CSR, or SSR. Dat ### Development -Node needs to be installed locally. The `pnpm` package manager should be installed: if you don't already have it, run `corepack enable` and it will be set up. +Node needs to be installed locally. The `pnpm` package manager should be installed: see [pnpm.io/installation](https://pnpm.io/installation). Once you've installed dependencies with `pnpm install`, start a development server: diff --git a/frontend/Taskfile.yml b/frontend/Taskfile.yml index 33755e84a2..63e0dfceb1 100644 --- a/frontend/Taskfile.yml +++ b/frontend/Taskfile.yml @@ -24,7 +24,6 @@ tasks: - pnpm-lock.yaml - pnpm-workspace.yaml cmds: - - corepack enable || true - pnpm install fw-lite-infr: @@ -88,7 +87,6 @@ tasks: - ../pnpm-lock.yaml - ../pnpm-workspace.yaml cmds: - - corepack enable || true - pnpm install run-https-proxy: dir: ./https-proxy diff --git a/frontend/dev.Dockerfile b/frontend/dev.Dockerfile index 7b4da867b9..068af31415 100644 --- a/frontend/dev.Dockerfile +++ b/frontend/dev.Dockerfile @@ -1,10 +1,8 @@ # syntax=docker/dockerfile:1 # TODO: can't use vanilla alpine version since python is needed for gql-codegen stuff. -FROM node:20 AS builder +FROM node:26 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@10.24.0 --activate +RUN npm install -g pnpm@10.24.0 WORKDIR /app COPY package.json pnpm-lock.yaml pnpm-workspace.yaml /app/ diff --git a/frontend/https-proxy/package.json b/frontend/https-proxy/package.json index a248d99898..bdd61e143d 100644 --- a/frontend/https-proxy/package.json +++ b/frontend/https-proxy/package.json @@ -3,10 +3,6 @@ "version": "0.0.1", "private": true, "packageManager": "pnpm@10.24.0", - "engines": { - "node": ">=20", - "pnpm": ">=9" - }, "type": "module", "scripts": { "dev": "vite" diff --git a/frontend/package.json b/frontend/package.json index 797490dc55..502889951b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,8 +4,8 @@ "private": true, "packageManager": "pnpm@10.24.0", "engines": { - "node": ">=20", - "pnpm": ">=9" + "node": ">=26", + "pnpm": ">=10" }, "scripts": { "dev": "vite dev", diff --git a/frontend/viewer/Taskfile.yml b/frontend/viewer/Taskfile.yml index 6ecd37c244..e5cd4e39d8 100644 --- a/frontend/viewer/Taskfile.yml +++ b/frontend/viewer/Taskfile.yml @@ -35,7 +35,6 @@ tasks: - ../pnpm-lock.yaml - ../pnpm-workspace.yaml cmds: - - corepack enable || true - pnpm install test: cmd: pnpm test diff --git a/frontend/viewer/package.json b/frontend/viewer/package.json index 6796f6bb1f..676b7f5c6c 100644 --- a/frontend/viewer/package.json +++ b/frontend/viewer/package.json @@ -2,10 +2,6 @@ "name": "viewer", "private": true, "packageManager": "pnpm@10.24.0", - "engines": { - "node": ">=20", - "pnpm": ">=9" - }, "version": "1.0.0", "type": "module", "scripts": {