nx 19.0.0-canary.20240419-e617e54 → 19.0.0-canary.20240423-b37bfdb

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -22,6 +22,7 @@ export interface RunCommandsOptions extends Json {
     readyWhen?: string;
     cwd?: string;
     env?: Record<string, string>;
+    forwardAllArgs?: boolean;
     args?: string | string[];
     envFile?: string;
     __unparsed__: string[];

package/src/executors/run-commands/run-commands.impl.js

@@ -7,17 +7,10 @@ const yargsParser = require("yargs-parser");
 const npm_run_path_1 = require("npm-run-path");
 const chalk = require("chalk");
 const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
+const exit_codes_1 = require("../../utils/exit-codes");
 exports.LARGE_BUFFER = 1024 * 1000000;
-const exitListeners = new Set();
-function processExitListener() {
-    for (const listener of exitListeners) {
-        listener();
-    }
-}
-process.on('exit', processExitListener);
-process.on('SIGTERM', processExitListener);
-process.on('SIGINT', processExitListener);
-process.on('SIGQUIT', processExitListener);
+let pseudoTerminal;
+const childProcesses = new Set();
 async function loadEnvVars(path) {
     if (path) {
         const result = (await Promise.resolve().then(() => require('dotenv'))).config({ path });
@@ -46,8 +39,10 @@ const propKeys = [
     'usePty',
     'streamOutput',
     'verbose',
+    'forwardAllArgs',
 ];
 async function default_1(options, context) {
+    registerProcessListener();
     await loadEnvVars(options.envFile);
     const normalized = normalizeOptions(options);
     if (options.readyWhen && !options.parallel) {
@@ -141,14 +136,12 @@ function normalizeOptions(options) {
     options.parsedArgs = parseArgs(unparsedCommandArgs, options.unknownOptions, options.args);
     options.unparsedCommandArgs = unparsedCommandArgs;
     options.commands.forEach((c) => {
-        c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? true);
+        c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? options.forwardAllArgs ?? true);
     });
     return options;
 }
 async function runSerially(options, context) {
-    const pseudoTerminal = pseudo_terminal_1.PseudoTerminal.isSupported()
-        ? (0, pseudo_terminal_1.getPseudoTerminal)()
-        : null;
+    pseudoTerminal ??= pseudo_terminal_1.PseudoTerminal.isSupported() ? (0, pseudo_terminal_1.getPseudoTerminal)() : null;
     let terminalOutput = '';
     for (const c of options.commands) {
         const result = await createProcess(pseudoTerminal, c, undefined, options.color, calculateCwd(options.cwd, context), options.env ?? {}, false, options.usePty, options.streamOutput);
@@ -182,6 +175,7 @@ async function createProcess(pseudoTerminal, commandConfig, readyWhen, color, cw
             jsEnv: env,
             quiet: !streamOutput,
         });
+        childProcesses.add(cp);
         return new Promise((res) => {
             cp.onOutput((output) => {
                 terminalOutput += output;
@@ -212,11 +206,7 @@ function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
             env,
             cwd,
         });
-        /**
-         * Ensure the child process is killed when the parent exits
-         */
-        const childProcessKiller = (signal) => childProcess.kill(signal);
-        exitListeners.add(childProcessKiller);
+        childProcesses.add(childProcess);
         childProcess.stdout.on('data', (data) => {
             const output = addColorAndPrefix(data, commandConfig);
             terminalOutput += output;
@@ -246,7 +236,7 @@ function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
             res({ success: false, terminalOutput });
         });
         childProcess.on('exit', (code) => {
-            exitListeners.delete(childProcessKiller);
+            childProcesses.delete(childProcess);
             if (!readyWhen) {
                 res({ success: code === 0, terminalOutput });
             }
@@ -369,3 +359,57 @@ function filterPropKeysFromUnParsedOptions(__unparsed__, unparsedCommandArgs = {
     }
     return parsedOptions;
 }
+let registered = false;
+function registerProcessListener() {
+    if (registered) {
+        return;
+    }
+    registered = true;
+    // When the nx process gets a message, it will be sent into the task's process
+    process.on('message', (message) => {
+        // this.publisher.publish(message.toString());
+        if (pseudoTerminal) {
+            pseudoTerminal.sendMessageToChildren(message);
+        }
+        childProcesses.forEach((p) => {
+            if ('connected' in p && p.connected) {
+                p.send(message);
+            }
+        });
+    });
+    // Terminate any task processes on exit
+    process.on('exit', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill();
+            }
+        });
+    });
+    process.on('SIGINT', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill('SIGTERM');
+            }
+        });
+        // we exit here because we don't need to write anything to cache.
+        process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
+    });
+    process.on('SIGTERM', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.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', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill('SIGTERM');
+            }
+        });
+        // no exit here because we expect child processes to terminate which
+        // will store results to the cache and will terminate this process
+    });
+}

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

@@ -135,6 +135,11 @@
         "$source": "unparsed"
       },
       "x-priority": "internal"
+    },
+    "forwardAllArgs": {
+      "type": "boolean",
+      "description": "Whether arguments should be forwarded when interpolation is not present.",
+      "default": true
     }
   },
   "additionalProperties": true,

package/src/project-graph/utils/project-configuration-utils.js

@@ -388,7 +388,7 @@ function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, s
     const { configurations: defaultConfigurations, options: defaultOptions, ...baseTargetProperties } = baseTarget ?? {};
     // Target is "compatible", e.g. executor is defined only once or is the same
     // in both places. This means that it is likely safe to merge
-    const isCompatible = isCompatibleTarget(baseTargetProperties, target);
+    const isCompatible = isCompatibleTarget(baseTarget ?? {}, target);
     // If the targets are not compatible, we would normally overwrite the old target
     // with the new one. However, we have a special case for targets that have the
     // ONLY_MODIFIES_EXISTING_TARGET symbol set. This prevents the merged target

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -24,6 +24,10 @@ const EXTENDED_LEFT_PAD = `      `;
  */
 async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, overrides, }) {
     cliCursor.hide();
+    // Show the cursor again after the process exits
+    process.on('exit', () => {
+        cliCursor.show();
+    });
     let resolveRenderIsDonePromise;
     const renderIsDone = new Promise((resolve) => (resolveRenderIsDonePromise = resolve)).then(() => {
         clearRenderInterval();

package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js

@@ -24,6 +24,10 @@ const EXTENDED_LEFT_PAD = `      `;
  */
 async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, args, overrides, }) {
     cliCursor.hide();
+    // Show the cursor again after the process exits
+    process.on('exit', () => {
+        cliCursor.show();
+    });
     let resolveRenderIsDonePromise;
     const renderIsDone = new Promise((resolve) => (resolveRenderIsDonePromise = resolve)).then(() => {
         clearRenderInterval();

package/src/tasks-runner/pseudo-terminal.js

@@ -142,6 +142,12 @@ function supportedPtyPlatform() {
     if (process.platform !== 'win32') {
         return true;
     }
+    // TODO: Re-enable Windows support when it's stable
+    // Currently, there's an issue with control chars.
+    // See: https://github.com/nrwl/nx/issues/22358
+    if (process.env.NX_WINDOWS_PTY_SUPPORT !== 'true') {
+        return false;
+    }
     let windowsVersion = os.release().split('.');
     let windowsBuild = windowsVersion[2];
     if (!windowsBuild) {