Skip to content

Commit 2a36b25

Browse files
committed
fix(test): keep pkg.pr.new overrides minimal
1 parent 1d4c232 commit 2a36b25

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/scripts/test-pkg-pr-new-migrate.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ export VP_HOME="$pr_home"
105105
export PATH="$VP_HOME/bin:$PATH"
106106
export VP_VERSION="$vite_plus_spec"
107107
export VP_OVERRIDE_PACKAGES="$(printf \
108-
'{"vite":"%s","@voidzero-dev/vite-plus-core":"%s","vitest":"%s"}' \
109-
"$vite_plus_core_spec" \
108+
'{"vite":"%s","vitest":"%s"}' \
110109
"$vite_plus_core_spec" \
111110
"$vitest_version")"
112111
export VP_FORCE_MIGRATE=1

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-npm/snap.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
"vite-plus": "https://pkg.pr.new/voidzero-dev/vite-plus@1891"
1212
},
1313
"overrides": {
14-
"vite": "https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891",
15-
"@voidzero-dev/vite-plus-core": "https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891"
14+
"vite": "https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891"
1615
},
1716
"packageManager": "npm@<semver>",
1817
"scripts": {
1918
"prepare": "vp config"
2019
}
2120
}
2221

23-
> node -e "const p = require('./package.json'); const vp = 'https://pkg.pr.new/voidzero-dev/vite-plus@1891'; const core = 'https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891'; if (p.devDependencies['vite-plus'] !== vp || p.devDependencies.vite !== core || p.overrides.vite !== core || p.overrides['@voidzero-dev/vite-plus-core'] !== core) process.exit(1)" # pkg.pr.new specs are coherent
22+
> node -e "const p = require('./package.json'); const vp = 'https://pkg.pr.new/voidzero-dev/vite-plus@1891'; const core = 'https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891'; if (p.devDependencies['vite-plus'] !== vp || p.devDependencies.vite !== core || p.overrides.vite !== core || p.overrides['@voidzero-dev/vite-plus-core'] !== undefined) process.exit(1)" # pkg.pr.new specs use the minimal override shape
2423
> node -e "require('node:fs').copyFileSync('package.json', 'package.after-first-migration.json')" # capture first migration result
2524
> vp migrate --no-interactive # pkg.pr.new migration is idempotent
2625
◇ Migrated . to Vite+

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-npm/steps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"env": {
33
"VP_FORCE_MIGRATE": "1",
4-
"VP_OVERRIDE_PACKAGES": "{\"vite\":\"https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891\",\"@voidzero-dev/vite-plus-core\":\"https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891\",\"vitest\":\"4.1.9\"}",
4+
"VP_OVERRIDE_PACKAGES": "{\"vite\":\"https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891\",\"vitest\":\"4.1.9\"}",
55
"VP_VERSION": "https://pkg.pr.new/voidzero-dev/vite-plus@1891"
66
},
77
"commands": [
88
"vp migrate --no-interactive # pkg.pr.new targets replace every stale managed spec",
99
"cat package.json # direct dependencies and npm overrides use the same PR URLs",
10-
"node -e \"const p = require('./package.json'); const vp = 'https://pkg.pr.new/voidzero-dev/vite-plus@1891'; const core = 'https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891'; if (p.devDependencies['vite-plus'] !== vp || p.devDependencies.vite !== core || p.overrides.vite !== core || p.overrides['@voidzero-dev/vite-plus-core'] !== core) process.exit(1)\" # pkg.pr.new specs are coherent",
10+
"node -e \"const p = require('./package.json'); const vp = 'https://pkg.pr.new/voidzero-dev/vite-plus@1891'; const core = 'https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891'; if (p.devDependencies['vite-plus'] !== vp || p.devDependencies.vite !== core || p.overrides.vite !== core || p.overrides['@voidzero-dev/vite-plus-core'] !== undefined) process.exit(1)\" # pkg.pr.new specs use the minimal override shape",
1111
"node -e \"require('node:fs').copyFileSync('package.json', 'package.after-first-migration.json')\" # capture first migration result",
1212
"vp migrate --no-interactive # pkg.pr.new migration is idempotent",
1313
"node -e \"const fs = require('node:fs'); if (fs.readFileSync('package.json', 'utf8') !== fs.readFileSync('package.after-first-migration.json', 'utf8')) process.exit(1)\" # rerun leaves package.json unchanged"

0 commit comments

Comments
 (0)