Skip to content

Commit 8055d31

Browse files
gavinxgugavinxgu
committed
[rush] Upgrade pnpm-sync-lib to v0.3.3 for pnpm v10 compatibility
tiktok/pnpm-sync#40 tiktok/pnpm-sync#43
1 parent 8c312b2 commit 8055d31

Some content is hidden

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

51 files changed

+1183
-138
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ These GitHub repositories provide supplementary resources for Rush Stack:
8989
| [/libraries/package-extractor](./libraries/package-extractor/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fpackage-extractor.svg)](https://badge.fury.io/js/%40rushstack%2Fpackage-extractor) | [changelog](./libraries/package-extractor/CHANGELOG.md) | [@rushstack/package-extractor](https://www.npmjs.com/package/@rushstack/package-extractor) |
9090
| [/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) |
9191
| [/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) |
92+
| [/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) |
93+
| [/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) |
94+
| [/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) |
9295
| [/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) |
9396
| [/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) |
9497
| [/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) |

‎apps/lockfile-explorer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"js-yaml": "~3.13.1",
6767
"open": "~8.4.0",
6868
"update-notifier": "~5.1.0",
69-
"@pnpm/dependency-path-lockfile-pre-v9": "npm:@pnpm/dependency-path@~2.1.2",
69+
"@rushstack/rush-pnpm-kit-v8": "workspace:*",
7070
"semver": "~7.5.4",
7171
"@rushstack/rush-sdk": "workspace:*",
7272
"@rushstack/ts-command-line": "workspace:*"

‎apps/lockfile-explorer/src/utils/shrinkwrap.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
22
// See LICENSE in the project root for license information.
33

4-
import * as dependencyPathLockfilePreV9 from '@pnpm/dependency-path-lockfile-pre-v9';
4+
import * as pnpmKitV8 from '@rushstack/rush-pnpm-kit-v8';
55

66
interface IPackageInfo {
77
name: string;
@@ -12,7 +12,8 @@ interface IPackageInfo {
1212
export function convertLockfileV6DepPathToV5DepPath(newDepPath: string): string {
1313
if (!newDepPath.includes('@', 2) || newDepPath.startsWith('file:')) return newDepPath;
1414
const index = newDepPath.indexOf('@', newDepPath.indexOf('/@') + 2);
15-
if (newDepPath.includes('(') && index > dependencyPathLockfilePreV9.indexOfPeersSuffix(newDepPath)) return newDepPath;
15+
if (newDepPath.includes('(') && index > pnpmKitV8.dependencyPath.indexOfPeersSuffix(newDepPath))
16+
return newDepPath;
1617
return `${newDepPath.substring(0, index)}/${newDepPath.substring(index + 1)}`;
1718
}
1819

@@ -21,7 +22,7 @@ export function parseDependencyPath(shrinkwrapFileMajorVersion: number, newDepPa
2122
if (shrinkwrapFileMajorVersion === 6) {
2223
dependencyPath = convertLockfileV6DepPathToV5DepPath(newDepPath);
2324
}
24-
const packageInfo = dependencyPathLockfilePreV9.parse(dependencyPath);
25+
const packageInfo = pnpmKitV8.dependencyPath.parse(dependencyPath);
2526
return {
2627
name: packageInfo.name as string,
2728
peersSuffix: packageInfo.peersSuffix,

‎common/changes/@microsoft/rush/guxiang-upgrade-pnpm-sync-lib-to-3.0.1_2025-06-09-07-23.json‎

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/changes/@rushstack/lockfile-explorer/guxiang-upgrade-pnpm-sync-lib-to-0.3.3_2025-06-20-00-29.json‎

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+
}

‎common/changes/@rushstack/rush-pnpm-kit-v10/guxiang-upgrade-pnpm-sync-lib-to-0.3.3_2025-06-20-00-29.json‎

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+
}

‎common/changes/@rushstack/rush-pnpm-kit-v8/guxiang-upgrade-pnpm-sync-lib-to-0.3.3_2025-06-20-00-29.json‎

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+
}

‎common/changes/@rushstack/rush-pnpm-kit-v9/guxiang-upgrade-pnpm-sync-lib-to-0.3.3_2025-06-20-00-29.json‎

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/browser-approved-packages.json‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
{
66
"name": "@fluentui/react",
7-
"allowedCategories": [ "libraries", "vscode-extensions" ]
7+
"allowedCategories": [ "vscode-extensions" ]
88
},
99
{
1010
"name": "@fluentui/react-components",
@@ -50,10 +50,6 @@
5050
"name": "@ungap/structured-clone",
5151
"allowedCategories": [ "libraries" ]
5252
},
53-
{
54-
"name": "axios",
55-
"allowedCategories": [ "libraries" ]
56-
},
5753
{
5854
"name": "dependency-path",
5955
"allowedCategories": [ "libraries" ]
@@ -62,10 +58,6 @@
6258
"name": "local-web-rig",
6359
"allowedCategories": [ "libraries", "vscode-extensions" ]
6460
},
65-
{
66-
"name": "office-ui-fabric-core",
67-
"allowedCategories": [ "libraries" ]
68-
},
6961
{
7062
"name": "react",
7163
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
@@ -96,11 +88,7 @@
9688
},
9789
{
9890
"name": "tslib",
99-
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
100-
},
101-
{
102-
"name": "zod",
103-
"allowedCategories": [ "libraries" ]
91+
"allowedCategories": [ "tests", "vscode-extensions" ]
10492
}
10593
]
10694
}

‎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" ]
@@ -278,6 +286,18 @@
278286
"name": "@rushstack/rush-http-build-cache-plugin",
279287
"allowedCategories": [ "libraries" ]
280288
},
289+
{
290+
"name": "@rushstack/rush-pnpm-kit-v10",
291+
"allowedCategories": [ "libraries" ]
292+
},
293+
{
294+
"name": "@rushstack/rush-pnpm-kit-v8",
295+
"allowedCategories": [ "libraries" ]
296+
},
297+
{
298+
"name": "@rushstack/rush-pnpm-kit-v9",
299+
"allowedCategories": [ "libraries" ]
300+
},
281301
{
282302
"name": "@rushstack/rush-redis-cobuild-plugin",
283303
"allowedCategories": [ "tests" ]

0 commit comments

Comments
 (0)