From bb2695ee637fc4bf8eedcecd22e03de8fa832107 Mon Sep 17 00:00:00 2001 From: Gu Xiang <42297553+gavinxgu@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:24:52 +0800 Subject: [PATCH] [rush] Upgrade `pnpm-sync-lib` to v0.3.1 for pnpm v9 compatibility https://github.com/tiktok/pnpm-sync/pull/40 --- ...pm-sync-lib-to-3.0.1_2025-06-09-07-23.json | 10 ++++++++ .../build-tests-subspace/pnpm-lock.yaml | 23 ++++++++++--------- .../build-tests-subspace/repo-state.json | 4 ++-- .../config/subspaces/default/pnpm-lock.yaml | 17 +++++++------- .../config/subspaces/default/repo-state.json | 2 +- libraries/rush-lib/package.json | 2 +- 6 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 common/changes/@microsoft/rush/guxiang-upgrade-pnpm-sync-lib-to-3.0.1_2025-06-09-07-23.json diff --git a/common/changes/@microsoft/rush/guxiang-upgrade-pnpm-sync-lib-to-3.0.1_2025-06-09-07-23.json b/common/changes/@microsoft/rush/guxiang-upgrade-pnpm-sync-lib-to-3.0.1_2025-06-09-07-23.json new file mode 100644 index 00000000000..4f55d869830 --- /dev/null +++ b/common/changes/@microsoft/rush/guxiang-upgrade-pnpm-sync-lib-to-3.0.1_2025-06-09-07-23.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Upgrade `pnpm-sync-lib` to v0.3.1 for pnpm v9 compatibility", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml index b8d783e01eb..670d9d1d192 100644 --- a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml +++ b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml @@ -1391,7 +1391,7 @@ packages: globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 - semver: 7.6.3 + semver: 7.7.2 ts-api-utils: 1.4.3(typescript@5.8.2) typescript: 5.8.2 transitivePeerDependencies: @@ -1449,7 +1449,7 @@ packages: '@typescript-eslint/types': 6.21.0(typescript@5.8.2) '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.8.2) eslint: 8.57.1 - semver: 7.6.3 + semver: 7.7.2 transitivePeerDependencies: - supports-color - typescript @@ -2326,7 +2326,7 @@ packages: require-package-name: 2.0.1 resolve: 1.22.8 resolve-from: 5.0.0 - semver: 7.6.3 + semver: 7.7.2 yargs: 16.2.0 transitivePeerDependencies: - supports-color @@ -4074,7 +4074,7 @@ packages: jest-util: 29.7.0 natural-compare: 1.4.0 pretty-format: 29.7.0 - semver: 7.6.3 + semver: 7.7.2 transitivePeerDependencies: - supports-color dev: true @@ -4569,7 +4569,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.15.1 - semver: 7.6.3 + semver: 7.7.2 validate-npm-package-license: 3.0.4 /normalize-path@3.0.0: @@ -4814,7 +4814,7 @@ packages: got: 11.8.6 registry-auth-token: 4.2.2 registry-url: 5.1.0 - semver: 7.6.3 + semver: 7.7.2 /pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} @@ -4900,10 +4900,11 @@ packages: dependencies: semver-compare: 1.0.0 - /pnpm-sync-lib@0.3.0: - resolution: {integrity: sha512-Wt3Xf8pjzC2xcyN6ol5x5PdD5kU75+8OOgll2ZQsgm5uxih6dxziqRRuhNwtw94GHRd/0Oo7ESFmzmRz6OTQ0Q==} + /pnpm-sync-lib@0.3.1: + resolution: {integrity: sha512-peW6ZHSwAfQzeH1Zobjha3op9gGUx05Uz31ZcaS1B3hUwe/5mWk//Rrk1eFix67idSWz7yGfZzT50QQPRiFcdw==} dependencies: - '@pnpm/dependency-path': 2.1.8 + '@pnpm/dependency-path-2': /@pnpm/dependency-path@2.1.8 + '@pnpm/dependency-path-5': /@pnpm/dependency-path@5.1.7 yaml: 2.4.1 /possible-typed-array-names@1.0.0: @@ -5850,7 +5851,7 @@ packages: is-yarn-global: 0.3.0 latest-version: 5.1.0 pupa: 2.1.1 - semver: 7.6.3 + semver: 7.7.2 semver-diff: 3.1.1 xdg-basedir: 4.0.0 @@ -6503,7 +6504,7 @@ packages: js-yaml: 3.13.1 npm-check: 6.0.1 npm-package-arg: 6.1.1 - pnpm-sync-lib: 0.3.0 + pnpm-sync-lib: 0.3.1 read-package-tree: 5.1.6 rxjs: 6.6.7 semver: 7.5.4 diff --git a/common/config/subspaces/build-tests-subspace/repo-state.json b/common/config/subspaces/build-tests-subspace/repo-state.json index 7d80b11e4e5..27da4197fbf 100644 --- a/common/config/subspaces/build-tests-subspace/repo-state.json +++ b/common/config/subspaces/build-tests-subspace/repo-state.json @@ -1,6 +1,6 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "c7ba4d11d03d9e1b14ba33e023a043d385fa3fd8", + "pnpmShrinkwrapHash": "514db4b5676f1ec97ea74b76ab56a33d6e0eb2a8", "preferredVersionsHash": "54149ea3f01558a859c96dee2052b797d4defe68", - "packageJsonInjectedDependenciesHash": "de32ff5fe062252f7310c4fb86383790757d735c" + "packageJsonInjectedDependenciesHash": "d096bf6c7d5d2eb94d9ae2540de04c5c37b69c91" } diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml index 1ba0045bb90..6e2a697a0ae 100644 --- a/common/config/subspaces/default/pnpm-lock.yaml +++ b/common/config/subspaces/default/pnpm-lock.yaml @@ -3297,12 +3297,12 @@ importers: '@pnpm/dependency-path': specifier: ~1000.0.9 version: 1000.0.9 - '@pnpm/dependency-path-lockfile-pre-v9': - specifier: npm:@pnpm/dependency-path@~2.1.2 - version: /@pnpm/dependency-path@2.1.8 '@pnpm/dependency-path-lockfile-pre-v10': specifier: npm:@pnpm/dependency-path@~5.1.7 version: /@pnpm/dependency-path@5.1.7 + '@pnpm/dependency-path-lockfile-pre-v9': + specifier: npm:@pnpm/dependency-path@~2.1.2 + version: /@pnpm/dependency-path@2.1.8 '@pnpm/link-bins': specifier: ~5.3.7 version: 5.3.25 @@ -3376,8 +3376,8 @@ importers: specifier: ~6.1.0 version: 6.1.1 pnpm-sync-lib: - specifier: 0.3.0 - version: 0.3.0 + specifier: 0.3.1 + version: 0.3.1 read-package-tree: specifier: ~5.1.5 version: 5.1.6 @@ -24183,10 +24183,11 @@ packages: - typescript dev: true - /pnpm-sync-lib@0.3.0: - resolution: {integrity: sha512-Wt3Xf8pjzC2xcyN6ol5x5PdD5kU75+8OOgll2ZQsgm5uxih6dxziqRRuhNwtw94GHRd/0Oo7ESFmzmRz6OTQ0Q==} + /pnpm-sync-lib@0.3.1: + resolution: {integrity: sha512-peW6ZHSwAfQzeH1Zobjha3op9gGUx05Uz31ZcaS1B3hUwe/5mWk//Rrk1eFix67idSWz7yGfZzT50QQPRiFcdw==} dependencies: - '@pnpm/dependency-path': 2.1.8 + '@pnpm/dependency-path-2': /@pnpm/dependency-path@2.1.8 + '@pnpm/dependency-path-5': /@pnpm/dependency-path@5.1.7 yaml: 2.4.1 dev: false diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json index ba81c6eded1..0dfa36dfa6e 100644 --- a/common/config/subspaces/default/repo-state.json +++ b/common/config/subspaces/default/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "cf20a3884c11c43ea03f638be650d85b8a86e963", + "pnpmShrinkwrapHash": "9fb69036f728baa8dee343b4cbc3f70e854f8dbf", "preferredVersionsHash": "54149ea3f01558a859c96dee2052b797d4defe68" } diff --git a/libraries/rush-lib/package.json b/libraries/rush-lib/package.json index b63dae9b9b6..d2b48e9a57d 100644 --- a/libraries/rush-lib/package.json +++ b/libraries/rush-lib/package.json @@ -65,7 +65,7 @@ "tar": "~6.2.1", "true-case-path": "~2.2.1", "uuid": "~8.3.2", - "pnpm-sync-lib": "0.3.0" + "pnpm-sync-lib": "0.3.1" }, "devDependencies": { "@pnpm/lockfile.types": "~1.0.3",