diff --git a/.gitignore b/.gitignore index 46bff1d..352a94f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,10 @@ node_modules/ package-lock.json yarn.lock +# pnpm: only the workspace-root lockfile is authoritative +backend/pnpm-lock.yaml +frontend/pnpm-lock.yaml + # Mac .DS_Store diff --git a/backend/package.json b/backend/package.json index d86382b..a4214e7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -18,13 +18,5 @@ "devDependencies": { "nodemon": "3.1.14", "uuid": "14.0.0" - }, - "pnpm": { - "onlyBuiltDependencies": [ - "argon2", - "isolated-vm", - "sharp", - "sqlite3" - ] } } diff --git a/docker-compose.yml b/docker-compose.yml index f393c3b..eef6203 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,15 @@ networks: services: backend: - image: node:lts-bookworm + image: node:22-bookworm container_name: pca_pijac_backend restart: unless-stopped env_file: ./backend/.env.production + working_dir: /repo/backend networks: - main volumes: - - ./backend:/app + - .:/repo - ./data:/data labels: caddy: admin.pca-pijac.dev.civokram.com @@ -21,22 +22,24 @@ services: - -c - | npm i -g pnpm - cd /app - pnpm install --production + cd /repo + pnpm install --filter ./backend... --frozen-lockfile --prod + cd /repo/backend rm -f .env pnpm run start frontend: - image: node:lts-bookworm + image: node:22-bookworm container_name: pca_pijac_frontend restart: unless-stopped env_file: ./frontend/.env.production + working_dir: /repo/frontend depends_on: - backend networks: - main volumes: - - ./frontend:/app + - .:/repo labels: caddy: pca-pijac.dev.civokram.com caddy.reverse_proxy: '{{upstreams 3000}}' @@ -45,10 +48,10 @@ services: - -c - | npm i -g pnpm - cd /app - pnpm install --frozen-lockfile + cd /repo + pnpm install --filter ./frontend... --frozen-lockfile + cd /repo/frontend sleep 10 rm -f .env pnpm run build - pnpm prune --prod pnpm run start diff --git a/frontend/package.json b/frontend/package.json index add1f12..5cbc88d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -47,10 +47,5 @@ "tailwindcss": "4.2.4", "typescript": "6.0.3", "vite": "8.0.10" - }, - "pnpm": { - "onlyBuiltDependencies": [ - "esbuild" - ] } }