diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 741be109..40dfa636 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: '.node-version' cache: pnpm - name: Install pnpm diff --git a/.node-version b/.node-version index 5bd68117..7d41c735 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.19.0 +22.14.0 diff --git a/Dockerfile b/Dockerfile index bdbb6f9e..e8360c59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM docker.io/library/node:20-alpine3.18 AS mermaid-live-editor-dependencies +FROM docker.io/library/node:22-alpine3.21 AS mermaid-live-editor-dependencies RUN apk --no-cache add build-base git python3 && \ rm -rf /var/cache/apk/* -RUN npm install -g pnpm +RUN corepack enable pnpm WORKDIR /app @@ -28,7 +28,7 @@ FROM mermaid-live-editor-builder AS mermaid-dev ENTRYPOINT ["pnpm", "dev"] -FROM nginx:1.25-alpine3.18 AS mermaid +FROM nginx:1.27-alpine3.21 AS mermaid COPY ./nginx.conf /etc/nginx/conf.d/default.conf COPY --from=mermaid-live-editor-builder /app/docs /usr/share/nginx/html diff --git a/README.md b/README.md index 881e09ea..427e2147 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,8 @@ https://docs.github.com/en/get-started/quickstart/fork-a-repo ## Requirements -- [Node.js](https://nodejs.org/en/) version 18.20.7 or higher -- [pnpm](https://pnpm.io/) package manager. Install with `npm install -g pnpm` +- [Node.js](https://nodejs.org/en/) current LTS version +- [pnpm](https://pnpm.io/) package manager. Install with `corepack enable pnpm` ## Development diff --git a/package.json b/package.json index cb720bcb..38073f47 100644 --- a/package.json +++ b/package.json @@ -93,11 +93,13 @@ "eslint --ignore-path .gitignore " ] }, - "volta": { - "node": "18.20.7" - }, "engines": { - "node": ">=16.7" + "node": ">=20" }, - "packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4" + "packageManager": "pnpm@10.6.3+sha512.bb45e34d50a9a76e858a95837301bfb6bd6d35aea2c5d52094fa497a467c43f5c440103ce2511e9e0a2f89c3d6071baac3358fc68ac6fb75e2ceb3d2736065e6", + "pnpm": { + "onlyBuiltDependencies": [ + "svelte-preprocess" + ] + } }