Skip to content

Commit 4977b5b

Browse files
gavinxguoctogonziclanton
authored
[rush] Upgrade pnpm-sync-lib to v0.3.3 for pnpm v10 compatibility (#5254)
* [rush] Upgrade `pnpm-sync-lib` to v0.3.3 for pnpm v10 compatibility tiktok/pnpm-sync#40 tiktok/pnpm-sync#43 * Fix merge conflicts so "rush-lib" compiles again * Revert Lockfile Explorer changes, since PNPM 10 support was already implemented after this PR was started * Dynamic import `@rushstack/rush-pnpm-kit-*` packages. * Include explicit types. * Include missing eslint config, README, and LICENSE files. * Fix lint issues. * fixup! Dynamic import `@rushstack/rush-pnpm-kit-*` packages. * Dynamically import the pnpm kits in PnpmShrinkwrapFile. * Revert "Dynamically import the pnpm kits in PnpmShrinkwrapFile." This reverts commit 6ede3d3. * Lazy-load the pnpm kits in PnpmShrinkwrapFile. * Leave a note about reworking load of @rushstack/rush-pnpm-kit-*. --------- Co-authored-by: Pete Gonzalez <4673363+octogonz@users.noreply.github.com> Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
1 parent 3c97b34 commit 4977b5b

Some content is hidden

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

57 files changed

+1444
-111
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ These GitHub repositories provide supplementary resources for Rush Stack:
9696
| [/libraries/problem-matcher](./libraries/problem-matcher/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fproblem-matcher.svg)](https://badge.fury.io/js/%40rushstack%2Fproblem-matcher) | [changelog](./libraries/problem-matcher/CHANGELOG.md) | [@rushstack/problem-matcher](https://www.npmjs.com/package/@rushstack/problem-matcher) |
9797
| [/libraries/rig-package](./libraries/rig-package/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frig-package.svg)](https://badge.fury.io/js/%40rushstack%2Frig-package) | [changelog](./libraries/rig-package/CHANGELOG.md) | [@rushstack/rig-package](https://www.npmjs.com/package/@rushstack/rig-package) |
9898
| [/libraries/rush-lib](./libraries/rush-lib/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush-lib.svg)](https://badge.fury.io/js/%40microsoft%2Frush-lib) | | [@microsoft/rush-lib](https://www.npmjs.com/package/@microsoft/rush-lib) |
99+
| [/libraries/rush-pnpm-kit-v10](./libraries/rush-pnpm-kit-v10/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v10.svg)](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v10) | [changelog](./libraries/rush-pnpm-kit-v10/CHANGELOG.md) | [@rushstack/rush-pnpm-kit-v10](https://www.npmjs.com/package/@rushstack/rush-pnpm-kit-v10) |
100+
| [/libraries/rush-pnpm-kit-v8](./libraries/rush-pnpm-kit-v8/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v8.svg)](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v8) | [changelog](./libraries/rush-pnpm-kit-v8/CHANGELOG.md) | [@rushstack/rush-pnpm-kit-v8](https://www.npmjs.com/package/@rushstack/rush-pnpm-kit-v8) |
101+
| [/libraries/rush-pnpm-kit-v9](./libraries/rush-pnpm-kit-v9/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v9.svg)](https://badge.fury.io/js/%40rushstack%2Frush-pnpm-kit-v9) | [changelog](./libraries/rush-pnpm-kit-v9/CHANGELOG.md) | [@rushstack/rush-pnpm-kit-v9](https://www.npmjs.com/package/@rushstack/rush-pnpm-kit-v9) |
99102
| [/libraries/rush-sdk](./libraries/rush-sdk/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-sdk.svg)](https://badge.fury.io/js/%40rushstack%2Frush-sdk) | | [@rushstack/rush-sdk](https://www.npmjs.com/package/@rushstack/rush-sdk) |
100103
| [/libraries/stream-collator](./libraries/stream-collator/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fstream-collator.svg)](https://badge.fury.io/js/%40rushstack%2Fstream-collator) | [changelog](./libraries/stream-collator/CHANGELOG.md) | [@rushstack/stream-collator](https://www.npmjs.com/package/@rushstack/stream-collator) |
101104
| [/libraries/terminal](./libraries/terminal/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fterminal.svg)](https://badge.fury.io/js/%40rushstack%2Fterminal) | [changelog](./libraries/terminal/CHANGELOG.md) | [@rushstack/terminal](https://www.npmjs.com/package/@rushstack/terminal) |
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+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/lockfile-explorer",
5+
"comment": "Use pnpm dependency path implementation from `@rushstack/rush-pnpm-kit-v8`",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@rushstack/lockfile-explorer"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/rush-pnpm-kit-v10",
5+
"comment": "Set up the `@rushstack/rush-pnpm-kit-v10` package to bundle all pnpm v10 related packages together.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@rushstack/rush-pnpm-kit-v10"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/rush-pnpm-kit-v8",
5+
"comment": "Set up the `@rushstack/rush-pnpm-kit-v8` package to bundle all pnpm v8 related packages together.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@rushstack/rush-pnpm-kit-v8"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/rush-pnpm-kit-v9",
5+
"comment": "Set up the `@rushstack/rush-pnpm-kit-v9` package to bundle all pnpm v9 related packages together.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@rushstack/rush-pnpm-kit-v9"
10+
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,18 @@
102102
"name": "@pnpm/link-bins",
103103
"allowedCategories": [ "libraries" ]
104104
},
105+
{
106+
"name": "@pnpm/lockfile-file",
107+
"allowedCategories": [ "libraries" ]
108+
},
105109
{
106110
"name": "@pnpm/lockfile-types",
107111
"allowedCategories": [ "libraries" ]
108112
},
113+
{
114+
"name": "@pnpm/lockfile.fs",
115+
"allowedCategories": [ "libraries" ]
116+
},
109117
{
110118
"name": "@pnpm/lockfile.types",
111119
"allowedCategories": [ "libraries" ]
@@ -314,6 +322,18 @@
314322
"name": "@rushstack/rush-http-build-cache-plugin",
315323
"allowedCategories": [ "libraries" ]
316324
},
325+
{
326+
"name": "@rushstack/rush-pnpm-kit-v10",
327+
"allowedCategories": [ "libraries" ]
328+
},
329+
{
330+
"name": "@rushstack/rush-pnpm-kit-v8",
331+
"allowedCategories": [ "libraries" ]
332+
},
333+
{
334+
"name": "@rushstack/rush-pnpm-kit-v9",
335+
"allowedCategories": [ "libraries" ]
336+
},
317337
{
318338
"name": "@rushstack/rush-redis-cobuild-plugin",
319339
"allowedCategories": [ "tests" ]

0 commit comments

Comments
 (0)