diff --git a/Makefile b/Makefile index 4889b8b5..9a287f57 100644 --- a/Makefile +++ b/Makefile @@ -263,7 +263,7 @@ code-check-userfront-lint: code-check-front-lint: @echo "==> adminfront biome lint/format check" rm -rf adminfront/playwright-report adminfront/test-results - cd adminfront && pnpm install --frozen-lockfile --ignore-scripts + cd adminfront && CI=true pnpm install --frozen-lockfile --ignore-scripts cd adminfront && npx biome check . --formatter-enabled=false --organize-imports-enabled=false cd adminfront && npx biome check . --linter-enabled=false --organize-imports-enabled=false @echo "==> devfront biome lint/format check" diff --git a/adminfront/Dockerfile b/adminfront/Dockerfile index 06c73e89..a2bd3c7c 100644 --- a/adminfront/Dockerfile +++ b/adminfront/Dockerfile @@ -2,6 +2,9 @@ FROM node:lts WORKDIR /workspace +# Set CI environment variable to true to avoid TTY issues with pnpm +ENV CI=true + # Install pnpm RUN npm install -g pnpm diff --git a/adminfront/scripts/runtime-mode.sh b/adminfront/scripts/runtime-mode.sh index 096161ae..0f5cf3f3 100644 --- a/adminfront/scripts/runtime-mode.sh +++ b/adminfront/scripts/runtime-mode.sh @@ -106,7 +106,7 @@ ensure_frontend_dependencies() { return 0 fi if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then - (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) + (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts) else npm ci fi diff --git a/common/pnpm-lock.yaml b/common/pnpm-lock.yaml index 03fd45b6..fb3d139d 100644 --- a/common/pnpm-lock.yaml +++ b/common/pnpm-lock.yaml @@ -423,6 +423,9 @@ importers: autoprefixer: specifier: ^10.5.0 version: 10.5.0(postcss@8.5.14) + jsdom: + specifier: ^28.1.0 + version: 28.1.0 postcss: specifier: ^8.5.14 version: 8.5.14 diff --git a/devfront/Dockerfile b/devfront/Dockerfile index 9e977738..cddece4c 100644 --- a/devfront/Dockerfile +++ b/devfront/Dockerfile @@ -2,6 +2,9 @@ FROM node:lts WORKDIR /workspace +# Set CI environment variable to true to avoid TTY issues with pnpm +ENV CI=true + # Install pnpm RUN npm install -g pnpm diff --git a/devfront/scripts/runtime-mode.sh b/devfront/scripts/runtime-mode.sh index 8b69817a..d07c9053 100644 --- a/devfront/scripts/runtime-mode.sh +++ b/devfront/scripts/runtime-mode.sh @@ -106,7 +106,7 @@ ensure_frontend_dependencies() { return 0 fi if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then - (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) + (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts) else npm ci fi diff --git a/orgfront/Dockerfile b/orgfront/Dockerfile index f29fb717..723dc7f3 100644 --- a/orgfront/Dockerfile +++ b/orgfront/Dockerfile @@ -2,6 +2,9 @@ FROM node:lts WORKDIR /workspace +# Set CI environment variable to true to avoid TTY issues with pnpm +ENV CI=true + # Install pnpm RUN npm install -g pnpm diff --git a/orgfront/scripts/runtime-mode.sh b/orgfront/scripts/runtime-mode.sh index 392972e4..5dbd8eb6 100644 --- a/orgfront/scripts/runtime-mode.sh +++ b/orgfront/scripts/runtime-mode.sh @@ -106,7 +106,7 @@ ensure_frontend_dependencies() { return 0 fi if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then - (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) + (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts) else npm ci fi diff --git a/scripts/run_adminfront_ci_tests.sh b/scripts/run_adminfront_ci_tests.sh index c7f94e8c..b72f91a0 100755 --- a/scripts/run_adminfront_ci_tests.sh +++ b/scripts/run_adminfront_ci_tests.sh @@ -201,7 +201,7 @@ set +e if ! command -v pnpm >/dev/null 2>&1; then run_with_retry 3 npm install -g pnpm fi - run_with_retry 3 pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir" + run_with_retry 3 CI=true pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir" fi ) 2>&1 | tee reports/adminfront-install.log install_exit_code=${PIPESTATUS[0]}