Merge remote-tracking branch 'origin/dev' into dev

scripts/run_adminfront_ci_tests.sh

@@ -7,11 +7,12 @@ tmp_dir=""
 
 cleanup() {
   if [ -n "${tmp_dir:-}" ] && [ -d "$tmp_dir" ]; then
-    rm -rf "$tmp_dir"
+    rm -rf "$tmp_dir" || true
   fi
 }
 
-trap cleanup EXIT INT TERM
+trap "cleanup; exit" INT TERM
+trap "cleanup" EXIT
 
 mkdir -p reports
 rm -rf adminfront/node_modules
@@ -133,7 +134,7 @@ fi
 set +e
 (
   cd "$tmp_dir/adminfront"
-  npm ci --ignore-scripts
+  npm install -g pnpm && pnpm install -C ../common --no-frozen-lockfile
 ) 2>&1 | tee reports/adminfront-install.log
 install_exit_code=${PIPESTATUS[0]}
 set -e
@@ -148,7 +149,7 @@ if [ "$install_exit_code" -ne 0 ]; then
     echo "- Exit Code: \`$install_exit_code\`"
     echo
     echo "## Command"
-    echo "\`cd adminfront && npm ci --ignore-scripts\`"
+    echo "\`cd adminfront && npm install -g pnpm && pnpm install -C ../common --no-frozen-lockfile\`"
     echo
     echo "## Install Log Tail (last 200 lines)"
     echo '```text'
@@ -197,7 +198,7 @@ echo "==> adminfront using PORT=$port"
 (
   cd "$tmp_dir/adminfront"
   PORT="$port" PLAYWRIGHT_WORKERS="${PLAYWRIGHT_WORKERS:-1}" \
-    node ./node_modules/playwright/cli.js test "${playwright_project_args[@]}"
+    npx playwright test "${playwright_project_args[@]}"
 ) 2>&1 | tee reports/adminfront-test.log
 test_exit_code=${PIPESTATUS[0]}
 set -e
@@ -215,9 +216,9 @@ if [ "$test_exit_code" -ne 0 ]; then
     echo
     echo "## Commands"
     echo "1. \`cd adminfront\`"
-    echo "2. \`npm ci --ignore-scripts\`"
+    echo "2. \`npm install -g pnpm && pnpm install -C ../common --no-frozen-lockfile\`"
     echo "3. \`${playwright_install_desc}\`"
-    echo "4. \`node ./node_modules/playwright/cli.js test\`"
+    echo "4. \`npx playwright test\`"
     echo
     echo "## Log Tail (last 200 lines)"
     echo '```text'