nx 20.0.7 → 20.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.0.7",
+  "version": "20.0.9",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -36,7 +36,7 @@
   "dependencies": {
     "@napi-rs/wasm-runtime": "0.2.4",
     "@yarnpkg/lockfile": "^1.1.0",
-    "@yarnpkg/parsers": "3.0.0-rc.46",
+    "@yarnpkg/parsers": "3.0.2",
     "@zkochan/js-yaml": "0.0.7",
     "axios": "^1.7.4",
     "chalk": "^4.1.0",
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.0.7",
-    "@nx/nx-darwin-arm64": "20.0.7",
-    "@nx/nx-linux-x64-gnu": "20.0.7",
-    "@nx/nx-linux-x64-musl": "20.0.7",
-    "@nx/nx-win32-x64-msvc": "20.0.7",
-    "@nx/nx-linux-arm64-gnu": "20.0.7",
-    "@nx/nx-linux-arm64-musl": "20.0.7",
-    "@nx/nx-linux-arm-gnueabihf": "20.0.7",
-    "@nx/nx-win32-arm64-msvc": "20.0.7",
-    "@nx/nx-freebsd-x64": "20.0.7"
+    "@nx/nx-darwin-x64": "20.0.9",
+    "@nx/nx-darwin-arm64": "20.0.9",
+    "@nx/nx-linux-x64-gnu": "20.0.9",
+    "@nx/nx-linux-x64-musl": "20.0.9",
+    "@nx/nx-win32-x64-msvc": "20.0.9",
+    "@nx/nx-linux-arm64-gnu": "20.0.9",
+    "@nx/nx-linux-arm64-musl": "20.0.9",
+    "@nx/nx-linux-arm-gnueabihf": "20.0.9",
+    "@nx/nx-win32-arm64-msvc": "20.0.9",
+    "@nx/nx-freebsd-x64": "20.0.9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -22,6 +22,21 @@ export declare class ProcessTasks {
     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;
+    /**
+     * this function is used to get the non dummy dependencies of a task recursively
+     * For example, when we have the following dependencies:
+     * {
+     *   'app1:compile': [ 'app2:__nx_dummy_task__' ],
+     *   'app2:__nx_dummy_task__': [ 'app3:__nx_dummy_task__' ],
+     *   'app3:__nx_dummy_task__': [ 'app4:precompile' ],
+     *   'app4:precompile': []
+     * }
+     * getNonDummyDeps('app1:compile') will return ['app1:compile']
+     * getNonDummyDeps('app2:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app3:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app4:precompile') will return ['app4:precompile']
+     */
+    private getNonDummyDeps;
     private filterDummyTasks;
 }
 export declare function createTaskGraph(projectGraph: ProjectGraph, extraTargetDependencies: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;

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 task_graph_utils_1 = require("./task-graph-utils");
 const DUMMY_TASK_TARGET = '__nx_dummy_task__';
 class ProcessTasks {
     constructor(extraTargetDependencies, projectGraph) {
@@ -139,7 +140,7 @@ class ProcessTasks {
             else {
                 const dummyId = this.getId(depProject.name, DUMMY_TASK_TARGET, undefined);
                 this.dependencies[task.id].push(dummyId);
-                this.dependencies[dummyId] = [];
+                this.dependencies[dummyId] ??= [];
                 const noopTask = this.createDummyTask(dummyId, task);
                 this.processTask(noopTask, depProject.name, configuration, overrides);
             }
@@ -188,18 +189,45 @@ class ProcessTasks {
         }
         return id;
     }
+    /**
+     * this function is used to get the non dummy dependencies of a task recursively
+     * For example, when we have the following dependencies:
+     * {
+     *   'app1:compile': [ 'app2:__nx_dummy_task__' ],
+     *   'app2:__nx_dummy_task__': [ 'app3:__nx_dummy_task__' ],
+     *   'app3:__nx_dummy_task__': [ 'app4:precompile' ],
+     *   'app4:precompile': []
+     * }
+     * getNonDummyDeps('app1:compile') will return ['app1:compile']
+     * getNonDummyDeps('app2:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app3:__nx_dummy_task__') will return ['app4:precompile']
+     * getNonDummyDeps('app4:precompile') will return ['app4:precompile']
+     */
+    getNonDummyDeps(currentTask, originalTask, cycle) {
+        if (currentTask === originalTask) {
+            return [];
+        }
+        else if (currentTask.endsWith(DUMMY_TASK_TARGET)) {
+            if (cycle?.length && cycle?.includes(currentTask)) {
+                return [];
+            }
+            // if not a cycle, recursively get the non dummy dependencies
+            return (this.dependencies[currentTask]?.flatMap((dep) => this.getNonDummyDeps(dep, originalTask, cycle)) ?? []);
+        }
+        else {
+            return [currentTask];
+        }
+    }
     filterDummyTasks() {
+        const cycle = (0, task_graph_utils_1.findCycle)({ dependencies: this.dependencies });
         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);
+            if (!key.endsWith(DUMMY_TASK_TARGET)) {
+                const normalizedDeps = [];
+                for (const dep of deps) {
+                    normalizedDeps.push(...this.getNonDummyDeps(dep, key, cycle));
                 }
+                this.dependencies[key] = normalizedDeps;
             }
-            this.dependencies[key] = normalizedDeps;
         }
         for (const key of Object.keys(this.dependencies)) {
             if (key.endsWith(DUMMY_TASK_TARGET)) {