nx 21.0.0-beta.1 → 21.0.0-beta.3

package/src/tasks-runner/task-orchestrator.js

@@ -1,24 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskOrchestrator = void 0;
+exports.getThreadCount = getThreadCount;
 const events_1 = require("events");
-const perf_hooks_1 = require("perf_hooks");
-const path_1 = require("path");
 const fs_1 = require("fs");
+const path_1 = require("path");
+const perf_hooks_1 = require("perf_hooks");
 const run_commands_impl_1 = require("../executors/run-commands/run-commands.impl");
-const forked_process_task_runner_1 = require("./forked-process-task-runner");
-const cache_1 = require("./cache");
-const utils_1 = require("./utils");
-const tasks_schedule_1 = require("./tasks-schedule");
 const hash_task_1 = require("../hasher/hash-task");
-const task_env_1 = require("./task-env");
-const workspace_root_1 = require("../utils/workspace-root");
+const native_1 = require("../native");
+const db_connection_1 = require("../utils/db-connection");
 const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
+const workspace_root_1 = require("../utils/workspace-root");
+const cache_1 = require("./cache");
+const forked_process_task_runner_1 = require("./forked-process-task-runner");
+const is_tui_enabled_1 = require("./is-tui-enabled");
+const pseudo_terminal_1 = require("./pseudo-terminal");
 const noop_child_process_1 = require("./running-tasks/noop-child-process");
+const task_env_1 = require("./task-env");
+const tasks_schedule_1 = require("./tasks-schedule");
+const utils_1 = require("./utils");
 class TaskOrchestrator {
     // endregion internal state
-    constructor(hasher, initiatingProject, projectGraph, taskGraph, nxJson, options, bail, daemon, outputStyle) {
+    constructor(hasher, initiatingProject, projectGraph, taskGraph, nxJson, options, bail, daemon, outputStyle, taskGraphForHashing = taskGraph) {
         this.hasher = hasher;
         this.initiatingProject = initiatingProject;
         this.projectGraph = projectGraph;
@@ -28,9 +33,12 @@ class TaskOrchestrator {
         this.bail = bail;
         this.daemon = daemon;
         this.outputStyle = outputStyle;
+        this.taskGraphForHashing = taskGraphForHashing;
         this.taskDetails = (0, hash_task_1.getTaskDetails)();
         this.cache = (0, cache_1.getCache)(this.options);
-        this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
+        this.tuiEnabled = (0, is_tui_enabled_1.isTuiEnabled)(this.nxJson);
+        this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options, this.tuiEnabled);
+        this.runningTasksService = new native_1.RunningTasksService((0, db_connection_1.getDbConnection)());
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
         // region internal state
         this.batchEnv = (0, task_env_1.getEnvVariablesForBatchProcess)(this.options.skipNxCache, this.options.captureStderr);
@@ -44,18 +52,20 @@ class TaskOrchestrator {
         this.runningContinuousTasks = new Map();
         this.cleaningUp = false;
     }
-    async run() {
+    async init() {
         // Init the ForkedProcessTaskRunner, TasksSchedule, and Cache
         await Promise.all([
             this.forkedProcessTaskRunner.init(),
             this.tasksSchedule.init(),
             'init' in this.cache ? this.cache.init() : null,
         ]);
+    }
+    async run() {
+        await this.init();
         // initial scheduling
         await this.tasksSchedule.scheduleNextTasks();
         perf_hooks_1.performance.mark('task-execution:start');
-        const threadCount = this.options.parallel +
-            Object.values(this.taskGraph.tasks).filter((t) => t.continuous).length;
+        const threadCount = getThreadCount(this.options, this.taskGraph);
         const threads = [];
         process.stdout.setMaxListeners(threadCount + events_1.defaultMaxListeners);
         process.stderr.setMaxListeners(threadCount + events_1.defaultMaxListeners);
@@ -63,7 +73,15 @@ class TaskOrchestrator {
         for (let i = 0; i < threadCount; ++i) {
             threads.push(this.executeNextBatchOfTasksUsingTaskSchedule());
         }
-        await Promise.all(threads);
+        await Promise.race([
+            Promise.all(threads),
+            new Promise((resolve) => {
+                this.options.lifeCycle.registerForcedShutdownCallback(() => {
+                    // The user force quit the TUI with ctrl+c, so proceed onto cleanup
+                    resolve(undefined);
+                });
+            }),
+        ]);
         perf_hooks_1.performance.mark('task-execution:end');
         perf_hooks_1.performance.measure('task-execution', 'task-execution:start', 'task-execution:end');
         this.cache.removeOldCacheRecords();
@@ -101,11 +119,11 @@ class TaskOrchestrator {
         return new Promise((res) => this.waitingForTasks.push(res)).then(() => this.executeNextBatchOfTasksUsingTaskSchedule());
     }
     // region Processing Scheduled Tasks
-    async processScheduledTask(taskId) {
+    async processTask(taskId) {
         const task = this.taskGraph.tasks[taskId];
         const taskSpecificEnv = (0, task_env_1.getTaskSpecificEnv)(task);
         if (!task.hash) {
-            await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, taskSpecificEnv, this.taskDetails);
+            await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraphForHashing, task, taskSpecificEnv, this.taskDetails);
         }
         await this.options.lifeCycle.scheduleTask(task);
         return taskSpecificEnv;
@@ -113,7 +131,7 @@ class TaskOrchestrator {
     async processScheduledBatch(batch) {
         await Promise.all(Object.values(batch.taskGraph.tasks).map(async (task) => {
             if (!task.hash) {
-                await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, this.batchEnv, this.taskDetails);
+                await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraphForHashing, task, this.batchEnv, this.taskDetails);
             }
             await this.options.lifeCycle.scheduleTask(task);
         }));
@@ -126,7 +144,7 @@ class TaskOrchestrator {
         for (const taskId of scheduledTasks) {
             // Task is already handled or being handled
             if (!this.processedTasks.has(taskId)) {
-                this.processedTasks.set(taskId, this.processScheduledTask(taskId));
+                this.processedTasks.set(taskId, this.processTask(taskId));
             }
         }
     }
@@ -142,7 +160,12 @@ class TaskOrchestrator {
         if (!cachedResult || cachedResult.code !== 0)
             return null;
         const outputs = task.outputs;
-        const shouldCopyOutputsFromCache = !!outputs.length &&
+        const shouldCopyOutputsFromCache = 
+        // No output files to restore
+        !!outputs.length &&
+            // Remote caches are restored to output dirs when applied and using db cache
+            (!cachedResult.remote || !(0, cache_1.dbCacheEnabled)(this.nxJson)) &&
+            // Output files have not been touched since last run
             (await this.shouldCopyOutputsFromCache(outputs, task.hash));
         if (shouldCopyOutputsFromCache) {
             await this.cache.copyFilesFromCache(task.hash, cachedResult, outputs);
@@ -154,6 +177,7 @@ class TaskOrchestrator {
                 : 'local-cache-kept-existing';
         this.options.lifeCycle.printTaskTerminalOutput(task, status, cachedResult.terminalOutput);
         return {
+            code: cachedResult.code,
             task,
             status,
         };
@@ -177,6 +201,7 @@ class TaskOrchestrator {
             results.push(...batchResults);
         }
         await this.postRunSteps(tasks, results, doNotSkipCache, { groupId });
+        this.forkedProcessTaskRunner.cleanUpBatchProcesses();
         const tasksCompleted = taskEntries.filter(([taskId]) => this.completedTasks[taskId]);
         // Batch is still not done, run it again
         if (tasksCompleted.length !== taskEntries.length) {
@@ -188,7 +213,7 @@ class TaskOrchestrator {
     }
     async runBatch(batch, env) {
         try {
-            const batchProcess = await this.forkedProcessTaskRunner.forkProcessForBatch(batch, this.taskGraph, env);
+            const batchProcess = await this.forkedProcessTaskRunner.forkProcessForBatch(batch, this.projectGraph, this.taskGraph, env);
             const results = await batchProcess.getResults();
             const batchResultEntries = Object.entries(results);
             return batchResultEntries.map(([taskId, result]) => ({
@@ -233,11 +258,13 @@ class TaskOrchestrator {
             const { code, terminalOutput } = await childProcess.getResults();
             results.push({
                 task,
+                code,
                 status: code === 0 ? 'success' : 'failure',
                 terminalOutput,
             });
         }
         await this.postRunSteps([task], results, doNotSkipCache, { groupId });
+        return results[0];
     }
     async runTask(task, streamOutput, env, temporaryOutputPath, pipeOutput) {
         const shouldPrefix = streamOutput && process.env.NX_PREFIX_OUTPUT === 'true';
@@ -247,7 +274,6 @@ class TaskOrchestrator {
             !shouldPrefix) {
             try {
                 const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
-                const isRunOne = this.initiatingProject != null;
                 const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ?? targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
                 if (combinedOptions.env) {
                     env = {
@@ -259,22 +285,40 @@ class TaskOrchestrator {
                     const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
                     output_1.output.logCommand(args.join(' '));
                 }
-                const runningTask = await (0, run_commands_impl_1.runCommands)({
+                const runCommandsOptions = {
                     ...combinedOptions,
                     env,
-                    usePty: isRunOne &&
-                        !this.tasksSchedule.hasTasks() &&
-                        this.runningContinuousTasks.size === 0,
+                    usePty: this.tuiEnabled ||
+                        (!this.tasksSchedule.hasTasks() &&
+                            this.runningContinuousTasks.size === 0),
                     streamOutput,
-                }, {
+                };
+                const runningTask = await (0, run_commands_impl_1.runCommands)(runCommandsOptions, {
                     root: workspace_root_1.workspaceRoot, // only root is needed in runCommands
                 });
-                runningTask.onExit((code, terminalOutput) => {
-                    if (!streamOutput) {
-                        this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
-                        (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                if (this.tuiEnabled && runningTask instanceof pseudo_terminal_1.PseudoTtyProcess) {
+                    // This is an external of a the pseudo terminal where a task is running and can be passed to the TUI
+                    this.options.lifeCycle.registerRunningTask(task.id, runningTask.getParserAndWriter());
+                }
+                if (!streamOutput) {
+                    if (runningTask instanceof pseudo_terminal_1.PseudoTtyProcess) {
+                        // TODO: shouldn't this be checking if the task is continuous before writing anything to disk or calling printTaskTerminalOutput?
+                        let terminalOutput = '';
+                        runningTask.onOutput((data) => {
+                            terminalOutput += data;
+                        });
+                        runningTask.onExit((code) => {
+                            this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
+                            (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                        });
                     }
-                });
+                    else {
+                        runningTask.onExit((code, terminalOutput) => {
+                            this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
+                            (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                        });
+                    }
+                }
                 return runningTask;
             }
             catch (e) {
@@ -286,6 +330,10 @@ class TaskOrchestrator {
                 }
                 const terminalOutput = e.stack ?? e.message ?? '';
                 (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                return new noop_child_process_1.NoopChildProcess({
+                    code: 1,
+                    terminalOutput,
+                });
             }
         }
         else if (targetConfiguration.executor === 'nx:noop') {
@@ -297,14 +345,19 @@ class TaskOrchestrator {
         }
         else {
             // cache prep
-            return await this.runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput);
+            const runningTask = await this.runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput);
+            if (this.tuiEnabled && runningTask instanceof pseudo_terminal_1.PseudoTtyProcess) {
+                // This is an external of a the pseudo terminal where a task is running and can be passed to the TUI
+                this.options.lifeCycle.registerRunningTask(task.id, runningTask.getParserAndWriter());
+            }
+            return runningTask;
         }
     }
     async runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput) {
         try {
             const usePtyFork = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false';
             // Disable the pseudo terminal if this is a run-many or when running a continuous task as part of a run-one
-            const disablePseudoTerminal = !this.initiatingProject || task.continuous;
+            const disablePseudoTerminal = !this.tuiEnabled && (!this.initiatingProject || task.continuous);
             // execution
             const childProcess = usePtyFork
                 ? await this.forkedProcessTaskRunner.forkProcess(task, {
@@ -335,6 +388,21 @@ class TaskOrchestrator {
         }
     }
     async startContinuousTask(task, groupId) {
+        if (this.runningTasksService.getRunningTasks([task.id]).length) {
+            await this.preRunSteps([task], { groupId });
+            if (this.tuiEnabled) {
+                this.options.lifeCycle.setTaskStatus(task.id, 8 /* NativeTaskStatus.Shared */);
+            }
+            // task is already running by another process, we schedule the next tasks
+            // and release the threads
+            await this.scheduleNextTasksAndReleaseThreads();
+            // wait for the running task to finish
+            do {
+                console.log(`Waiting for ${task.id} in another nx process`);
+                await new Promise((resolve) => setTimeout(resolve, 100));
+            } while (this.runningTasksService.getRunningTasks([task.id]).length);
+            return;
+        }
         const taskSpecificEnv = await this.processedTasks.get(task.id);
         await this.preRunSteps([task], { groupId });
         const pipeOutput = await this.pipeOutputCapture(task);
@@ -349,14 +417,10 @@ class TaskOrchestrator {
                 : process.env.FORCE_COLOR, this.options.skipNxCache, this.options.captureStderr, null, null)
             : (0, task_env_1.getEnvVariablesForTask)(task, taskSpecificEnv, undefined, this.options.skipNxCache, this.options.captureStderr, temporaryOutputPath, streamOutput);
         const childProcess = await this.runTask(task, streamOutput, env, temporaryOutputPath, pipeOutput);
+        this.runningTasksService.addRunningTask(task.id);
         this.runningContinuousTasks.set(task.id, childProcess);
-        childProcess.onExit((code) => {
-            if (!this.cleaningUp) {
-                console.error(`Task "${task.id}" is continuous but exited with code ${code}`);
-                this.cleanup().then(() => {
-                    process.exit(1);
-                });
-            }
+        childProcess.onExit(() => {
+            this.runningTasksService.removeRunningTask(task.id);
         });
         if (this.initiatingProject === task.target.project &&
             this.options.targets.length === 1 &&
@@ -364,10 +428,7 @@ class TaskOrchestrator {
             await childProcess.getResults();
         }
         else {
-            await this.tasksSchedule.scheduleNextTasks();
-            // release blocked threads
-            this.waitingForTasks.forEach((f) => f(null));
-            this.waitingForTasks.length = 0;
+            await this.scheduleNextTasksAndReleaseThreads();
         }
         return childProcess;
     }
@@ -430,6 +491,9 @@ class TaskOrchestrator {
                 status,
             };
         }));
+        await this.scheduleNextTasksAndReleaseThreads();
+    }
+    async scheduleNextTasksAndReleaseThreads() {
         await this.tasksSchedule.scheduleNextTasks();
         // release blocked threads
         this.waitingForTasks.forEach((f) => f(null));
@@ -511,7 +575,26 @@ class TaskOrchestrator {
             catch (e) {
                 console.error(`Unable to terminate ${taskId}\nError:`, e);
             }
+            finally {
+                this.runningTasksService.removeRunningTask(taskId);
+            }
         }));
     }
 }
 exports.TaskOrchestrator = TaskOrchestrator;
+function getThreadCount(options, taskGraph) {
+    if (options['parallel'] === 'false' ||
+        options['parallel'] === false) {
+        options['parallel'] = 1;
+    }
+    else if (options['parallel'] === 'true' ||
+        options['parallel'] === true ||
+        options['parallel'] === undefined ||
+        options['parallel'] === '') {
+        options['parallel'] = Number(options['maxParallel'] || 3);
+    }
+    const maxParallel = options['parallel'] +
+        Object.values(taskGraph.tasks).filter((t) => t.continuous).length;
+    const totalTasks = Object.keys(taskGraph.tasks).length;
+    return Math.min(maxParallel, totalTasks);
+}

package/src/tasks-runner/utils.d.ts

@@ -1,7 +1,7 @@
-import { Task, TaskGraph } from '../config/task-graph';
+import { CustomHasher, ExecutorConfig } from '../config/misc-interfaces';
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
+import { Task, TaskGraph } from '../config/task-graph';
 import { TargetConfiguration, TargetDependencyConfig } from '../config/workspace-json-project-json';
-import { CustomHasher, ExecutorConfig } from '../config/misc-interfaces';
 export type NormalizedTargetDependencyConfig = TargetDependencyConfig & {
     projects: string[];
 };

package/src/tasks-runner/utils.js

@@ -24,19 +24,20 @@ exports.getSerializedArgsForTask = getSerializedArgsForTask;
 exports.shouldStreamOutput = shouldStreamOutput;
 exports.isCacheableTask = isCacheableTask;
 exports.unparse = unparse;
-const path_1 = require("path");
-const posix_1 = require("path/posix");
-const workspace_root_1 = require("../utils/workspace-root");
-const path_2 = require("../utils/path");
-const fileutils_1 = require("../utils/fileutils");
-const serialize_overrides_into_command_line_1 = require("../utils/serialize-overrides-into-command-line");
-const split_target_1 = require("../utils/split-target");
+const minimatch_1 = require("minimatch");
+const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const executor_utils_1 = require("../command-line/run/executor-utils");
+const native_1 = require("../native");
 const project_graph_1 = require("../project-graph/project-graph");
+const fileutils_1 = require("../utils/fileutils");
 const find_matching_projects_1 = require("../utils/find-matching-projects");
-const minimatch_1 = require("minimatch");
 const globs_1 = require("../utils/globs");
-const native_1 = require("../native");
+const path_1 = require("../utils/path");
+const serialize_overrides_into_command_line_1 = require("../utils/serialize-overrides-into-command-line");
+const split_target_1 = require("../utils/split-target");
+const workspace_root_1 = require("../utils/workspace-root");
+const is_tui_enabled_1 = require("./is-tui-enabled");
 function getDependencyConfigs({ project, target }, extraTargetDependencies, projectGraph, allTargetNames) {
     const dependencyConfigs = (projectGraph.nodes[project].data?.targets[target]?.dependsOn ??
         // This is passed into `run-command` from programmatic invocations
@@ -193,10 +194,10 @@ function transformLegacyOutputs(projectRoot, outputs) {
             : [false, output];
         const relativePath = (0, fileutils_1.isRelativePath)(outputPath)
             ? output
-            : (0, path_1.relative)(projectRoot, outputPath);
+            : (0, node_path_1.relative)(projectRoot, outputPath);
         const isWithinProject = !relativePath.startsWith('..');
         return ((isNegated ? '!' : '') +
-            (0, path_2.joinPathFragments)(isWithinProject ? '{projectRoot}' : '{workspaceRoot}', isWithinProject ? relativePath : outputPath));
+            (0, path_1.joinPathFragments)(isWithinProject ? '{projectRoot}' : '{workspaceRoot}', isWithinProject ? relativePath : outputPath));
     });
 }
 /**
@@ -368,6 +369,9 @@ function getSerializedArgsForTask(task, isVerbose) {
     ];
 }
 function shouldStreamOutput(task, initiatingProject) {
+    // For now, disable streaming output on the JS side when running the TUI
+    if ((0, is_tui_enabled_1.isTuiEnabled)())
+        return false;
     if (process.env.NX_STREAM_OUTPUT === 'true')
         return true;
     if (longRunningTask(task))

package/src/utils/child-process.d.ts

@@ -1,11 +1,15 @@
 import { type ExecOptions, type ExecSyncOptions } from 'child_process';
+import { PackageManagerCommands } from './package-manager';
 import { ChildProcess } from '../native';
+export declare function getRunNxBaseCommand(packageManagerCommand?: PackageManagerCommands, cwd?: string): string;
 export declare function runNxSync(cmd: string, options?: ExecSyncOptions & {
     cwd?: string;
+    packageManagerCommand?: PackageManagerCommands;
 }): void;
 export declare function runNxAsync(cmd: string, options?: ExecOptions & {
     cwd?: string;
     silent?: boolean;
+    packageManagerCommand?: PackageManagerCommands;
 }): Promise<void>;
 export declare class PseudoTtyProcess {
     private childProcess;

package/src/utils/child-process.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PseudoTtyProcess = void 0;
+exports.getRunNxBaseCommand = getRunNxBaseCommand;
 exports.runNxSync = runNxSync;
 exports.runNxAsync = runNxAsync;
 const child_process_1 = require("child_process");
@@ -8,46 +9,38 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const package_manager_1 = require("./package-manager");
 const workspace_root_1 = require("./workspace-root");
-function runNxSync(cmd, options) {
-    let baseCmd;
+function getRunNxBaseCommand(packageManagerCommand, cwd = process.cwd()) {
     if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))) {
-        baseCmd = `${(0, package_manager_1.getPackageManagerCommand)().exec} nx`;
+        if (!packageManagerCommand) {
+            const pm = (0, package_manager_1.detectPackageManager)();
+            packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)(pm);
+        }
+        return `${packageManagerCommand.exec} nx`;
     }
     else {
-        options ??= {};
-        options.cwd ??= process.cwd();
-        options.windowsHide ??= true;
-        const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
+        const offsetFromRoot = (0, path_1.relative)(cwd, (0, workspace_root_1.workspaceRootInner)(cwd, null));
         if (process.platform === 'win32') {
-            baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
+            return '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
         }
         else {
-            baseCmd = './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
+            return './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
         }
     }
-    (0, child_process_1.execSync)(`${baseCmd} ${cmd}`, options);
+}
+function runNxSync(cmd, options) {
+    let { packageManagerCommand, ...execSyncOptions } = options ?? {};
+    execSyncOptions.cwd ??= process.cwd();
+    execSyncOptions.windowsHide ??= true;
+    const baseCmd = getRunNxBaseCommand(packageManagerCommand, execSyncOptions.cwd);
+    (0, child_process_1.execSync)(`${baseCmd} ${cmd}`, execSyncOptions);
 }
 async function runNxAsync(cmd, options) {
-    let baseCmd;
-    if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))) {
-        baseCmd = `${(0, package_manager_1.getPackageManagerCommand)().exec} nx`;
-    }
-    else {
-        options ??= {};
-        options.cwd ??= process.cwd();
-        options.windowsHide ??= true;
-        const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
-        if (process.platform === 'win32') {
-            baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
-        }
-        else {
-            baseCmd = './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
-        }
-    }
-    const silent = options?.silent ?? true;
-    if (options?.silent) {
-        delete options.silent;
-    }
+    options ??= {};
+    options.cwd ??= process.cwd();
+    options.windowsHide ??= true;
+    let { silent, packageManagerCommand, ...execSyncOptions } = options;
+    silent ??= true;
+    const baseCmd = getRunNxBaseCommand(packageManagerCommand, execSyncOptions.cwd);
     return new Promise((resolve, reject) => {
         const child = (0, child_process_1.exec)(`${baseCmd} ${cmd}`, options, (error, stdout, stderr) => {
             if (error) {

package/src/utils/command-line-utils.d.ts

@@ -8,7 +8,7 @@ export interface NxArgs {
     targets?: string[];
     configuration?: string;
     /**
-     * @deprecated Custom task runners will no longer be supported in Nx 21. Use Nx Cloud or Nx Powerpack instead.
+     * @deprecated Custom task runners will be replaced by a new API starting with Nx 21. More info: https://nx.dev/deprecated/custom-tasks-runner
      */
     runner?: string;
     parallel?: number;

package/src/utils/find-matching-projects.js

@@ -112,8 +112,8 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
         return;
     }
     if (!(0, globs_1.isGlobPattern)(pattern.value)) {
-        // Custom regex that is basically \b without underscores, so "foo" pattern matches "foo_bar".
-        const regex = new RegExp(`(?<![a-zA-Z0-9])${pattern.value}(?![a-zA-Z0-9])`, 'i');
+        // Custom regex that is basically \b but includes hyphens (-) and excludes underscores (_), so "foo" pattern matches "foo_bar" but not "foo-e2e".
+        const regex = new RegExp(`(?<![a-zA-Z0-9-])${pattern.value}(?![a-zA-Z0-9-])`, 'i');
         const matchingProjects = Object.keys(projects).filter((name) => regex.test(name));
         for (const projectName of matchingProjects) {
             if (pattern.exclude) {

package/src/utils/handle-errors.js

@@ -31,6 +31,21 @@ async function handleErrors(isVerbose, fn) {
                     : projectGraphError.getErrors().map((e) => e.message),
             });
         }
+        else if (err.name === 'ProjectConfigurationsError') {
+            const projectConfigurationsError = err;
+            let title = projectConfigurationsError.message;
+            if (projectConfigurationsError.cause &&
+                typeof projectConfigurationsError.cause === 'object' &&
+                'message' in projectConfigurationsError.cause) {
+                title += ' ' + projectConfigurationsError.cause.message + '.';
+            }
+            output_1.output.error({
+                title,
+                bodyLines: isVerbose
+                    ? formatErrorStackAndCause(projectConfigurationsError, isVerbose)
+                    : projectConfigurationsError.errors.map((e) => e.message),
+            });
+        }
         else {
             const lines = (err.message ? err.message : err.toString()).split('\n');
             const bodyLines = lines.slice(1);

package/src/utils/is-ci.js

@@ -15,6 +15,9 @@ function isCI() {
         !!process.env.GITLAB_CI ||
         !!process.env.HEROKU_TEST_RUN_ID ||
         !!process.env.BUILD_ID ||
+        !!process.env.BUILD_NUMBER ||
         !!process.env.BUILD_BUILDID ||
-        !!process.env.TEAMCITY_VERSION);
+        !!process.env.TEAMCITY_VERSION ||
+        !!process.env.JENKINS_URL ||
+        !!process.env.HUDSON_URL);
 }

package/src/utils/is-using-prettier.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '../generators/tree';
+export declare function isUsingPrettier(root: string): boolean;
+export declare function isUsingPrettierInTree(tree: Tree): boolean;

package/src/utils/is-using-prettier.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUsingPrettier = isUsingPrettier;
+exports.isUsingPrettierInTree = isUsingPrettierInTree;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const json_1 = require("../generators/utils/json");
+const fileutils_1 = require("./fileutils");
+/**
+ * Possible configuration files are taken from https://prettier.io/docs/configuration
+ */
+const configFiles = [
+    '.prettierrc',
+    '.prettierrc.json',
+    '.prettierrc.yml',
+    '.prettierrc.yaml',
+    '.prettierrc.json5',
+    '.prettierrc.js',
+    'prettier.config.js',
+    '.prettierrc.ts',
+    'prettier.config.ts',
+    '.prettierrc.mjs',
+    'prettier.config.mjs',
+    '.prettierrc.mts',
+    'prettier.config.mts',
+    '.prettierrc.cjs',
+    'prettier.config.cjs',
+    '.prettierrc.cts',
+    'prettier.config.cts',
+    '.prettierrc.toml',
+];
+function isUsingPrettier(root) {
+    for (const file of configFiles) {
+        if ((0, node_fs_1.existsSync)(file)) {
+            return true;
+        }
+    }
+    // Even if no file is present, it is possible the user is configuring prettier via their package.json
+    const packageJsonPath = (0, node_path_1.join)(root, 'package.json');
+    if ((0, node_fs_1.existsSync)(packageJsonPath)) {
+        const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
+        if (packageJson.prettier) {
+            return true;
+        }
+    }
+    return false;
+}
+function isUsingPrettierInTree(tree) {
+    for (const file of configFiles) {
+        if (tree.exists(file)) {
+            return true;
+        }
+    }
+    // Even if no file is present, it is possible the user is configuring prettier via their package.json
+    if (tree.exists('package.json')) {
+        const packageJson = (0, json_1.readJson)(tree, 'package.json');
+        if (packageJson.prettier) {
+            return true;
+        }
+    }
+    return false;
+}

package/src/utils/nx-key.d.ts

@@ -0,0 +1,7 @@
+import type { NxKey } from '@nx/key';
+export declare function createNxKeyLicenseeInformation(nxKey: NxKey): string;
+export declare function printNxKey(): Promise<void>;
+export declare function getNxKeyInformation(): Promise<NxKey | null>;
+export declare class NxKeyNotInstalledError extends Error {
+    constructor(e: Error);
+}