diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4808778..b9facab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,8 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 22 + node-version-file: site/package.json + check-latest: true cache: npm cache-dependency-path: site/package-lock.json - run: npm ci diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4663c16..8fa22e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - os: macos-15-intel target: x86_64-apple-darwin archive: tar.gz - - os: macos-14 + - os: macos-15 target: aarch64-apple-darwin archive: tar.gz - os: windows-latest diff --git a/package.json b/package.json new file mode 100644 index 0000000..506384f --- /dev/null +++ b/package.json @@ -0,0 +1,4 @@ +{ + "private": true, + "engines": { "node": "^26.13.1" } +} diff --git a/scripts/e2e-docker.sh b/scripts/e2e-docker.sh index b5c9ba1..2d387e1 100755 --- a/scripts/e2e-docker.sh +++ b/scripts/e2e-docker.sh @@ -3,6 +3,6 @@ set -eu image="${OCVM_E2E_IMAGE:-ocvm-e2e:local}" -docker build -f tests/e2e/Dockerfile -t "$image" . +docker build --pull -f tests/e2e/Dockerfile -t "$image" . docker run --rm "$image" diff --git a/site/.node-version b/site/.node-version new file mode 100644 index 0000000..6f4247a --- /dev/null +++ b/site/.node-version @@ -0,0 +1 @@ +26 diff --git a/site/.npmrc b/site/.npmrc new file mode 100644 index 0000000..b6f27f1 --- /dev/null +++ b/site/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/site/README.md b/site/README.md index dc5cc5f..effde29 100644 --- a/site/README.md +++ b/site/README.md @@ -6,6 +6,8 @@ Production URL: https://ocvm.vercel.app ## Development +Use Node.js 26.x, version 26.13.1 or later. The site manifest defines this range for npm and CI. + ```bash npm ci npm run dev @@ -18,15 +20,16 @@ npm run build ``` The production build uses Nitro's Vercel preset and emits `.vercel/output`. +Vercel selects Node.js 26.x for builds and functions and manages patch updates. ## Docker Verification ```bash -docker run --rm -u "$(id -u):$(id -g)" \ +docker run --pull=always --rm -u "$(id -u):$(id -g)" \ -e npm_config_cache=/tmp/npm-cache \ -v "$PWD/..":/work \ -w /work/site \ - node:22-bookworm sh -lc "npm ci && npm run build" + node:26-bookworm sh -lc "npm ci && npm run build" ``` ## Deploy diff --git a/site/package-lock.json b/site/package-lock.json index bb3e091..e0df49f 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -5,6 +5,7 @@ "packages": { "": { "name": "ocvm-site", + "engines": { "node": "^26.13.1" }, "dependencies": { "@tanstack/react-router": "^1.170.46", "@tanstack/react-start": "^1.169.4", diff --git a/site/package.json b/site/package.json index 7fe2678..1ebdb9e 100644 --- a/site/package.json +++ b/site/package.json @@ -2,6 +2,7 @@ "name": "ocvm-site", "private": true, "type": "module", + "engines": { "node": "^26.13.1" }, "imports": { "#/*": "./src/*" }, diff --git a/site/vercel.json b/site/vercel.json index b61c626..d9499fb 100644 --- a/site/vercel.json +++ b/site/vercel.json @@ -1,5 +1,6 @@ { "framework": null, + "git": { "deploymentEnabled": { "chore/node-26-13-1": false } }, "installCommand": "npm ci", "buildCommand": "npm run build" } diff --git a/site/vite.config.ts b/site/vite.config.ts index ce593e9..ade831e 100644 --- a/site/vite.config.ts +++ b/site/vite.config.ts @@ -8,6 +8,7 @@ const config = defineConfig({ plugins: [ nitro({ preset: 'vercel', + vercel: { functions: { runtime: 'nodejs26.x' } }, rollupConfig: { external: [/^@sentry\//] }, }), tanstackStart(), diff --git a/tests/e2e/Dockerfile b/tests/e2e/Dockerfile index e2c6dfe..10f3735 100644 --- a/tests/e2e/Dockerfile +++ b/tests/e2e/Dockerfile @@ -1,10 +1,9 @@ +FROM node:26-bookworm AS node FROM rust:1-bookworm -RUN apt-get update \ - && apt-get install -y --no-install-recommends ca-certificates curl gnupg \ - && curl -fsSL https://deb.nodesource.com/setup_26.x | bash - \ - && apt-get install -y --no-install-recommends nodejs \ - && rm -rf /var/lib/apt/lists/* +COPY --from=node /usr/local/ /usr/local/ +RUN dpkg --compare-versions "$(node -p 'process.versions.node')" ge 26.13.1 \ + && node --version && npm --version WORKDIR /work COPY . . @@ -13,6 +12,5 @@ ENV OCVM_HOME=/tmp/ocvm-home ENV OCVM_NPM_PACKAGE=openclaw RUN cargo build --release --locked -RUN node --version && npm --version CMD ["./scripts/e2e-npm-openclaw.sh"] diff --git a/vercel.json b/vercel.json index 5d5a6f8..b535017 100644 --- a/vercel.json +++ b/vercel.json @@ -1,5 +1,6 @@ { "framework": null, + "git": { "deploymentEnabled": { "chore/node-26-13-1": false } }, "installCommand": "cd site && npm ci", "buildCommand": "cd site && npm run build && rm -rf ../.vercel && cp -R .vercel ../.vercel" }