fix(schematics): topologically sort projects for `affected:build --al…

…l` in v7 Closes nrwl#1302 Aligns behaviour of `affected --base=[SHA] --head=[SHA]` and `affected --all`
dherges · May 1, 2019 · 1e4b5c5 · 1e4b5c5
1 parent df6cd70
commit 1e4b5c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/schematics/src/command-line/affected.ts b/packages/schematics/src/command-line/affected.ts
@@ -13,7 +13,7 @@ import {
   getAllLibNames,
   getProjectNames,
   parseFiles,
-  getAllProjectNamesWithTarget,
+  getAllProjectsWithTarget,
   getAffectedProjectsWithTarget,
   readAngularJson
 } from './shared';
@@ -122,7 +122,7 @@ function getProjects(
   all: boolean
 ) {
   const projects = all
-    ? getAllProjectNamesWithTarget(target)
+    ? getAllProjectsWithTarget(target)
     : getAffectedProjectsWithTarget(target)(parseFiles(parsedArgs).files);
 
   return projects

diff --git a/packages/schematics/src/command-line/shared.ts b/packages/schematics/src/command-line/shared.ts
@@ -349,6 +349,16 @@ export function getAllProjectNamesWithTarget(target: string) {
   return getProjectNames(p => p.architect[target]);
 }
 
+export function getAllProjectsWithTarget(target: string) {
+  const angularJson = readAngularJson();
+  const nxJson = readNxJson();
+  const projects = getProjectNodes(angularJson, nxJson);
+  const dependencies = readDependencies(nxJson.npmScope, projects);
+  const sortedProjects = topologicallySortProjects(projects, dependencies);
+
+  return sortedProjects.filter(p => p.architect[target]).map(p => p.name);
+}
+
 export function getProjectNames(
   predicate?: (projectNode: ProjectNode) => boolean
 ): string[] {