diff --git a/.github/workflows/code-quality-workflow.yaml b/.github/workflows/code-quality-workflow.yaml index af903bcd..a5533d8a 100644 --- a/.github/workflows/code-quality-workflow.yaml +++ b/.github/workflows/code-quality-workflow.yaml @@ -19,8 +19,6 @@ jobs: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v6 - with: - version: 10.28.0 - uses: actions/setup-node@v4 with: diff --git a/Dockerfile b/Dockerfile index a057b518..040877f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN corepack enable # Stage 1: Build the application FROM base AS build ENV NODE_ENV=development +ENV CI=true ARG NUXT_PUBLIC_RECAPTCHA_SITE_KEY ARG NUXT_PUBLIC_DM_WS_URL @@ -17,7 +18,7 @@ ENV NUXT_PUBLIC_DM_WS_URL=$NUXT_PUBLIC_DM_WS_URL ENV RAVEN_TENOR_KEY=$RAVEN_TENOR_KEY # Install dependencies -COPY package.json pnpm-lock.yaml ./ +COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \ pnpm install --frozen-lockfile @@ -40,7 +41,7 @@ FROM base # Copy build output and necessary files ENV NODE_ENV=production COPY --from=build /app/.output /app/.output -COPY package.json ./ +COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ EXPOSE 3000 CMD ["pnpm", "start"] diff --git a/package.json b/package.json index 6f033320..9e34e623 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "generate": "nuxt generate", "preview": "nuxt preview", "postinstall": "nuxt prepare", - "prepare": "node -e \"if (process.env.NODE_ENV !== 'production') require('child_process').execSync('husky', {stdio: 'inherit'})\"", + "prepare": "node -e \"if (process.env.NODE_ENV !== 'production' && process.env.CI !== 'true') require('child_process').execSync('husky', {stdio: 'inherit'})\"", "lint": "eslint . --ext .js,.ts,.vue --fix", "lint:check": "eslint . --ext .js,.ts,.vue", "format": "prettier --write .", @@ -107,6 +107,13 @@ "engines": { "node": ">=22.0.0" }, + "devEngines": { + "packageManager": { + "name": "pnpm", + "version": "10.28.0", + "onFail": "download" + } + }, "msw": { "workerDirectory": [ "public" diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index a83442bf..2a7f7ae8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,5 @@ ignoredBuiltDependencies: + - cypress - msw - unrs-resolver - vue-demi