nx 22.1.0-canary.20251111-647d751 → 22.1.0-rc.0

package/src/nx-cloud/generators/connect-to-nx-cloud/schema.json

@@ -1,41 +1,41 @@
 {
-    "$schema": "https://json-schema.org/schema",
-    "id": "NxCloudInit",
-    "title": "Add Nx Cloud Configuration to the workspace",
-    "description": "Connect a workspace to Nx Cloud.",
-    "type": "object",
-    "cli": "nx",
-    "properties": {
-        "analytics": {
-            "type": "boolean",
-            "description": "Anonymously store hashed machine ID for task runs",
-            "default": false
-        },
-        "installationSource": {
-            "type": "string",
-            "description": "Name of Nx Cloud installation invoker (ex. user, add-nx-to-monorepo, create-nx-workspace, nx-upgrade",
-            "default": "user"
-        },
-        "hideFormatLogs": {
-            "type": "boolean",
-            "description": "Hide formatting logs",
-            "x-priority": "internal"
-        },
-        "generateToken": {
-            "type": "boolean",
-            "description": "Explicitly asks for a token to be created, do not override existing tokens from Nx Cloud"
-        },
-        "github": {
-            "type": "boolean",
-            "description": "If the user will be using GitHub as their git hosting provider",
-            "default": false
-        },
-        "directory": {
-            "type": "string",
-            "description": "The directory where the workspace is located",
-            "x-priority": "internal"
-        }
+  "$schema": "https://json-schema.org/schema",
+  "id": "NxCloudInit",
+  "title": "Add Nx Cloud Configuration to the workspace",
+  "description": "Connect a workspace to Nx Cloud.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "analytics": {
+      "type": "boolean",
+      "description": "Anonymously store hashed machine ID for task runs",
+      "default": false
     },
-    "additionalProperties": false,
-    "required": []
+    "installationSource": {
+      "type": "string",
+      "description": "Name of Nx Cloud installation invoker (ex. user, add-nx-to-monorepo, create-nx-workspace, nx-upgrade",
+      "default": "user"
+    },
+    "hideFormatLogs": {
+      "type": "boolean",
+      "description": "Hide formatting logs",
+      "x-priority": "internal"
+    },
+    "generateToken": {
+      "type": "boolean",
+      "description": "Explicitly asks for a token to be created, do not override existing tokens from Nx Cloud"
+    },
+    "github": {
+      "type": "boolean",
+      "description": "If the user will be using GitHub as their git hosting provider",
+      "default": false
+    },
+    "directory": {
+      "type": "string",
+      "description": "The directory where the workspace is located",
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false,
+  "required": []
 }

package/src/tasks-runner/tasks-schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks-schedule.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,MAAM,WAAW,KAAK;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,qBAAa,aAAa;IAetB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,eAAe,CAAwC;IAC/D,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,WAAW,CAAwC;IAE3D,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,8BAA8B,CAAqB;IAC3D,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,OAAO,CAAC,mBAAmB,CAA8B;gBAGtC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,yBAAyB;IAGxC,IAAI;IAkBJ,iBAAiB;IAMvB,QAAQ;IASR,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE;IAW1B,oBAAoB;;;;IAOpB,QAAQ;IAQR,SAAS,IAAI,KAAK;IAMlB,kBAAkB,IAAI,IAAI,EAAE;YAUrB,aAAa;YAWb,YAAY;YAkDZ,eAAe;IAY7B,OAAO,CAAC,aAAa;YAUP,qBAAqB;IAoDnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,cAAc;IAiCf,uBAAuB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAGzD"}
+{"version":3,"file":"tasks-schedule.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,MAAM,WAAW,KAAK;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,qBAAa,aAAa;IAetB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,eAAe,CAAwC;IAC/D,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,WAAW,CAAwC;IAE3D,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,8BAA8B,CAAqB;IAC3D,OAAO,CAAC,oBAAoB,CAA8B;IAC1D,OAAO,CAAC,mBAAmB,CAA8B;gBAGtC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,yBAAyB;IAGxC,IAAI;IAkBJ,iBAAiB;IAMvB,QAAQ;IASR,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE;IAW1B,oBAAoB;;;;IAOpB,QAAQ;IAQR,SAAS,IAAI,KAAK;IAMlB,kBAAkB,IAAI,IAAI,EAAE;YAUrB,aAAa;YAWb,YAAY;YAkDZ,eAAe;IAkB7B,OAAO,CAAC,aAAa;YAUP,qBAAqB;IA+DnC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,cAAc;IAiCf,uBAAuB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAGzD"}

package/src/tasks-runner/tasks-schedule.js

@@ -128,7 +128,7 @@ class TasksSchedule {
         for (const root of this.notScheduledTaskGraph.roots) {
             const rootTask = this.notScheduledTaskGraph.tasks[root];
             const executorName = (0, utils_1.getExecutorNameForTask)(rootTask, this.projectGraph);
-            await this.processTaskForBatches(batchMap, rootTask, executorName, true);
+            await this.processTaskForBatches(batchMap, rootTask, executorName, true, new Set());
         }
         for (const [executorName, taskGraph] of Object.entries(batchMap)) {
             this.scheduleBatch({ executorName, taskGraph });
@@ -139,7 +139,11 @@ class TasksSchedule {
         this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, Object.keys(taskGraph.tasks));
         this.scheduledBatches.push({ executorName, taskGraph });
     }
-    async processTaskForBatches(batches, task, rootExecutorName, isRoot) {
+    async processTaskForBatches(batches, task, rootExecutorName, isRoot, visitedInBatch) {
+        // Skip if already processed in this batch - prevents redundant traversals
+        if (visitedInBatch.has(task.id)) {
+            return;
+        }
         if (!this.canBatchTaskBeScheduled(task, batches[rootExecutorName])) {
             return;
         }
@@ -151,6 +155,9 @@ class TasksSchedule {
         if (!batchImplementationFactory) {
             return;
         }
+        // Mark as visited only after all checks pass and we're actually adding to batch
+        // This ensures tasks can be added if they pass checks from any path
+        visitedInBatch.add(task.id);
         const batch = (batches[rootExecutorName] =
             batches[rootExecutorName] ??
                 {
@@ -169,7 +176,7 @@ class TasksSchedule {
         }
         for (const dep of this.reverseTaskDeps[task.id]) {
             const depTask = this.taskGraph.tasks[dep];
-            await this.processTaskForBatches(batches, depTask, rootExecutorName, false);
+            await this.processTaskForBatches(batches, depTask, rootExecutorName, false, visitedInBatch);
         }
     }
     canBatchTaskBeScheduled(task, batchTaskGraph) {