nx 19.5.7 → 19.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.5.7",
+  "version": "19.5.9",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.5.7"
+    "@nrwl/tao": "19.5.9"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.5.7",
-    "@nx/nx-darwin-arm64": "19.5.7",
-    "@nx/nx-linux-x64-gnu": "19.5.7",
-    "@nx/nx-linux-x64-musl": "19.5.7",
-    "@nx/nx-win32-x64-msvc": "19.5.7",
-    "@nx/nx-linux-arm64-gnu": "19.5.7",
-    "@nx/nx-linux-arm64-musl": "19.5.7",
-    "@nx/nx-linux-arm-gnueabihf": "19.5.7",
-    "@nx/nx-win32-arm64-msvc": "19.5.7",
-    "@nx/nx-freebsd-x64": "19.5.7"
+    "@nx/nx-darwin-x64": "19.5.9",
+    "@nx/nx-darwin-arm64": "19.5.9",
+    "@nx/nx-linux-x64-gnu": "19.5.9",
+    "@nx/nx-linux-x64-musl": "19.5.9",
+    "@nx/nx-win32-x64-msvc": "19.5.9",
+    "@nx/nx-linux-arm64-gnu": "19.5.9",
+    "@nx/nx-linux-arm64-musl": "19.5.9",
+    "@nx/nx-linux-arm-gnueabihf": "19.5.9",
+    "@nx/nx-win32-arm64-msvc": "19.5.9",
+    "@nx/nx-freebsd-x64": "19.5.9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/tasks-runner/create-task-graph.d.ts

@@ -18,9 +18,11 @@ export declare class ProcessTasks {
     private processTasksForMultipleProjects;
     private processTasksForSingleProject;
     private processTasksForDependencies;
+    private createDummyTask;
     createTask(id: string, project: ProjectGraphProjectNode, target: string, resolvedConfiguration: string | undefined, overrides: Object): Task;
     resolveConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string | undefined): string;
     getId(project: string, target: string, configuration: string | undefined): string;
+    private filterDummyTasks;
 }
 export declare function createTaskGraph(projectGraph: ProjectGraph, extraTargetDependencies: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;
 export declare function mapTargetDefaultsToDependencies(defaults: TargetDefaults | undefined): TargetDependencies;

package/src/tasks-runner/create-task-graph.js

@@ -6,6 +6,7 @@ exports.mapTargetDefaultsToDependencies = mapTargetDefaultsToDependencies;
 const utils_1 = require("./utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const output_1 = require("../utils/output");
+const DUMMY_TASK_TARGET = '__nx_dummy_task__';
 class ProcessTasks {
     constructor(extraTargetDependencies, projectGraph) {
         this.extraTargetDependencies = extraTargetDependencies;
@@ -52,10 +53,11 @@ class ProcessTasks {
                 this.dependencies[d] = this.dependencies[d].filter((dd) => !!initialTasks[dd]);
             }
         }
-        for (const projectName of Object.keys(this.dependencies)) {
-            if (this.dependencies[projectName].length > 1) {
-                this.dependencies[projectName] = [
-                    ...new Set(this.dependencies[projectName]).values(),
+        this.filterDummyTasks();
+        for (const taskId of Object.keys(this.dependencies)) {
+            if (this.dependencies[taskId].length > 0) {
+                this.dependencies[taskId] = [
+                    ...new Set(this.dependencies[taskId].filter((d) => d !== taskId)).values(),
                 ];
             }
         }
@@ -113,6 +115,9 @@ class ProcessTasks {
         }
     }
     processTasksForDependencies(projectUsedToDeriveDependencies, dependencyConfig, configuration, task, taskOverrides, overrides) {
+        if (!this.projectGraph.dependencies.hasOwnProperty(projectUsedToDeriveDependencies)) {
+            return;
+        }
         for (const dep of this.projectGraph.dependencies[projectUsedToDeriveDependencies]) {
             const depProject = this.projectGraph.nodes[dep.target];
             // this is to handle external dependencies
@@ -132,10 +137,20 @@ class ProcessTasks {
                 }
             }
             else {
-                this.processTask(task, depProject.name, configuration, overrides);
+                const dummyId = this.getId(depProject.name, DUMMY_TASK_TARGET, undefined);
+                this.dependencies[task.id].push(dummyId);
+                this.dependencies[dummyId] = [];
+                const noopTask = this.createDummyTask(dummyId, task);
+                this.processTask(noopTask, depProject.name, configuration, overrides);
             }
         }
     }
+    createDummyTask(id, task) {
+        return {
+            ...task,
+            id,
+        };
+    }
     createTask(id, project, target, resolvedConfiguration, overrides) {
         if (!project.data.targets[target]) {
             throw new Error(`Cannot find configuration for task ${project.name}:${target}`);
@@ -173,6 +188,25 @@ class ProcessTasks {
         }
         return id;
     }
+    filterDummyTasks() {
+        for (const [key, deps] of Object.entries(this.dependencies)) {
+            const normalizedDeps = [];
+            for (const dep of deps) {
+                if (dep.endsWith(DUMMY_TASK_TARGET)) {
+                    normalizedDeps.push(...this.dependencies[dep].filter((d) => !d.endsWith(DUMMY_TASK_TARGET)));
+                }
+                else {
+                    normalizedDeps.push(dep);
+                }
+            }
+            this.dependencies[key] = normalizedDeps;
+        }
+        for (const key of Object.keys(this.dependencies)) {
+            if (key.endsWith(DUMMY_TASK_TARGET)) {
+                delete this.dependencies[key];
+            }
+        }
+    }
 }
 exports.ProcessTasks = ProcessTasks;
 function createTaskGraph(projectGraph, extraTargetDependencies, projectNames, targets, configuration, overrides, excludeTaskDependencies = false) {