From 3a3ff75c5e9aa9a59e16a506a28f59a379fe8960 Mon Sep 17 00:00:00 2001 From: Alan Cyment Date: Fri, 10 Jan 2025 15:43:08 -0300 Subject: [PATCH] Migrate to pnpm --- frontend/Dockerfile | 6 ++++-- frontend/Dockerfile.playwright | 6 ++++-- frontend/package.json | 6 ++++-- frontend/playwright.config.ts | 2 +- scripts/generate-client.sh | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 8728c7b029..cb111a6252 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -5,13 +5,15 @@ WORKDIR /app COPY package*.json /app/ -RUN npm install +RUN corepack enable + +RUN pnpm install COPY ./ /app/ ARG VITE_API_URL=${VITE_API_URL} -RUN npm run build +RUN pnpm run build # Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx diff --git a/frontend/Dockerfile.playwright b/frontend/Dockerfile.playwright index e76ac15f65..8b1fb9347b 100644 --- a/frontend/Dockerfile.playwright +++ b/frontend/Dockerfile.playwright @@ -4,9 +4,11 @@ WORKDIR /app COPY package*.json /app/ -RUN npm install +RUN corepack enable -RUN npx -y playwright install --with-deps +RUN pnpm install + +RUN pnpm dlx playwright install --with-deps COPY ./ /app/ diff --git a/frontend/package.json b/frontend/package.json index 546028c9a9..78742871fc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,7 +25,8 @@ "react-dom": "^18.2.0", "react-error-boundary": "^4.0.13", "react-hook-form": "7.49.3", - "react-icons": "5.0.1" + "react-icons": "5.0.1", + "zod": "^3.22.4" }, "devDependencies": { "@biomejs/biome": "1.6.1", @@ -40,5 +41,6 @@ "dotenv": "^16.4.5", "typescript": "^5.2.2", "vite": "^5.0.13" - } + }, + "packageManager": "pnpm@9.15.3" } diff --git a/frontend/playwright.config.ts b/frontend/playwright.config.ts index b9d5a51246..a73ae71378 100644 --- a/frontend/playwright.config.ts +++ b/frontend/playwright.config.ts @@ -84,7 +84,7 @@ export default defineConfig({ /* Run your local dev server before starting the tests */ webServer: { - command: 'npm run dev', + command: 'pnpm run dev', url: 'http://localhost:5173', reuseExistingServer: !process.env.CI, }, diff --git a/scripts/generate-client.sh b/scripts/generate-client.sh index 1e76864d42..e2ee8930ef 100644 --- a/scripts/generate-client.sh +++ b/scripts/generate-client.sh @@ -8,5 +8,5 @@ python -c "import app.main; import json; print(json.dumps(app.main.app.openapi() cd .. mv openapi.json frontend/ cd frontend -npm run generate-client -npx biome format --write ./src/client +pnpm run generate-client +pnpm exec biome format --write ./src/client