diff --git a/Dockerfile b/Dockerfile index 2fbdcd5..3c9916e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM node:20-alpine +FROM node:22-alpine # Install nginx and pnpm RUN apk add --no-cache nginx -RUN npm install -g pnpm +RUN npm install -g pnpm@11.25.0 WORKDIR /app @@ -10,12 +10,12 @@ WORKDIR /app ENV NODE_ENV=production # Copy workspace files -COPY package.json pnpm-workspace.yaml ./ +COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./ COPY server/package.json ./server/ COPY client/package.json ./client/ # Install all dependencies -RUN pnpm install +RUN pnpm install --frozen-lockfile # Copy source COPY server/ ./server/ diff --git a/client/package.json b/client/package.json index 5de1cb4..cc71357 100644 --- a/client/package.json +++ b/client/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "preinstall": "npx only-allow pnpm", + "preinstall": "npx --yes only-allow pnpm", "dev": "vite", "build": "tsc -b && vite build", "lint": "eslint .", diff --git a/package.json b/package.json index 45dc0d3..8bd36c6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "scripts": { - "preinstall": "pnpm exec only-allow pnpm", + "preinstall": "npx --yes only-allow pnpm", "dev": "concurrently --names \"SERVER,CLIENT\" -c \"blue,red\" \"pnpm --filter server dev\" \"pnpm --filter client dev\"", "build": "pnpm --filter server build && pnpm --filter client build", "start": "node server/dist/server.js", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index d9b3560..af130b7 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,3 +3,5 @@ packages: - "client" onlyBuiltDependencies: - esbuild +allowBuilds: + esbuild: true diff --git a/server/package.json b/server/package.json index 915e36b..3dec003 100644 --- a/server/package.json +++ b/server/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "preinstall": "npx only-allow pnpm", + "preinstall": "npx --yes only-allow pnpm", "dev": "tsx watch server.ts", "build": "tsc", "start": "node dist/server.js",