nx 22.1.0-canary.20251029-4a07faf → 22.1.0-canary.20251106-e9146c7

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": [
+    "version": 2,
+    "title": "Run Commands",
+    "description": "Run any custom commands with Nx.",
+    "type": "object",
+    "cli": "nx",
+    "outputCapture": "pipe",
+    "presets": [
+        {
+            "name": "Arguments forwarding",
+            "keys": ["commands"]
+        },
         {
-          "type": "array",
-          "description": "Command to run in child process, but divided into parts.",
-          "items": {
-            "type": "string"
-          },
-          "x-priority": "important"
+            "name": "Custom done conditions",
+            "keys": ["commands", "readyWhen"]
         },
         {
-          "type": "string",
-          "description": "Command to run in child process."
+            "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": {
+            "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
         }
-      ],
-      "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": [
+    "additionalProperties": true,
+    "oneOf": [
         {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+            "required": ["commands"]
         },
         {
-          "type": "string"
+            "required": ["command"]
         }
-      ],
-      "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"
+    ],
+    "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`)."
+    "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"
+        }
     },
-    "__unparsed__": {
-      "hidden": true,
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "$default": {
-        "$source": "unparsed"
-      },
-      "x-priority": "internal"
-    }
-  },
-  "additionalProperties": true,
-  "required": ["script"],
-  "examplesFile": "../../../docs/run-script-examples.md"
+    "additionalProperties": true,
+    "required": ["script"],
+    "examplesFile": "../../../docs/run-script-examples.md"
 }

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-changed-files-with-prettier-if-available.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/internal-utils/format-changed-files-with-prettier-if-available.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yCAAyC,CAC7D,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,kCAAkC,CACtD,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAAE,EACnD,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA2D9B"}
+{"version":3,"file":"format-changed-files-with-prettier-if-available.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/internal-utils/format-changed-files-with-prettier-if-available.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAGpC;;;GAGG;AACH,wBAAsB,yCAAyC,CAC7D,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,kCAAkC,CACtD,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAAE,EACnD,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8D9B"}

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -4,6 +4,7 @@ exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPretti
 exports.formatFilesWithPrettierIfAvailable = formatFilesWithPrettierIfAvailable;
 const path = require("path");
 const is_using_prettier_1 = require("../../utils/is-using-prettier");
+const installation_directory_1 = require("../../utils/installation-directory");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
@@ -19,7 +20,10 @@ async function formatFilesWithPrettierIfAvailable(files, root, options) {
     const results = new Map();
     let prettier;
     try {
-        prettier = await Promise.resolve().then(() => require('prettier'));
+        const prettierPath = require.resolve('prettier', {
+            paths: [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname],
+        });
+        prettier = require(prettierPath);
         /**
          * Even after we discovered prettier in node_modules, we need to be sure that the user is intentionally using prettier
          * before proceeding to format with it.

package/src/hasher/hash-task.d.ts

@@ -6,4 +6,5 @@ import { TaskDetails } from '../native';
 export declare function getTaskDetails(): TaskDetails | null;
 export declare function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, nxJson: NxJsonConfiguration, tasksDetails: TaskDetails | null): Promise<void>;
 export declare function hashTask(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, task: Task, env: NodeJS.ProcessEnv, taskDetails: TaskDetails | null): Promise<void>;
+export declare function hashTasks(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, env: NodeJS.ProcessEnv, taskDetails: TaskDetails | null): Promise<void>;
 //# sourceMappingURL=hash-task.d.ts.map

package/src/hasher/hash-task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-task.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hash-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAa,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAuB,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7D,wBAAgB,cAAc,IAAI,WAAW,GAAG,IAAI,CASnD;AAED,wBAAsB,6CAA6C,CACjE,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,WAAW,GAAG,IAAI,iBAgDjC;AAED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,IAAI,iBAuChC"}
+{"version":3,"file":"hash-task.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hash-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAa,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAuB,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7D,wBAAgB,cAAc,IAAI,WAAW,GAAG,IAAI,CASnD;AAED,wBAAsB,6CAA6C,CACjE,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,WAAW,GAAG,IAAI,iBAgDjC;AAED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,IAAI,iBAuChC;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,IAAI,iBAuEhC"}

package/src/hasher/hash-task.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTaskDetails = getTaskDetails;
 exports.hashTasksThatDoNotDependOnOutputsOfOtherTasks = hashTasksThatDoNotDependOnOutputsOfOtherTasks;
 exports.hashTask = hashTask;
+exports.hashTasks = hashTasks;
 const utils_1 = require("../tasks-runner/utils");
 const project_graph_1 = require("../project-graph/project-graph");
 const task_hasher_1 = require("./task-hasher");
@@ -83,3 +84,59 @@ async function hashTask(hasher, projectGraph, taskGraph, task, env, taskDetails)
     performance.mark('hashSingleTask:end');
     performance.measure('hashSingleTask', 'hashSingleTask:start', 'hashSingleTask:end');
 }
+async function hashTasks(hasher, projectGraph, taskGraph, env, taskDetails) {
+    performance.mark('hashMultipleTasks:start');
+    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
+    const nxJson = (0, nx_json_1.readNxJson)();
+    const tasks = Object.values(taskGraph.tasks).filter((task) => !task.hash);
+    // Separate tasks with custom hashers from those without
+    const tasksWithCustomHashers = [];
+    const tasksWithoutCustomHashers = [];
+    for (const task of tasks) {
+        const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
+        if (customHasher) {
+            tasksWithCustomHashers.push(task);
+        }
+        else {
+            tasksWithoutCustomHashers.push(task);
+        }
+    }
+    // Hash tasks with custom hashers individually
+    const customHasherPromises = tasksWithCustomHashers.map(async (task) => {
+        const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
+        const { value, details } = await customHasher(task, {
+            hasher,
+            projectGraph,
+            taskGraph,
+            workspaceConfig: projectsConfigurations,
+            projectsConfigurations,
+            nxJsonConfiguration: nxJson,
+            env,
+        });
+        task.hash = value;
+        task.hashDetails = details;
+    });
+    // Hash tasks without custom hashers in batch
+    let batchHashPromise = Promise.resolve();
+    if (tasksWithoutCustomHashers.length > 0) {
+        batchHashPromise = hasher
+            .hashTasks(tasksWithoutCustomHashers, taskGraph, env)
+            .then((hashes) => {
+            for (let i = 0; i < tasksWithoutCustomHashers.length; i++) {
+                tasksWithoutCustomHashers[i].hash = hashes[i].value;
+                tasksWithoutCustomHashers[i].hashDetails = hashes[i].details;
+            }
+        });
+    }
+    await Promise.all([...customHasherPromises, batchHashPromise]);
+    if (taskDetails?.recordTaskDetails) {
+        taskDetails.recordTaskDetails(tasks.map((task) => ({
+            hash: task.hash,
+            project: task.target.project,
+            target: task.target.target,
+            configuration: task.target.configuration,
+        })));
+    }
+    performance.mark('hashMultipleTasks:end');
+    performance.measure('hashMultipleTasks', 'hashMultipleTasks:start', 'hashMultipleTasks:end');
+}

package/src/migrations/update-22-1-0/update-nx-wrapper.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-nx-wrapper.d.ts.map

package/src/migrations/update-22-1-0/update-nx-wrapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-nx-wrapper.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-22-1-0/update-nx-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,yBAA+B,IAAI,EAAE,IAAI,iBAExC"}

package/src/migrations/update-22-1-0/update-nx-wrapper.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const update_nxw_1 = require("../../utils/update-nxw");
+async function default_1(tree) {
+    (0, update_nxw_1.updateNxw)(tree);
+}