Skip to content

Commit f5bf8c1

Browse files
vltbaudbotdarcyclarke
authored andcommitted
fix: add packageManager cleanup to pnpm setup
pnpm v11 errors on conflicting packageManager field in package.json. Port the setup command from the old pnpm11 config to the pnpm entry.
1 parent 68f3907 commit f5bf8c1

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

scripts/variations/common.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ BENCH_SETUP_NPM=""
7070
BENCH_SETUP_YARN=""
7171
BENCH_SETUP_BERRY="echo \"$BENCH_COMMAND_YARN_MODERN_CONFIG\" > .yarnrc.yml"
7272
BENCH_SETUP_ZPM="echo \"$BENCH_COMMAND_YARN_MODERN_CONFIG\" > .yarnrc.yml; { echo '[zpm prepare]'; echo 'cwd:'; pwd; echo 'package.json:'; ls -la package.json || true; echo 'yarn path:'; command -v yarn || true; echo 'yarn version:'; yarn -v || true; echo 'canary version:'; echo \"$BENCH_ZPM_VERSION\"; echo 'packageManager (before):'; npm pkg get packageManager || true; echo 'set packageManager=yarn@'"$BENCH_ZPM_VERSION"':' ; npm pkg set packageManager=\"yarn@$BENCH_ZPM_VERSION\" || true; echo 'packageManager (after):'; npm pkg get packageManager || true; } >> $BENCH_OUTPUT_FOLDER/zpm-prepare.log 2>&1"
73-
BENCH_SETUP_PNPM=""
73+
BENCH_SETUP_PNPM="npm pkg delete packageManager >/dev/null 2>&1 || true"
7474

7575
BENCH_SETUP_PACQUET="npm pkg delete packageManager >/dev/null 2>&1 || true"
7676
BENCH_SETUP_VLT="node $BENCH_SCRIPTS/add-workspace-protocol.js . >> $BENCH_OUTPUT_FOLDER/vlt-prepare.log 2>&1"
@@ -86,7 +86,8 @@ BENCH_SETUP_NODE=""
8686
# Install scripts are disabled where the PM runs them by default, so benchmarks
8787
# measure dependency resolution + linking only (not arbitrary postinstall work).
8888
# npm, yarn classic, bun: run scripts by default → --ignore-scripts
89-
# berry, zpm, pnpm v10+, vlt: don't run scripts by default → no flag needed
89+
# pnpm v11+: errors on ignored build scripts (ERR_PNPM_IGNORED_BUILDS) → --ignore-scripts
90+
# berry, zpm, vlt: don't run scripts by default → no flag needed
9091
# deno: doesn't run scripts by default → removed --allow-scripts
9192
BENCH_INSTALL_NPM="npm install --no-audit --no-fund --ignore-scripts --silent"
9293
# npm ERESOLVE: medium-draft@0.5.18 requires react@^15||^16 but large has react@^18

0 commit comments

Comments
 (0)