Merge pull request microsoft#4693 from EscapeB/fix/fix_deploy_issue_4683

octogonz · web-flow · commit dfb13d8cb3d8 · 2024-05-09T23:24:58.000-07:00
[rush] fix additionalProjectsToInclude field didn't work in rush deploy
diff --git a/common/changes/@microsoft/rush/fix-fix_deploy_issue_4683_2024-05-10-04-40.json b/common/changes/@microsoft/rush/fix-fix_deploy_issue_4683_2024-05-10-04-40.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix a recent regression where `rush deploy` did not correctly apply the `additionalProjectsToInclude` setting (GitHub #4683)",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/cli/actions/DeployAction.ts b/libraries/rush-lib/src/cli/actions/DeployAction.ts
@@ -103,25 +103,6 @@ export class DeployAction extends BaseRushAction {
     });
   }
 
-  private _getDependencyProjects(project: RushConfigurationProject): Set<RushConfigurationProject> {
-    const projects: Set<RushConfigurationProject> = new Set();
-    const queue: RushConfigurationProject[] = [project];
-    const visited: Set<RushConfigurationProject> = new Set();
-
-    while (queue.length > 0) {
-      const _project: RushConfigurationProject = queue.pop()!;
-      projects.add(_project);
-      for (const dependency of _project.dependencyProjects) {
-        if (visited.has(dependency)) {
-          continue;
-        }
-        queue.push(dependency);
-      }
-    }
-
-    return projects;
-  }
-
   protected async runAsync(): Promise<void> {
     const scenarioName: string | undefined = this._scenario.value;
     const { DeployScenarioConfiguration } = await import('../../logic/deploy/DeployScenarioConfiguration');
@@ -177,7 +158,7 @@ export class DeployAction extends BaseRushAction {
       throw new Error(`The specified deployment project "${mainProjectName}" was not found in rush.json`);
     }
 
-    const projects: Set<RushConfigurationProject> = this._getDependencyProjects(rushConfigurationProject);
+    const projects: RushConfigurationProject[] = this.rushConfiguration.projects;
     if (this.rushConfiguration.packageManager === 'pnpm') {
       for (const project of projects) {
         const pnpmfileConfiguration: PnpmfileConfiguration = await PnpmfileConfiguration.initializeAsync(
