From 48444792416c5187b50dc4c6ba2979e915aae042 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 10 Jun 2025 14:05:17 -0400 Subject: [PATCH 1/2] Bump pnpm-sync-lib to support PNPM v9. --- .../rush/pnpm-sync-0.3.1_2025-06-10-18-05.json | 10 ++++++++++ common/config/subspaces/default/pnpm-lock.yaml | 11 ++++++----- common/config/subspaces/default/repo-state.json | 2 +- libraries/rush-lib/package.json | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 common/changes/@microsoft/rush/pnpm-sync-0.3.1_2025-06-10-18-05.json diff --git a/common/changes/@microsoft/rush/pnpm-sync-0.3.1_2025-06-10-18-05.json b/common/changes/@microsoft/rush/pnpm-sync-0.3.1_2025-06-10-18-05.json new file mode 100644 index 00000000000..d131b6a5db6 --- /dev/null +++ b/common/changes/@microsoft/rush/pnpm-sync-0.3.1_2025-06-10-18-05.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Add support for PNPM v9 to the pnpm-sync feature.", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml index 2ef7494dd10..c432cfa3d9c 100644 --- a/common/config/subspaces/default/pnpm-lock.yaml +++ b/common/config/subspaces/default/pnpm-lock.yaml @@ -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 @@ -24205,10 +24205,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", From 8551eb3ee66668ad6f8c4d5a7273a9565cb29c5d Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 10 Jun 2025 14:53:50 -0400 Subject: [PATCH 2/2] Bump to 0.3.2 --- .../subspaces/build-tests-subspace/pnpm-lock.yaml | 11 ++++++----- .../subspaces/build-tests-subspace/repo-state.json | 4 ++-- common/config/subspaces/default/pnpm-lock.yaml | 8 ++++---- common/config/subspaces/default/repo-state.json | 2 +- libraries/rush-lib/package.json | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml index b8d783e01eb..5f2928206eb 100644 --- a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml +++ b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml @@ -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: @@ -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.2: + resolution: {integrity: sha512-XlHyNAHlBqIMGTBD0HfgyRyj1UpSJvVyP20ihPek00YKmMb7RJ16AxlQkjT1jQ/D6s6OAT0ety/tSxcJTrvQ4w==} 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: @@ -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.2 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..6bda9170b8e 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": "40cbf48a53cad8d9f815d7d1d8ec18a48233a1ad", "preferredVersionsHash": "54149ea3f01558a859c96dee2052b797d4defe68", - "packageJsonInjectedDependenciesHash": "de32ff5fe062252f7310c4fb86383790757d735c" + "packageJsonInjectedDependenciesHash": "8bc9d0aabfed5614af0cf7950d2ba377e412b716" } diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml index c432cfa3d9c..020635b8d97 100644 --- a/common/config/subspaces/default/pnpm-lock.yaml +++ b/common/config/subspaces/default/pnpm-lock.yaml @@ -3376,8 +3376,8 @@ importers: specifier: ~6.1.0 version: 6.1.1 pnpm-sync-lib: - specifier: 0.3.1 - version: 0.3.1 + specifier: 0.3.2 + version: 0.3.2 read-package-tree: specifier: ~5.1.5 version: 5.1.6 @@ -24205,8 +24205,8 @@ packages: - typescript dev: true - /pnpm-sync-lib@0.3.1: - resolution: {integrity: sha512-peW6ZHSwAfQzeH1Zobjha3op9gGUx05Uz31ZcaS1B3hUwe/5mWk//Rrk1eFix67idSWz7yGfZzT50QQPRiFcdw==} + /pnpm-sync-lib@0.3.2: + resolution: {integrity: sha512-XlHyNAHlBqIMGTBD0HfgyRyj1UpSJvVyP20ihPek00YKmMb7RJ16AxlQkjT1jQ/D6s6OAT0ety/tSxcJTrvQ4w==} dependencies: '@pnpm/dependency-path-2': /@pnpm/dependency-path@2.1.8 '@pnpm/dependency-path-5': /@pnpm/dependency-path@5.1.7 diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json index 0dfa36dfa6e..d3f09b6dec3 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": "9fb69036f728baa8dee343b4cbc3f70e854f8dbf", + "pnpmShrinkwrapHash": "d132a98928f381f6aae3c1da00a3939f2d38dafe", "preferredVersionsHash": "54149ea3f01558a859c96dee2052b797d4defe68" } diff --git a/libraries/rush-lib/package.json b/libraries/rush-lib/package.json index d2b48e9a57d..5ae7d2e259f 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.1" + "pnpm-sync-lib": "0.3.2" }, "devDependencies": { "@pnpm/lockfile.types": "~1.0.3",