From 119ab34861e3fcdadbf9eb03a7ede8e7e78e7a15 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Thu, 26 Dec 2024 11:35:38 -0700 Subject: [PATCH 1/2] fix: allow injected dependencies when subspaces are disabled Signed-off-by: Aramis Sennyey --- libraries/rush-lib/src/logic/RepoStateFile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/logic/RepoStateFile.ts b/libraries/rush-lib/src/logic/RepoStateFile.ts index 3d875afd66c..074609fa363 100644 --- a/libraries/rush-lib/src/logic/RepoStateFile.ts +++ b/libraries/rush-lib/src/logic/RepoStateFile.ts @@ -200,7 +200,7 @@ export class RepoStateFile { this._modified = true; } - if (rushConfiguration.isPnpm && rushConfiguration.subspacesFeatureEnabled) { + if (rushConfiguration.isPnpm) { const packageJsonInjectedDependenciesHash: string | undefined = subspace.getPackageJsonInjectedDependenciesHash(variant); From ec1df7e248072ef555dd38f8fcc4364d37218d25 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Thu, 26 Dec 2024 12:46:10 -0700 Subject: [PATCH 2/2] add changelog Signed-off-by: Aramis Sennyey --- ...ed-deps-outside-of-subspaces_2024-12-26-19-45.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@microsoft/rush/sennyeya-allow-injected-deps-outside-of-subspaces_2024-12-26-19-45.json diff --git a/common/changes/@microsoft/rush/sennyeya-allow-injected-deps-outside-of-subspaces_2024-12-26-19-45.json b/common/changes/@microsoft/rush/sennyeya-allow-injected-deps-outside-of-subspaces_2024-12-26-19-45.json new file mode 100644 index 00000000000..3da655a179e --- /dev/null +++ b/common/changes/@microsoft/rush/sennyeya-allow-injected-deps-outside-of-subspaces_2024-12-26-19-45.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "Allow injected dependencies without enabling subspaces.", + "type": "none", + "packageName": "@microsoft/rush" + } + ], + "packageName": "@microsoft/rush", + "email": "aramissennyeydd@users.noreply.github.com" +} \ No newline at end of file