nx 22.1.0-canary.20251106-e9146c7 → 22.1.0-canary.20251110-73ecb30

package/src/executors/noop/schema.json

@@ -1,10 +1,10 @@
 {
-    "version": 2,
-    "title": "Noop",
-    "description": "An executor that does nothing.",
-    "type": "object",
-    "cli": "nx",
-    "outputCapture": "pipe",
-    "properties": {},
-    "additionalProperties": true
+  "version": 2,
+  "title": "Noop",
+  "description": "An executor that does nothing.",
+  "type": "object",
+  "cli": "nx",
+  "outputCapture": "pipe",
+  "properties": {},
+  "additionalProperties": true
 }

package/src/executors/run-commands/schema.json

@@ -1,198 +1,198 @@
 {
-    "version": 2,
-    "title": "Run Commands",
-    "description": "Run any custom commands with Nx.",
-    "type": "object",
-    "cli": "nx",
-    "outputCapture": "pipe",
-    "presets": [
-        {
-            "name": "Arguments forwarding",
-            "keys": ["commands"]
-        },
-        {
-            "name": "Custom done conditions",
-            "keys": ["commands", "readyWhen"]
-        },
-        {
-            "name": "Setting the cwd",
-            "keys": ["commands", "cwd"]
-        }
-    ],
-    "properties": {
-        "commands": {
-            "type": "array",
-            "description": "Commands to run in child process.",
-            "items": {
-                "oneOf": [
-                    {
-                        "type": "object",
-                        "properties": {
-                            "command": {
-                                "type": "string",
-                                "description": "Command to run in child process."
-                            },
-                            "forwardAllArgs": {
-                                "type": "boolean",
-                                "description": "Whether arguments should be forwarded when interpolation is not present."
-                            },
-                            "prefix": {
-                                "type": "string",
-                                "description": "Prefix in front of every line out of the output"
-                            },
-                            "prefixColor": {
-                                "type": "string",
-                                "description": "Color of the prefix",
-                                "enum": [
-                                    "black",
-                                    "red",
-                                    "green",
-                                    "yellow",
-                                    "blue",
-                                    "magenta",
-                                    "cyan",
-                                    "white"
-                                ]
-                            },
-                            "color": {
-                                "type": "string",
-                                "description": "Color of the output",
-                                "enum": [
-                                    "black",
-                                    "red",
-                                    "green",
-                                    "yellow",
-                                    "blue",
-                                    "magenta",
-                                    "cyan",
-                                    "white"
-                                ]
-                            },
-                            "bgColor": {
-                                "type": "string",
-                                "description": "Background color of the output",
-                                "enum": [
-                                    "bgBlack",
-                                    "bgRed",
-                                    "bgGreen",
-                                    "bgYellow",
-                                    "bgBlue",
-                                    "bgMagenta",
-                                    "bgCyan",
-                                    "bgWhite"
-                                ]
-                            },
-                            "description": {
-                                "type": "string",
-                                "description": "An optional description useful for inline documentation purposes. It is not used as part of the execution of the command."
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": ["command"]
-                    },
-                    {
-                        "type": "string"
-                    }
-                ]
-            },
-            "x-priority": "important"
-        },
-        "command": {
-            "oneOf": [
-                {
-                    "type": "array",
-                    "description": "Command to run in child process, but divided into parts.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "x-priority": "important"
-                },
-                {
-                    "type": "string",
-                    "description": "Command to run in child process."
-                }
-            ],
-            "type": "string",
-            "description": "Command to run in child process.",
-            "x-priority": "important"
-        },
-        "parallel": {
-            "type": "boolean",
-            "description": "Run commands in parallel.",
-            "default": true,
-            "x-priority": "important"
-        },
-        "readyWhen": {
-            "description": "String or array of strings to appear in `stdout` or `stderr` that indicate that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete.",
-            "oneOf": [
-                { "type": "string" },
-                { "type": "array", "items": { "type": "string" } }
-            ]
-        },
-        "args": {
-            "oneOf": [
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                {
-                    "type": "string"
-                }
-            ],
-            "description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
-        },
-        "envFile": {
-            "type": "string",
-            "description": "You may specify a custom .env file path."
-        },
-        "color": {
-            "type": "boolean",
-            "description": "Use colors when showing output of command.",
-            "default": false
-        },
-        "cwd": {
-            "type": "string",
-            "description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
-        },
-        "env": {
+  "version": 2,
+  "title": "Run Commands",
+  "description": "Run any custom commands with Nx.",
+  "type": "object",
+  "cli": "nx",
+  "outputCapture": "pipe",
+  "presets": [
+    {
+      "name": "Arguments forwarding",
+      "keys": ["commands"]
+    },
+    {
+      "name": "Custom done conditions",
+      "keys": ["commands", "readyWhen"]
+    },
+    {
+      "name": "Setting the cwd",
+      "keys": ["commands", "cwd"]
+    }
+  ],
+  "properties": {
+    "commands": {
+      "type": "array",
+      "description": "Commands to run in child process.",
+      "items": {
+        "oneOf": [
+          {
             "type": "object",
-            "description": "Environment variables that will be made available to the commands. This property has priority over the `.env` files.",
-            "additionalProperties": {
-                "type": "string"
-            }
-        },
-        "__unparsed__": {
-            "hidden": true,
-            "type": "array",
-            "items": {
-                "type": "string"
-            },
-            "$default": {
-                "$source": "unparsed"
+            "properties": {
+              "command": {
+                "type": "string",
+                "description": "Command to run in child process."
+              },
+              "forwardAllArgs": {
+                "type": "boolean",
+                "description": "Whether arguments should be forwarded when interpolation is not present."
+              },
+              "prefix": {
+                "type": "string",
+                "description": "Prefix in front of every line out of the output"
+              },
+              "prefixColor": {
+                "type": "string",
+                "description": "Color of the prefix",
+                "enum": [
+                  "black",
+                  "red",
+                  "green",
+                  "yellow",
+                  "blue",
+                  "magenta",
+                  "cyan",
+                  "white"
+                ]
+              },
+              "color": {
+                "type": "string",
+                "description": "Color of the output",
+                "enum": [
+                  "black",
+                  "red",
+                  "green",
+                  "yellow",
+                  "blue",
+                  "magenta",
+                  "cyan",
+                  "white"
+                ]
+              },
+              "bgColor": {
+                "type": "string",
+                "description": "Background color of the output",
+                "enum": [
+                  "bgBlack",
+                  "bgRed",
+                  "bgGreen",
+                  "bgYellow",
+                  "bgBlue",
+                  "bgMagenta",
+                  "bgCyan",
+                  "bgWhite"
+                ]
+              },
+              "description": {
+                "type": "string",
+                "description": "An optional description useful for inline documentation purposes. It is not used as part of the execution of the command."
+              }
             },
-            "x-priority": "internal"
-        },
-        "forwardAllArgs": {
-            "type": "boolean",
-            "description": "Whether arguments should be forwarded when interpolation is not present.",
-            "default": true
+            "additionalProperties": false,
+            "required": ["command"]
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "x-priority": "important"
+    },
+    "command": {
+      "oneOf": [
+        {
+          "type": "array",
+          "description": "Command to run in child process, but divided into parts.",
+          "items": {
+            "type": "string"
+          },
+          "x-priority": "important"
         },
-        "tty": {
-            "type": "boolean",
-            "description": "Whether commands should be run with a tty terminal",
-            "hidden": true
+        {
+          "type": "string",
+          "description": "Command to run in child process."
         }
+      ],
+      "type": "string",
+      "description": "Command to run in child process.",
+      "x-priority": "important"
+    },
+    "parallel": {
+      "type": "boolean",
+      "description": "Run commands in parallel.",
+      "default": true,
+      "x-priority": "important"
+    },
+    "readyWhen": {
+      "description": "String or array of strings to appear in `stdout` or `stderr` that indicate that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete.",
+      "oneOf": [
+        { "type": "string" },
+        { "type": "array", "items": { "type": "string" } }
+      ]
     },
-    "additionalProperties": true,
-    "oneOf": [
+    "args": {
+      "oneOf": [
         {
-            "required": ["commands"]
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
         {
-            "required": ["command"]
+          "type": "string"
         }
-    ],
-    "examplesFile": "../../../docs/run-commands-examples.md"
+      ],
+      "description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
+    },
+    "envFile": {
+      "type": "string",
+      "description": "You may specify a custom .env file path."
+    },
+    "color": {
+      "type": "boolean",
+      "description": "Use colors when showing output of command.",
+      "default": false
+    },
+    "cwd": {
+      "type": "string",
+      "description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
+    },
+    "env": {
+      "type": "object",
+      "description": "Environment variables that will be made available to the commands. This property has priority over the `.env` files.",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "__unparsed__": {
+      "hidden": true,
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "$default": {
+        "$source": "unparsed"
+      },
+      "x-priority": "internal"
+    },
+    "forwardAllArgs": {
+      "type": "boolean",
+      "description": "Whether arguments should be forwarded when interpolation is not present.",
+      "default": true
+    },
+    "tty": {
+      "type": "boolean",
+      "description": "Whether commands should be run with a tty terminal",
+      "hidden": true
+    }
+  },
+  "additionalProperties": true,
+  "oneOf": [
+    {
+      "required": ["commands"]
+    },
+    {
+      "required": ["command"]
+    }
+  ],
+  "examplesFile": "../../../docs/run-commands-examples.md"
 }

package/src/executors/run-script/schema.json

@@ -1,28 +1,28 @@
 {
-    "version": 2,
-    "title": "Run Script",
-    "description": "Run any NPM script of a project in the project's root directory.",
-    "type": "object",
-    "cli": "nx",
-    "outputCapture": "pipe",
-    "properties": {
-        "script": {
-            "type": "string",
-            "description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
-        },
-        "__unparsed__": {
-            "hidden": true,
-            "type": "array",
-            "items": {
-                "type": "string"
-            },
-            "$default": {
-                "$source": "unparsed"
-            },
-            "x-priority": "internal"
-        }
+  "version": 2,
+  "title": "Run Script",
+  "description": "Run any NPM script of a project in the project's root directory.",
+  "type": "object",
+  "cli": "nx",
+  "outputCapture": "pipe",
+  "properties": {
+    "script": {
+      "type": "string",
+      "description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
     },
-    "additionalProperties": true,
-    "required": ["script"],
-    "examplesFile": "../../../docs/run-script-examples.md"
+    "__unparsed__": {
+      "hidden": true,
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "$default": {
+        "$source": "unparsed"
+      },
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": true,
+  "required": ["script"],
+  "examplesFile": "../../../docs/run-script-examples.md"
 }

package/src/native/index.d.ts

@@ -117,6 +117,8 @@ export declare class ProcessMetricsCollector {
   getSystemInfo(): SystemInfo
   /** Register the main CLI process for metrics collection */
   registerMainCliProcess(pid: number): void
+  /** Register a subprocess of the main CLI for metrics collection */
+  registerMainCliSubprocess(pid: number, alias?: string | undefined | null): void
   /** Register the daemon process for metrics collection */
   registerDaemonProcess(pid: number): void
   /**
@@ -126,8 +128,6 @@ export declare class ProcessMetricsCollector {
   registerTaskProcess(taskId: string, pid: number): void
   /** Register a batch with multiple tasks sharing a worker */
   registerBatch(batchId: string, taskIds: Array<string>, pid: number): void
-  /** Register a subprocess of the main CLI for metrics collection */
-  registerMainCliSubprocess(pid: number): void
   /** Subscribe to push-based metrics notifications from TypeScript */
   subscribe(callback: (err: Error | null, event: MetricsUpdate) => void): void
 }
@@ -343,6 +343,7 @@ export interface ProcessMetadata {
   command: string
   exePath: string
   cwd: string
+  alias?: string
 }
 
 /** Process metrics (dynamic, changes every collection) */
@@ -355,6 +356,7 @@ export interface ProcessMetrics {
 /** Organized collection of process metrics with timestamp */
 export interface ProcessMetricsSnapshot {
   timestamp: number
+  system: SystemMetrics
   mainCli?: ProcessTreeMetrics
   daemon?: ProcessTreeMetrics
   tasks: Record<string, Array<ProcessMetrics>>
@@ -408,6 +410,15 @@ export interface SystemInfo {
   totalMemory: number
 }
 
+/** System metrics (dynamic, changes every collection) */
+export interface SystemMetrics {
+  cpu: number
+  memory: number
+  availableMemory: number
+  swapUsed: number
+  swapTotal: number
+}
+
 export interface Target {
   executor?: string
   inputs?: Array<JsInputs>

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/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -246,7 +246,7 @@ class TargetProjectLocator {
         if (normalizedRange.startsWith('file:')) {
             const targetPath = maybeDep?.data.root;
             const normalizedPath = normalizedRange.replace('file:', '');
-            const resolvedPath = (0, node_path_1.join)((0, node_path_1.dirname)(packageJsonPath), normalizedPath);
+            const resolvedPath = node_path_1.posix.join((0, node_path_1.dirname)(packageJsonPath), normalizedPath);
             if (targetPath === resolvedPath) {
                 return maybeDep?.name;
             }

package/src/project-graph/plugins/get-plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-plugins.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/get-plugins.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,wBAAsB,UAAU,CAC9B,IAAI,SAAgB,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgC3B;AAaD,wBAAsB,qBAAqB,CAAC,IAAI,SAAgB,6BAyB/D;AAED,wBAAgB,cAAc,SAG7B"}
+{"version":3,"file":"get-plugins.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/get-plugins.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA0BzD,wBAAsB,UAAU,CAC9B,IAAI,SAAgB,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgC3B;AAaD,wBAAsB,qBAAqB,CAAC,IAAI,SAAgB,6BAyB/D;AAED,wBAAgB,cAAc,SAG7B"}

package/src/project-graph/plugins/get-plugins.js

@@ -19,6 +19,9 @@ let currentPluginsConfigurationHash;
 let loadedPlugins;
 let pendingPluginsPromise;
 let cleanupSpecifiedPlugins;
+const loadingMethod = (plugin, root, index) => (0, enabled_1.isIsolationEnabled)()
+    ? (0, isolation_1.loadNxPluginInIsolation)(plugin, root, index)
+    : (0, in_process_loader_1.loadNxPlugin)(plugin, root);
 async function getPlugins(root = workspace_root_1.workspaceRoot) {
     const pluginsConfiguration = (0, nx_json_1.readNxJson)(root).plugins ?? [];
     const pluginsConfigurationHash = (0, file_hasher_1.hashObject)(pluginsConfiguration);
@@ -78,9 +81,6 @@ function cleanupPlugins() {
 /**
  * Stuff for generic loading
  */
-const loadingMethod = (0, enabled_1.isIsolationEnabled)()
-    ? isolation_1.loadNxPluginInIsolation
-    : in_process_loader_1.loadNxPlugin;
 async function loadDefaultNxPlugins(root = workspace_root_1.workspaceRoot) {
     performance.mark('loadDefaultNxPlugins:start');
     const plugins = getDefaultPlugins(root);
@@ -116,7 +116,7 @@ async function loadSpecifiedNxPlugins(plugins, root = workspace_root_1.workspace
         await Promise.all(plugins.map(async (plugin, index) => {
             const pluginPath = typeof plugin === 'string' ? plugin : plugin.plugin;
             performance.mark(`Load Nx Plugin: ${pluginPath} - start`);
-            const [loadedPluginPromise, cleanup] = await loadingMethod(plugin, root);
+            const [loadedPluginPromise, cleanup] = await loadingMethod(plugin, root, index);
             cleanupFunctions.push(cleanup);
             const res = await loadedPluginPromise;
             res.index = index;

package/src/project-graph/plugins/isolation/index.d.ts

@@ -1,4 +1,4 @@
 import type { PluginConfiguration } from '../../../config/nx-json';
 import type { LoadedNxPlugin } from '../loaded-nx-plugin';
-export declare function loadNxPluginInIsolation(plugin: PluginConfiguration, root?: string): Promise<readonly [Promise<LoadedNxPlugin>, () => void]>;
+export declare function loadNxPluginInIsolation(plugin: PluginConfiguration, root?: string, index?: number): Promise<readonly [Promise<LoadedNxPlugin>, () => void]>;
 //# sourceMappingURL=index.d.ts.map

package/src/project-graph/plugins/isolation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,SAAgB,GACnB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAEzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG1D,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,SAAgB,EACpB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAEzD"}

package/src/project-graph/plugins/isolation/index.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadNxPluginInIsolation = loadNxPluginInIsolation;
 const workspace_root_1 = require("../../../utils/workspace-root");
 const plugin_pool_1 = require("./plugin-pool");
-async function loadNxPluginInIsolation(plugin, root = workspace_root_1.workspaceRoot) {
-    return (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root);
+async function loadNxPluginInIsolation(plugin, root = workspace_root_1.workspaceRoot, index) {
+    return (0, plugin_pool_1.loadRemoteNxPlugin)(plugin, root, index);
 }