Skip to content

Commit 66d083e

Browse files
committed
Merge branch 'main' into fix/pnpm-v11-workspace-settings
# Conflicts: # scripts/npm/install-npm-packages.mjs
2 parents 182a1a7 + f562e13 commit 66d083e

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

scripts/npm/install-npm-packages.mjs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,11 +769,10 @@ async function installPackage(packageInfo) {
769769
'packages:',
770770
' - .',
771771
'',
772-
'# pnpm v11 settings for third-party test installs (kebab-case required).',
773-
'block-exotic-subdeps: false',
774-
'registry-supports-time-field: false',
775-
'resolution-mode: highest',
776-
'strict-dep-builds: false',
772+
'# pnpm v11 settings for third-party test installs.',
773+
'blockExoticSubdeps: false',
774+
'strictDepBuilds: false',
775+
'resolutionMode: highest',
777776
overridesSection,
778777
].join('\n'),
779778
'utf8',

scripts/utils/package.mjs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,18 @@ const PNPM_NPM_LIKE_FLAGS = [
3030
]
3131

3232
// Basic pnpm install flags for CI-friendly behavior.
33+
// These are for isolated test installs of third-party packages we don't control.
3334
const PNPM_INSTALL_BASE_FLAGS = [
35+
// Allow git-resolved subdeps in third-party packages (e.g. evalmd → markdown-it).
36+
'--config.block-exotic-subdeps=false',
3437
// Prevent interactive prompts in CI environments.
3538
'--config.confirmModulesPurge=false',
39+
// Tell pnpm the registry may not have time metadata (SFW proxy strips it).
40+
'--config.registry-supports-time-field=false',
41+
// Use highest resolution to avoid time-based resolution failures.
42+
'--config.resolution-mode=highest',
43+
// Allow third-party build scripts (e.g. core-js, es5-ext postinstall).
44+
'--config.strict-dep-builds=false',
3645
// Allow lockfile updates (required for test package installations).
3746
'--no-frozen-lockfile',
3847
]

0 commit comments

Comments
 (0)