nx 23.0.0-beta.2 → 23.0.0-beta.21

package/dist/src/devkit-exports.d.ts

@@ -13,7 +13,7 @@ export type { WorkspaceJsonConfiguration, ProjectsConfigurations, TargetDependen
 /**
  * @category Workspace
  */
-export type { Generator, Migration, GeneratorCallback, PromiseExecutor, AsyncIteratorExecutor, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
+export type { Generator, Migration, MigrationReturnObject, GeneratorCallback, PromiseExecutor, AsyncIteratorExecutor, Executor, ExecutorContext, TaskGraphExecutor, GeneratorsJson, ExecutorsJson, MigrationsJson, CustomHasher, HasherContext, } from './config/misc-interfaces';
 export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV2, CreateNodesResult, CreateNodesContextV2, CreateNodesFunctionV2, CreateNodesResultV2, CreateNodesV2, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, PreTasksExecution, PreTasksExecutionContext, PostTasksExecution, PostTasksExecutionContext, } from './project-graph/plugins';
 export { AggregateCreateNodesError, StaleProjectGraphCacheError, } from './project-graph/error-types';
@@ -29,7 +29,7 @@ export type { TaskResult, TaskResults } from './tasks-runner/life-cycle';
 /**
  * @category Workspace
  */
-export type { ImplicitDependencyEntry, ImplicitJsonSubsetDependency, NxJsonConfiguration, PluginConfiguration, ExpandedPluginConfiguration, TargetDefaults, NxAffectedConfig, } from './config/nx-json';
+export type { ImplicitDependencyEntry, ImplicitJsonSubsetDependency, NxJsonConfiguration, PluginConfiguration, ExpandedPluginConfiguration, TargetDefaults, TargetDefaultEntry, TargetDefaultsRecord, NxAffectedConfig, } from './config/nx-json';
 /**
  * @category Logger
  */

package/dist/src/devkit-internals.d.ts

@@ -11,6 +11,7 @@ export { retrieveProjectConfigurationsWithAngularProjects } from './project-grap
 export { mergeTargetConfigurations } from './project-graph/utils/project-configuration/target-merging';
 export { readProjectConfigurationsFromRootMap } from './project-graph/utils/project-configuration/project-nodes-manager';
 export { findMatchingConfigFiles } from './project-graph/utils/project-configuration-utils';
+export { readTargetDefaultsForTarget, normalizeTargetDefaultsAgainstRootMaps, } from './project-graph/utils/project-configuration/target-defaults';
 export { getIgnoreObjectForTree } from './utils/ignore';
 export { splitTarget } from './utils/split-target';
 export { combineOptionsForExecutor } from './utils/params';
@@ -24,7 +25,7 @@ export { createProjectRootMappingsFromProjectConfigurations, createProjectRootMa
 export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-workspace-files';
 export { LoadedNxPlugin } from './project-graph/plugins/loaded-nx-plugin';
 export * from './project-graph/error-types';
-export { registerTsProject } from './plugins/js/utils/register';
+export { registerTsProject, loadTsFile, forceRegisterEsmLoader, requireWithTsconfigFallback, } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
@@ -33,3 +34,6 @@ export { globalSpinner } from './utils/spinner';
 export { signalToCode } from './utils/exit-codes';
 export { handleImport } from './utils/handle-import';
 export { PluginCache, safeWriteFileCache } from './utils/plugin-cache-utils';
+export { emitPluginWorkerLog } from './project-graph/plugins/isolation/worker-streaming';
+export { resolveImplementation, resolveSchema, ImplementationResolutionError, SchemaResolutionError, } from './config/schema-utils';
+export { resolvePrompt, PromptResolutionError, } from './command-line/migrate/prompt-files';

package/dist/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeWriteFileCache = exports.PluginCache = exports.handleImport = exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappings = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmpAsync = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.handleImport = exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.requireWithTsconfigFallback = exports.forceRegisterEsmLoader = exports.loadTsFile = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappings = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmpAsync = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.normalizeTargetDefaultsAgainstRootMaps = exports.readTargetDefaultsForTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -24,6 +24,9 @@ var project_nodes_manager_1 = require("./project-graph/utils/project-configurati
 Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_nodes_manager_1.readProjectConfigurationsFromRootMap; } });
 var project_configuration_utils_1 = require("./project-graph/utils/project-configuration-utils");
 Object.defineProperty(exports, "findMatchingConfigFiles", { enumerable: true, get: function () { return project_configuration_utils_1.findMatchingConfigFiles; } });
+var target_defaults_1 = require("./project-graph/utils/project-configuration/target-defaults");
+Object.defineProperty(exports, "readTargetDefaultsForTarget", { enumerable: true, get: function () { return target_defaults_1.readTargetDefaultsForTarget; } });
+Object.defineProperty(exports, "normalizeTargetDefaultsAgainstRootMaps", { enumerable: true, get: function () { return target_defaults_1.normalizeTargetDefaultsAgainstRootMaps; } });
 var ignore_1 = require("./utils/ignore");
 Object.defineProperty(exports, "getIgnoreObjectForTree", { enumerable: true, get: function () { return ignore_1.getIgnoreObjectForTree; } });
 var split_target_1 = require("./utils/split-target");
@@ -56,6 +59,9 @@ Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: functi
 tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
+Object.defineProperty(exports, "loadTsFile", { enumerable: true, get: function () { return register_1.loadTsFile; } });
+Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return register_1.forceRegisterEsmLoader; } });
+Object.defineProperty(exports, "requireWithTsconfigFallback", { enumerable: true, get: function () { return register_1.requireWithTsconfigFallback; } });
 var utils_1 = require("./tasks-runner/utils");
 Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return utils_1.interpolate; } });
 var is_ci_1 = require("./utils/is-ci");
@@ -73,3 +79,13 @@ Object.defineProperty(exports, "handleImport", { enumerable: true, get: function
 var plugin_cache_utils_1 = require("./utils/plugin-cache-utils");
 Object.defineProperty(exports, "PluginCache", { enumerable: true, get: function () { return plugin_cache_utils_1.PluginCache; } });
 Object.defineProperty(exports, "safeWriteFileCache", { enumerable: true, get: function () { return plugin_cache_utils_1.safeWriteFileCache; } });
+var worker_streaming_1 = require("./project-graph/plugins/isolation/worker-streaming");
+Object.defineProperty(exports, "emitPluginWorkerLog", { enumerable: true, get: function () { return worker_streaming_1.emitPluginWorkerLog; } });
+var schema_utils_1 = require("./config/schema-utils");
+Object.defineProperty(exports, "resolveImplementation", { enumerable: true, get: function () { return schema_utils_1.resolveImplementation; } });
+Object.defineProperty(exports, "resolveSchema", { enumerable: true, get: function () { return schema_utils_1.resolveSchema; } });
+Object.defineProperty(exports, "ImplementationResolutionError", { enumerable: true, get: function () { return schema_utils_1.ImplementationResolutionError; } });
+Object.defineProperty(exports, "SchemaResolutionError", { enumerable: true, get: function () { return schema_utils_1.SchemaResolutionError; } });
+var prompt_files_1 = require("./command-line/migrate/prompt-files");
+Object.defineProperty(exports, "resolvePrompt", { enumerable: true, get: function () { return prompt_files_1.resolvePrompt; } });
+Object.defineProperty(exports, "PromptResolutionError", { enumerable: true, get: function () { return prompt_files_1.PromptResolutionError; } });

package/dist/src/executors/run-commands/running-tasks.d.ts

@@ -9,6 +9,9 @@ export declare class ParallelRunningTasks implements RunningTask {
     private readonly streamOutput;
     private exitCallbacks;
     private outputCallbacks;
+    private exited;
+    private exitCode;
+    private exitTerminalOutput;
     constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, taskId: string);
     getResults(): Promise<{
         code: number;
@@ -18,6 +21,7 @@ export declare class ParallelRunningTasks implements RunningTask {
     onExit(cb: (code: number, terminalOutput: string) => void): void;
     send(message: Serializable): void;
     kill(signal?: NodeJS.Signals): Promise<void>;
+    private emitExit;
     private run;
     private terminateRemainingProcesses;
 }
@@ -30,7 +34,10 @@ export declare class SeriallyRunningTasks implements RunningTask {
     private code;
     private error;
     private outputCallbacks;
+    private exited;
+    private exitTerminalOutput;
     constructor(options: NormalizedRunCommandsOptions, context: ExecutorContext, tuiEnabled: boolean, taskId: string);
+    private emitExit;
     getResults(): Promise<{
         code: number;
         terminalOutput: string;

package/dist/src/executors/run-commands/running-tasks.js

@@ -7,7 +7,7 @@ const pc = tslib_1.__importStar(require("picocolors"));
 const child_process_1 = require("child_process");
 const npm_run_path_1 = require("npm-run-path");
 const path_1 = require("path");
-const tree_kill_1 = tslib_1.__importDefault(require("tree-kill"));
+const native_1 = require("../../native");
 const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
 const task_env_1 = require("../../tasks-runner/task-env");
 const task_io_service_1 = require("../../tasks-runner/task-io-service");
@@ -16,12 +16,19 @@ class ParallelRunningTasks {
     constructor(options, context, taskId) {
         this.exitCallbacks = [];
         this.outputCallbacks = [];
+        // Memoized exit so late getResults()/onExit() callers don't hang.
+        this.exited = false;
+        this.exitCode = 0;
+        this.exitTerminalOutput = '';
         this.childProcesses = options.commands.map((commandConfig) => new RunningNodeProcess(commandConfig, options.color, calculateCwd(options.cwd, context), options.env ?? {}, options.readyWhenStatus, options.streamOutput, options.envFile, taskId));
         this.readyWhenStatus = options.readyWhenStatus;
         this.streamOutput = options.streamOutput;
         this.run();
     }
     async getResults() {
+        if (this.exited) {
+            return { code: this.exitCode, terminalOutput: this.exitTerminalOutput };
+        }
         return new Promise((res) => {
             this.onExit((code, terminalOutput) => {
                 res({ code, terminalOutput });
@@ -32,6 +39,10 @@ class ParallelRunningTasks {
         this.outputCallbacks.push(cb);
     }
     onExit(cb) {
+        if (this.exited) {
+            cb(this.exitCode, this.exitTerminalOutput);
+            return;
+        }
         this.exitCallbacks.push(cb);
     }
     send(message) {
@@ -40,14 +51,17 @@ class ParallelRunningTasks {
         }
     }
     async kill(signal) {
-        await Promise.all(this.childProcesses.map(async (p) => {
-            try {
-                return p.kill();
-            }
-            catch (e) {
-                console.error(`Unable to terminate "${p.command}"\nError:`, e);
-            }
-        }));
+        await Promise.allSettled(this.childProcesses.map((p) => p.kill(signal)));
+    }
+    emitExit(code, terminalOutput) {
+        if (this.exited)
+            return;
+        this.exited = true;
+        this.exitCode = code;
+        this.exitTerminalOutput = terminalOutput;
+        for (const cb of this.exitCallbacks) {
+            cb(code, terminalOutput);
+        }
     }
     async run() {
         if (this.readyWhenStatus.length) {
@@ -71,9 +85,7 @@ class ParallelRunningTasks {
                     process.stderr.write(output);
                 }
             }
-            for (const cb of this.exitCallbacks) {
-                cb(code, terminalOutput);
-            }
+            this.emitExit(code, terminalOutput);
         }
         else {
             const runningProcesses = new Set();
@@ -93,7 +105,7 @@ class ParallelRunningTasks {
                     hasFailure = true;
                     failureDetails = { childProcess, code, terminalOutput };
                     // Immediately terminate all other running processes
-                    await this.terminateRemainingProcesses(runningProcesses, childProcess);
+                    this.terminateRemainingProcesses(runningProcesses, childProcess);
                 }
                 runningProcesses.delete(childProcess);
             }));
@@ -105,36 +117,18 @@ class ParallelRunningTasks {
                 if (this.streamOutput) {
                     process.stderr.write(output);
                 }
-                for (const cb of this.exitCallbacks) {
-                    cb(1, terminalOutput);
-                }
+                this.emitExit(1, terminalOutput);
             }
             else {
-                for (const cb of this.exitCallbacks) {
-                    cb(0, terminalOutput);
-                }
+                this.emitExit(0, terminalOutput);
             }
         }
     }
-    async terminateRemainingProcesses(runningProcesses, failedProcess) {
-        const terminationPromises = [];
+    terminateRemainingProcesses(runningProcesses, failedProcess) {
         const processesToTerminate = [...runningProcesses].filter((p) => p !== failedProcess);
         for (const process of processesToTerminate) {
             runningProcesses.delete(process);
-            // Terminate the process
-            terminationPromises.push(process.kill('SIGTERM').catch((err) => {
-                // Log error but don't fail the entire operation
-                if (this.streamOutput) {
-                    console.error(`Failed to terminate process "${process.command}":`, err);
-                }
-            }));
-        }
-        // Wait for all terminations to complete with a timeout
-        if (terminationPromises.length > 0) {
-            await Promise.race([
-                Promise.all(terminationPromises),
-                new Promise((resolve) => setTimeout(resolve, 5_000)),
-            ]);
+            process.kill('SIGTERM').catch(() => { });
         }
     }
 }
@@ -148,6 +142,9 @@ class SeriallyRunningTasks {
         this.exitCallbacks = [];
         this.code = 0;
         this.outputCallbacks = [];
+        // Memoized exit so late getResults()/onExit() callers don't hang.
+        this.exited = false;
+        this.exitTerminalOutput = '';
         this.run(options, context)
             .catch((e) => {
             this.error = e;
@@ -155,12 +152,28 @@ class SeriallyRunningTasks {
             .finally(() => {
             const terminalOutput = this.terminalOutputChunks.join('');
             this.terminalOutputChunks = [];
-            for (const cb of this.exitCallbacks) {
-                cb(this.code, terminalOutput);
-            }
+            this.emitExit(terminalOutput);
         });
     }
+    emitExit(terminalOutput) {
+        if (this.exited)
+            return;
+        this.exited = true;
+        this.exitTerminalOutput = terminalOutput;
+        for (const cb of this.exitCallbacks) {
+            cb(this.code, terminalOutput);
+        }
+    }
     getResults() {
+        if (this.exited) {
+            if (this.error) {
+                return Promise.reject(this.error);
+            }
+            return Promise.resolve({
+                code: this.code,
+                terminalOutput: this.exitTerminalOutput,
+            });
+        }
         return new Promise((res, rej) => {
             this.onExit((code, terminalOutput) => {
                 if (this.error) {
@@ -173,6 +186,10 @@ class SeriallyRunningTasks {
         });
     }
     onExit(cb) {
+        if (this.exited) {
+            cb(this.code, this.exitTerminalOutput);
+            return;
+        }
         this.exitCallbacks.push(cb);
     }
     onOutput(cb) {
@@ -182,7 +199,7 @@ class SeriallyRunningTasks {
         throw new Error('Not implemented');
     }
     kill(signal) {
-        return this.currentProcess.kill(signal);
+        return this.currentProcess?.kill(signal);
     }
     async run(options, context) {
         for (const c of options.commands) {
@@ -236,6 +253,11 @@ class RunningNodeProcess {
         this.terminalOutputChunks = [];
         this.exitCallbacks = [];
         this.outputCallbacks = [];
+        this.killPromise = null;
+        // Memoized exit so late getResults()/onExit() callers don't hang.
+        this.exited = false;
+        this.exitCode = 0;
+        this.exitTerminalOutput = '';
         env = processEnv(color, cwd, env, envFile);
         this.command = commandConfig.command;
         const header = pc.dim('> ') + commandConfig.command + '\r\n\r\n';
@@ -245,9 +267,14 @@ class RunningNodeProcess {
         }
         this.childProcess = (0, child_process_1.spawn)(commandConfig.command, [], {
             shell: true,
+            detached: process.platform !== 'win32',
             env,
             cwd,
             windowsHide: true,
+            stdio: ['inherit', 'pipe', 'pipe'],
+        });
+        this.closedPromise = new Promise((resolve) => {
+            this.childProcess.on('close', resolve);
         });
         this.childProcess.stdout?.setEncoding('utf8');
         this.childProcess.stderr?.setEncoding('utf8');
@@ -259,6 +286,12 @@ class RunningNodeProcess {
         this.addListeners(commandConfig, streamOutput);
     }
     getResults() {
+        if (this.exited) {
+            return Promise.resolve({
+                code: this.exitCode,
+                terminalOutput: this.exitTerminalOutput,
+            });
+        }
         return new Promise((res) => {
             this.onExit((code, terminalOutput) => {
                 res({ code, terminalOutput });
@@ -269,24 +302,41 @@ class RunningNodeProcess {
         this.outputCallbacks.push(cb);
     }
     onExit(cb) {
+        if (this.exited) {
+            cb(this.exitCode, this.exitTerminalOutput);
+            return;
+        }
         this.exitCallbacks.push(cb);
     }
     send(message) {
         this.childProcess.send(message);
     }
+    emitExit(code, terminalOutput) {
+        if (this.exited)
+            return;
+        this.exited = true;
+        this.exitCode = code;
+        this.exitTerminalOutput = terminalOutput;
+        for (const cb of this.exitCallbacks) {
+            cb(code, terminalOutput);
+        }
+    }
     kill(signal) {
-        return new Promise((res, rej) => {
-            (0, tree_kill_1.default)(this.childProcess.pid, signal, (err) => {
-                // On Windows, tree-kill (which uses taskkill) may fail when the process or its child process is already terminated.
-                // Ignore the errors, otherwise we will log them unnecessarily.
-                if (err && process.platform !== 'win32') {
-                    rej(err);
-                }
-                else {
-                    res();
-                }
-            });
-        });
+        if (this.killPromise)
+            return this.killPromise;
+        if (!this.childProcess.pid)
+            return Promise.resolve();
+        // Cache the promise so concurrent callers (e.g. cleanup() after a
+        // fire-and-forget kill from cleanUpUnneededContinuousTasks) await the
+        // same in-progress operation instead of no-oping.
+        this.killPromise = (0, native_1.killProcessTreeGraceful)(this.childProcess.pid, signal).then(() => 
+        // Wait for stdio drain and close events before the orchestrator
+        // tears down the event loop via process.exit().
+        Promise.race([
+            this.closedPromise,
+            new Promise((resolve) => setTimeout(resolve, 1000)),
+        ]));
+        return this.killPromise;
     }
     triggerOutputListeners(output) {
         for (const cb of this.outputCallbacks) {
@@ -294,6 +344,34 @@ class RunningNodeProcess {
         }
     }
     addListeners(commandConfig, streamOutput) {
+        // Named handlers so they can be removed when the child exits.
+        // Otherwise each RunningNodeProcess leaks process listeners; with
+        // many run-commands tasks this triggers MaxListenersExceededWarning.
+        const isForked = !!process.env.NX_FORKED_TASK_EXECUTOR;
+        const onProcessExit = () => {
+            if (this.childProcess.pid && !this.killPromise) {
+                (0, native_1.killProcessTree)(this.childProcess.pid);
+            }
+        };
+        const onSigInt = () => {
+            this.kill('SIGTERM');
+        };
+        const onSigTerm = () => {
+            this.kill('SIGTERM');
+        };
+        const onSigHup = () => {
+            this.kill('SIGTERM');
+        };
+        const removeProcessListeners = () => {
+            process.removeListener('exit', onProcessExit);
+            if (isForked) {
+                process.removeListener('SIGINT', onSigInt);
+                process.removeListener('SIGTERM', onSigTerm);
+                process.removeListener('SIGHUP', onSigHup);
+            }
+        };
+        this.childProcess.stdout.setEncoding('utf8');
+        this.childProcess.stderr.setEncoding('utf8');
         this.childProcess.stdout.on('data', (data) => {
             const output = addColorAndPrefix(data, commandConfig);
             this.terminalOutputChunks.push(output);
@@ -301,8 +379,7 @@ class RunningNodeProcess {
             if (streamOutput) {
                 process.stdout.write(output);
             }
-            if (this.readyWhenStatus.length &&
-                isReady(this.readyWhenStatus, data.toString())) {
+            if (this.readyWhenStatus.length && isReady(this.readyWhenStatus, data)) {
                 for (const cb of this.exitCallbacks) {
                     cb(0, this.terminalOutputChunks.join(''));
                 }
@@ -315,8 +392,7 @@ class RunningNodeProcess {
             if (streamOutput) {
                 process.stderr.write(output);
             }
-            if (this.readyWhenStatus.length &&
-                isReady(this.readyWhenStatus, err.toString())) {
+            if (this.readyWhenStatus.length && isReady(this.readyWhenStatus, err)) {
                 for (const cb of this.exitCallbacks) {
                     cb(1, this.terminalOutputChunks.join(''));
                 }
@@ -331,51 +407,38 @@ class RunningNodeProcess {
             const terminalOutput = this.terminalOutputChunks.join('');
             this.terminalOutputChunks = [];
             removeProcessListeners();
-            for (const cb of this.exitCallbacks) {
-                cb(1, terminalOutput);
-            }
+            this.emitExit(1, terminalOutput);
         });
-        // Store signal/exit handlers so they can be removed when the child exits.
-        // Without cleanup, each RunningNodeProcess leaks 4 process listeners.
-        // In a large monorepo (2600+ run-commands tasks), these accumulate and
-        // cause a multi-minute synchronous hang at process.exit() as each handler
-        // calls treeKill on an already-dead PID.
-        const onExit = () => {
-            this.kill();
-        };
-        const onSigInt = () => {
-            this.kill('SIGTERM');
-        };
-        const onSigTerm = () => {
-            this.kill('SIGTERM');
-        };
-        const onSigHup = () => {
-            this.kill('SIGTERM');
-        };
-        const removeProcessListeners = () => {
-            process.removeListener('exit', onExit);
-            process.removeListener('SIGINT', onSigInt);
-            process.removeListener('SIGTERM', onSigTerm);
-            process.removeListener('SIGHUP', onSigHup);
-        };
         this.childProcess.on('exit', (code, signal) => {
             if (code === null) {
                 code = (0, exit_codes_1.signalToCode)(signal);
             }
             removeProcessListeners();
+            const terminalOutput = this.terminalOutputChunks.join('');
+            this.terminalOutputChunks = [];
             if (!this.readyWhenStatus.length || isReady(this.readyWhenStatus)) {
-                const terminalOutput = this.terminalOutputChunks.join('');
-                this.terminalOutputChunks = [];
-                for (const cb of this.exitCallbacks) {
-                    cb(code, terminalOutput);
-                }
+                this.emitExit(code, terminalOutput);
+            }
+            else if (code !== 0) {
+                // Process crashed before readyWhen matched; surface the failure so
+                // awaiters unblock. A clean exit (code 0) is left as-is — a parallel
+                // companion command may still produce the readyWhen output.
+                this.emitExit(code, terminalOutput);
             }
         });
-        // Terminate any task processes on exit
-        process.on('exit', onExit);
-        process.on('SIGINT', onSigInt);
-        process.on('SIGTERM', onSigTerm);
-        process.on('SIGHUP', onSigHup);
+        // Terminate any task processes on exit (sync, last resort).
+        // Skip if graceful kill is already in progress — it tracks cleanup
+        // subprocesses and we must not interfere with them.
+        process.on('exit', onProcessExit);
+        // In the direct path, detached children don't get OS SIGINT (own process
+        // group via setsid); the orchestrator's cleanup() sends SIGTERM via
+        // killProcessTreeGraceful. Signal handlers here are only needed in the
+        // forked path where there's no orchestrator to dispatch signals.
+        if (isForked) {
+            process.on('SIGINT', onSigInt);
+            process.on('SIGTERM', onSigTerm);
+            process.on('SIGHUP', onSigHup);
+        }
     }
 }
 async function runSingleCommandWithPseudoTerminal(normalized, context, taskId) {
@@ -493,21 +556,31 @@ function registerProcessListener(runningTask, pseudoTerminal) {
             runningTask.send(message);
         }
     });
-    // Terminate any task processes on exit
+    // Terminate any task processes on exit (sync, last resort).
+    // The per-child exit handlers and PseudoTerminal.shutdown() use the
+    // sync killProcessTree for this path. We call kill() here as a
+    // best-effort fallback — it returns a Promise but on 'exit' only
+    // synchronous work runs, so the initial signal is sent but the
+    // grace period won't be awaited. That's acceptable: 'exit' is the
+    // last resort after SIGINT/SIGTERM handlers have already had their
+    // chance to do graceful shutdown.
     process.on('exit', () => {
         runningTask.kill();
     });
-    process.on('SIGINT', () => {
-        runningTask.kill('SIGTERM');
-    });
-    process.on('SIGTERM', () => {
-        runningTask.kill('SIGTERM');
-        // no exit here because we expect child processes to terminate which
-        // will store results to the cache and will terminate this process
-    });
-    process.on('SIGHUP', () => {
-        runningTask.kill('SIGTERM');
-        // no exit here because we expect child processes to terminate which
-        // will store results to the cache and will terminate this process
-    });
+    // In the direct path, the orchestrator handles signal dispatch to children.
+    // These handlers are only needed in the forked path where there's no
+    // orchestrator.
+    if (process.env.NX_FORKED_TASK_EXECUTOR) {
+        process.on('SIGINT', () => {
+            Promise.resolve(runningTask.kill('SIGTERM')).finally(() => {
+                process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
+            });
+        });
+        process.on('SIGTERM', () => {
+            runningTask.kill('SIGTERM');
+        });
+        process.on('SIGHUP', () => {
+            runningTask.kill('SIGTERM');
+        });
+    }
 }

package/dist/src/executors/run-script/run-script.impl.js

@@ -4,7 +4,7 @@ exports.default = default_1;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const path = tslib_1.__importStar(require("path"));
-const tree_kill_1 = tslib_1.__importDefault(require("tree-kill"));
+const native_1 = require("../../native");
 const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
 const package_manager_1 = require("../../utils/package-manager");
 async function default_1(options, context) {
@@ -56,15 +56,8 @@ function nodeProcess(command, cwd, env) {
         });
         const exitHandler = (signal) => {
             if (cp && cp.pid && !cp.killed) {
-                (0, tree_kill_1.default)(cp.pid, signal, (error) => {
-                    // On Windows, tree-kill (which uses taskkill) may fail when the process or its child process is already terminated.
-                    // Ignore the errors, otherwise we will log them unnecessarily.
-                    if (error && process.platform !== 'win32') {
-                        rej(error);
-                    }
-                    else {
-                        res();
-                    }
+                (0, native_1.killProcessTreeGraceful)(cp.pid, signal).finally(() => {
+                    res();
                 });
             }
         };

package/dist/src/executors/utils/convert-nx-executor.js

@@ -17,7 +17,7 @@ function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
         const promise = async () => {
             const nxJsonConfiguration = (0, nx_json_1.readNxJson)(builderContext.workspaceRoot);
-            const separatedPlugins = await (0, get_plugins_1.getPluginsSeparated)();
+            const separatedPlugins = await (0, get_plugins_1.getPluginsSeparated)(nxJsonConfiguration);
             const projectsConfigurations = {
                 version: 2,
                 projects: (0, project_nodes_manager_1.readProjectConfigurationsFromRootMap)((await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(separatedPlugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects),

package/dist/src/hasher/hash-plan-inspector.d.ts

@@ -15,7 +15,7 @@ export declare class HashPlanInspector {
     /**
      * This is a lower level method which will inspect the hash plan for a set of tasks.
      */
-    inspectHashPlan(projectNames: string[], targets: string[], configuration?: string, overrides?: Object, extraTargetDependencies?: TargetDependencies, excludeTaskDependencies?: boolean): Record<string, string[]>;
+    inspectHashPlan(projectNames: string[], targets: string[], configuration?: string, overrides?: Record<string, unknown>, extraTargetDependencies?: TargetDependencies, excludeTaskDependencies?: boolean): Record<string, string[]>;
     /**
      * This inspects tasks involved in the execution of a task, including its dependencies by default.
      * @deprecated Prefer inspectTaskInputs

package/dist/src/hasher/task-hasher.js

@@ -125,8 +125,7 @@ function getNamedInputs(nxJson, project) {
 function getTargetInputs(nxJson, projectNode, target) {
     const namedInputs = getNamedInputs(nxJson, projectNode);
     const targetData = projectNode.data.targets[target];
-    const targetDefaults = (nxJson.targetDefaults || {})[target];
-    const inputs = splitInputsIntoSelfAndDependencies(targetData.inputs || targetDefaults?.inputs || DEFAULT_INPUTS, namedInputs);
+    const inputs = splitInputsIntoSelfAndDependencies(targetData.inputs || DEFAULT_INPUTS, namedInputs);
     const selfInputs = extractPatternsFromFileSets(inputs.selfInputs);
     const dependencyInputs = [
         ...extractPatternsFromFileSets(inputs.depsInputs
@@ -145,8 +144,11 @@ function getInputs(task, projectGraph, nxJson) {
     const projectNode = projectGraph.nodes[task.target.project];
     const namedInputs = getNamedInputs(nxJson, projectNode);
     const targetData = projectNode.data.targets[task.target.target];
-    const targetDefaults = (nxJson.targetDefaults || {})[task.target.target];
-    const { selfInputs, depsInputs, depsOutputs, projectInputs, depsFilesets } = splitInputsIntoSelfAndDependencies(targetData.inputs || targetDefaults?.inputs || DEFAULT_INPUTS, namedInputs);
+    // See `getTargetInputs` — graph construction already merged any
+    // matching target-default's `inputs` onto `targetData.inputs`, so a
+    // separate `targetDefaults` lookup here would either repeat that
+    // work or drift from it.
+    const { selfInputs, depsInputs, depsOutputs, projectInputs, depsFilesets } = splitInputsIntoSelfAndDependencies(targetData.inputs || DEFAULT_INPUTS, namedInputs);
     return { selfInputs, depsInputs, depsOutputs, projectInputs, depsFilesets };
 }
 function splitInputsIntoSelfAndDependencies(inputs, namedInputs) {

package/dist/src/index.d.ts

@@ -1 +1 @@
-export { initTasksRunner } from './tasks-runner/init-tasks-runner';
+export {};