Skip to content

Commit c31caa6

Browse files
committed
refactor(migration): write pnpm config to pnpm-workspace.yaml for standalone projects
For standalone pnpm projects, write overrides, peerDependencyRules, and catalog to pnpm-workspace.yaml instead of the package.json pnpm section, matching the existing monorepo behavior. Also clean up empty pnpm objects from package.json during re-migration in both standalone and monorepo flows. Closes #1233
1 parent da06dac commit c31caa6

59 files changed

Lines changed: 118 additions & 959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/cli/snap-tests-global/migration-add-git-hooks/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@ VITE+ - The Unified Toolchain for the Web
1414
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1515
"vite-plus": "latest"
1616
},
17-
"pnpm": {
18-
"overrides": {
19-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
20-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
21-
},
22-
"peerDependencyRules": {
23-
"allowAny": [
24-
"vite",
25-
"vitest"
26-
],
27-
"allowedVersions": {
28-
"vite": "*",
29-
"vitest": "*"
30-
}
31-
}
32-
},
3317
"packageManager": "pnpm@<semver>",
3418
"scripts": {
3519
"prepare": "vp config"

packages/cli/snap-tests-global/migration-auto-create-vite-config/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,6 @@ export default defineConfig({
3737
"devDependencies": {
3838
"vite-plus": "latest"
3939
},
40-
"pnpm": {
41-
"overrides": {
42-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
43-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
44-
},
45-
"peerDependencyRules": {
46-
"allowAny": [
47-
"vite",
48-
"vitest"
49-
],
50-
"allowedVersions": {
51-
"vite": "*",
52-
"vitest": "*"
53-
}
54-
}
55-
},
5640
"packageManager": "pnpm@<semver>",
5741
"scripts": {
5842
"prepare": "vp config"

packages/cli/snap-tests-global/migration-baseurl-tsconfig/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ export default defineConfig({
3030
"devDependencies": {
3131
"vite-plus": "latest"
3232
},
33-
"pnpm": {
34-
"overrides": {
35-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
36-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
37-
},
38-
"peerDependencyRules": {
39-
"allowAny": [
40-
"vite",
41-
"vitest"
42-
],
43-
"allowedVersions": {
44-
"vite": "*",
45-
"vitest": "*"
46-
}
47-
}
48-
},
4933
"packageManager": "pnpm@<semver>",
5034
"scripts": {
5135
"prepare": "vp config"

packages/cli/snap-tests-global/migration-chained-lint-staged-pre-commit/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"pnpm": {
21-
"overrides": {
22-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
23-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
24-
},
25-
"peerDependencyRules": {
26-
"allowAny": [
27-
"vite",
28-
"vitest"
29-
],
30-
"allowedVersions": {
31-
"vite": "*",
32-
"vitest": "*"
33-
}
34-
}
35-
},
3620
"packageManager": "pnpm@<semver>"
3721
}
3822

packages/cli/snap-tests-global/migration-composed-husky-custom-dir/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"pnpm": {
21-
"overrides": {
22-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
23-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
24-
},
25-
"peerDependencyRules": {
26-
"allowAny": [
27-
"vite",
28-
"vitest"
29-
],
30-
"allowedVersions": {
31-
"vite": "*",
32-
"vitest": "*"
33-
}
34-
}
35-
},
3620
"packageManager": "pnpm@<semver>"
3721
}
3822

packages/cli/snap-tests-global/migration-composed-husky-prepare/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,5 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"pnpm": {
21-
"overrides": {
22-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
23-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
24-
},
25-
"peerDependencyRules": {
26-
"allowAny": [
27-
"vite",
28-
"vitest"
29-
],
30-
"allowedVersions": {
31-
"vite": "*",
32-
"vitest": "*"
33-
}
34-
}
35-
},
3620
"packageManager": "pnpm@<semver>"
3721
}

packages/cli/snap-tests-global/migration-env-prefix-lint-staged/snap.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"pnpm": {
21-
"overrides": {
22-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
23-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
24-
},
25-
"peerDependencyRules": {
26-
"allowAny": [
27-
"vite",
28-
"vitest"
29-
],
30-
"allowedVersions": {
31-
"vite": "*",
32-
"vitest": "*"
33-
}
34-
}
35-
},
3620
"packageManager": "pnpm@<semver>"
3721
}
3822

packages/cli/snap-tests-global/migration-eslint-lint-staged/snap.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,7 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"packageManager": "pnpm@<semver>",
21-
"pnpm": {
22-
"overrides": {
23-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
24-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
25-
},
26-
"peerDependencyRules": {
27-
"allowAny": [
28-
"vite",
29-
"vitest"
30-
],
31-
"allowedVersions": {
32-
"vite": "*",
33-
"vitest": "*"
34-
}
35-
}
36-
}
20+
"packageManager": "pnpm@<semver>"
3721
}
3822

3923
> cat vite.config.ts # check oxlint config and staged config merged into vite.config.ts

packages/cli/snap-tests-global/migration-eslint-lintstagedrc/snap.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,7 @@ VITE+ - The Unified Toolchain for the Web
1717
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
1818
"vite-plus": "latest"
1919
},
20-
"packageManager": "pnpm@<semver>",
21-
"pnpm": {
22-
"overrides": {
23-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
24-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
25-
},
26-
"peerDependencyRules": {
27-
"allowAny": [
28-
"vite",
29-
"vitest"
30-
],
31-
"allowedVersions": {
32-
"vite": "*",
33-
"vitest": "*"
34-
}
35-
}
36-
}
20+
"packageManager": "pnpm@<semver>"
3721
}
3822

3923
> test ! -f .lintstagedrc.json # check lintstagedrc.json is removed

packages/cli/snap-tests-global/migration-eslint-npx-wrapper/snap.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,7 @@ VITE+ - The Unified Toolchain for the Web
2222
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
2323
"vite-plus": "latest"
2424
},
25-
"packageManager": "pnpm@<semver>",
26-
"pnpm": {
27-
"overrides": {
28-
"vite": "npm:@voidzero-dev/vite-plus-core@latest",
29-
"vitest": "npm:@voidzero-dev/vite-plus-test@latest"
30-
},
31-
"peerDependencyRules": {
32-
"allowAny": [
33-
"vite",
34-
"vitest"
35-
],
36-
"allowedVersions": {
37-
"vite": "*",
38-
"vitest": "*"
39-
}
40-
}
41-
}
25+
"packageManager": "pnpm@<semver>"
4226
}
4327

4428
> test ! -f eslint.config.mjs # check eslint config is removed

0 commit comments

Comments
 (0)