Skip to content

Commit b31e5f2

Browse files
committed
[rush] Upgrade pnpm-sync-lib to v0.3.3 for pnpm v10 compatibility
tiktok/pnpm-sync#40 tiktok/pnpm-sync#43
1 parent a7e2c16 commit b31e5f2

File tree

11 files changed

+612
-76
lines changed

11 files changed

+612
-76
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "Upgrade `pnpm-sync-lib` to v0.3.3 for pnpm v10 compatibility",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush"
10+
}

common/config/rush/browser-approved-packages.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
"name": "@lifaon/path",
1515
"allowedCategories": [ "libraries" ]
1616
},
17+
{
18+
"name": "@pnpm/lockfile-file",
19+
"allowedCategories": [ "libraries" ]
20+
},
21+
{
22+
"name": "@pnpm/lockfile.fs",
23+
"allowedCategories": [ "libraries" ]
24+
},
1725
{
1826
"name": "@radix-ui/colors",
1927
"allowedCategories": [ "libraries" ]

common/config/rush/nonbrowser-approved-packages.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,10 @@
490490
"name": "buttono",
491491
"allowedCategories": [ "tests" ]
492492
},
493+
{
494+
"name": "chokidar",
495+
"allowedCategories": [ "libraries" ]
496+
},
493497
{
494498
"name": "cli-table",
495499
"allowedCategories": [ "libraries" ]
@@ -658,10 +662,6 @@
658662
"name": "https-proxy-agent",
659663
"allowedCategories": [ "libraries" ]
660664
},
661-
{
662-
"name": "chokidar",
663-
"allowedCategories": [ "libraries" ]
664-
},
665665
{
666666
"name": "ignore",
667667
"allowedCategories": [ "libraries" ]

common/config/subspaces/build-tests-subspace/.pnpmfile.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ function readPackage(packageJson, context) {
6262
fixUndeclaredDependency(packageJson, '@typescript-eslint/parser');
6363
break;
6464
}
65+
66+
case '@pnpm/lockfile-file': {
67+
// The `@pnpm/lockfile-file` package requires `@pnpm/logger@^5.0.0`, but we are using `@pnpm/[email protected]`.
68+
packageJson.peerDependencies['@pnpm/logger'] = '*';
69+
break;
70+
}
6571
}
6672

6773
return packageJson;

0 commit comments

Comments
 (0)