From 28b59100752da6ce401a0dfcde4b7a68aee5b4c7 Mon Sep 17 00:00:00 2001 From: Chao Guo <10736839+g-chao@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:46:41 -0700 Subject: [PATCH 1/3] fix: remove version field when calculate packageJsonInjectedDependenciesHash --- libraries/rush-lib/src/api/Subspace.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/rush-lib/src/api/Subspace.ts b/libraries/rush-lib/src/api/Subspace.ts index 8b03de80537..122902a0c44 100644 --- a/libraries/rush-lib/src/api/Subspace.ts +++ b/libraries/rush-lib/src/api/Subspace.ts @@ -33,6 +33,8 @@ interface ISubspaceDetail { tempShrinkwrapPreinstallFilename: string; } +interface IPackageJsonLite extends Omit {} + /** * This represents the subspace configurations for a repository, based on the "subspaces.json" * configuration file. @@ -331,7 +333,7 @@ export class Subspace { * @beta */ public getPackageJsonInjectedDependenciesHash(): string | undefined { - const allPackageJson: IPackageJson[] = []; + const allPackageJson: IPackageJsonLite[] = []; const relatedProjects: RushConfigurationProject[] = []; const subspacePnpmfileShimSettings: ISubspacePnpmfileShimSettings = @@ -364,7 +366,6 @@ export class Subspace { // collect fields that could update the `pnpm-lock.yaml` const { name, - version, bin, dependencies, devDependencies, @@ -377,7 +378,6 @@ export class Subspace { allPackageJson.push({ name, - version, bin, dependencies, devDependencies, From 326bf4e0dc230c1acb10a3dfa2bd70119b4b0515 Mon Sep 17 00:00:00 2001 From: Chao Guo <10736839+g-chao@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:48:40 -0700 Subject: [PATCH 2/3] chore: rush update --- ...eJsonInjectedDependenciesHash_2024-06-25-17-48.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json diff --git a/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json b/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json new file mode 100644 index 00000000000..9cf7e0827d9 --- /dev/null +++ b/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Don't include package.json verison field when calculating packageJsonInjectedDependenciesHash", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file From 4aecebc5f7af2992a57c238d05fbedca931ce15b Mon Sep 17 00:00:00 2001 From: Chao Guo <10736839+g-chao@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:50:00 -0700 Subject: [PATCH 3/3] chore: rush update --- ...getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json b/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json index 9cf7e0827d9..b11c4a8074e 100644 --- a/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json +++ b/common/changes/@microsoft/rush/chao-fix-getPackageJsonInjectedDependenciesHash_2024-06-25-17-48.json @@ -2,7 +2,7 @@ "changes": [ { "packageName": "@microsoft/rush", - "comment": "Don't include package.json verison field when calculating packageJsonInjectedDependenciesHash", + "comment": "Don't include package.json version field when calculating packageJsonInjectedDependenciesHash", "type": "none" } ],