nx 21.0.1 → 21.0.3

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{2259:()=>{}},s=>{var e;e=2259,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{4941:()=>{}},s=>{var e;e=4941,s(s.s=e)}]);

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

@@ -38,11 +38,12 @@ function nodeProcess(command, cwd, env) {
         windowsHide: false,
     });
 }
+let cp;
 async function ptyProcess(command, cwd, env) {
     const terminal = (0, pseudo_terminal_1.createPseudoTerminal)();
     await terminal.init();
     return new Promise((res, rej) => {
-        const cp = terminal.runCommand(command, { cwd, jsEnv: env });
+        cp = terminal.runCommand(command, { cwd, jsEnv: env });
         cp.onExit((code) => {
             if (code === 0) {
                 res();

package/src/native/index.d.ts

@@ -18,7 +18,7 @@ export declare class AppLifeCycle {
   __init(doneCallback: () => any): void
   registerRunningTask(taskId: string, parserAndWriter: ExternalObject<[ParserArc, WriterArc]>): void
   registerRunningTaskWithEmptyParser(taskId: string): void
-  appendTaskOutput(taskId: string, output: string): void
+  appendTaskOutput(taskId: string, output: string, isPtyOutput: boolean): void
   setTaskStatus(taskId: string, status: TaskStatus): void
   registerForcedShutdownCallback(forcedShutdownCallback: () => any): void
   __setCloudMessage(message: string): Promise<void>

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -273,7 +273,7 @@ class TargetProjectLocator {
         return;
     }
     resolveImportWithRequire(normalizedImportExpr, filePath) {
-        return node_path_1.posix.relative(workspace_root_1.workspaceRoot, require.resolve(normalizedImportExpr, {
+        return (0, node_path_1.relative)(workspace_root_1.workspaceRoot, require.resolve(normalizedImportExpr, {
             paths: [(0, node_path_1.dirname)(filePath)],
         }));
     }

package/src/tasks-runner/forked-process-task-runner.js

@@ -136,7 +136,7 @@ class ForkedProcessTaskRunner {
             terminalOutput += msg;
         });
         p.onExit((code) => {
-            if (code > 128) {
+            if (!this.tuiEnabled && code > 128) {
                 process.exit(code);
             }
             this.pseudoTerminals.delete(pseudoTerminal);

package/src/tasks-runner/life-cycle.d.ts

@@ -38,7 +38,7 @@ export interface LifeCycle {
     printTaskTerminalOutput?(task: Task, status: TaskStatus, output: string): void;
     registerRunningTask?(taskId: string, parserAndWriter: ExternalObject<[any, any]>): void;
     registerRunningTaskWithEmptyParser?(taskId: string): void;
-    appendTaskOutput?(taskId: string, output: string): void;
+    appendTaskOutput?(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus?(taskId: string, status: NativeTaskStatus): void;
     registerForcedShutdownCallback?(callback: () => void): void;
 }
@@ -55,7 +55,7 @@ export declare class CompositeLifeCycle implements LifeCycle {
     printTaskTerminalOutput(task: Task, status: TaskStatus, output: string): void;
     registerRunningTask(taskId: string, parserAndWriter: ExternalObject<[any, any]>): void;
     registerRunningTaskWithEmptyParser(taskId: string): void;
-    appendTaskOutput(taskId: string, output: string): void;
+    appendTaskOutput(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus(taskId: string, status: NativeTaskStatus): void;
     registerForcedShutdownCallback(callback: () => void): void;
 }

package/src/tasks-runner/life-cycle.js

@@ -81,10 +81,10 @@ class CompositeLifeCycle {
             }
         }
     }
-    appendTaskOutput(taskId, output) {
+    appendTaskOutput(taskId, output, isPtyTask) {
         for (let l of this.lifeCycles) {
             if (l.appendTaskOutput) {
-                l.appendTaskOutput(taskId, output);
+                l.appendTaskOutput(taskId, output, isPtyTask);
             }
         }
     }

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js

@@ -26,15 +26,21 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
     const inProgressTasks = new Set();
     const stoppedTasks = new Set();
     const tasksToTerminalOutputs = {};
-    const taskIdsInOrderOfCompletion = [];
+    const tasksToTaskStatus = {};
+    const taskIdsInTheOrderTheyStart = [];
     lifeCycle.startTasks = (tasks) => {
         for (let t of tasks) {
+            tasksToTerminalOutputs[t.id] ??= '';
+            taskIdsInTheOrderTheyStart.push(t.id);
             inProgressTasks.add(t.id);
         }
     };
-    lifeCycle.printTaskTerminalOutput = (task, taskStatus, terminalOutput) => {
-        taskIdsInOrderOfCompletion.push(task.id);
-        tasksToTerminalOutputs[task.id] = { terminalOutput, taskStatus };
+    lifeCycle.appendTaskOutput = (taskId, output) => {
+        tasksToTerminalOutputs[taskId] += output;
+    };
+    // TODO(@AgentEnder): The following 2 methods should be one but will need more refactoring
+    lifeCycle.printTaskTerminalOutput = (task, taskStatus) => {
+        tasksToTaskStatus[task.id] = taskStatus;
     };
     lifeCycle.setTaskStatus = (taskId, taskStatus) => {
         if (taskStatus === 9 /* NativeTaskStatus.Stopped */) {
@@ -103,8 +109,9 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
         let lines = [];
         // Prints task outputs in the order they were completed
         // above the summary, since run-one should print all task results.
-        for (const taskId of taskIdsInOrderOfCompletion) {
-            const { terminalOutput, taskStatus } = tasksToTerminalOutputs[taskId];
+        for (const taskId of taskIdsInTheOrderTheyStart) {
+            const taskStatus = tasksToTaskStatus[taskId];
+            const terminalOutput = tasksToTerminalOutputs[taskId];
             output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
         }
         lines.push(...output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green'));
@@ -157,9 +164,16 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
     const printRunManySummary = ({ failure, cancelled, }) => {
         console.log('');
         const lines = [''];
-        for (const taskId of taskIdsInOrderOfCompletion) {
-            const { terminalOutput, taskStatus } = tasksToTerminalOutputs[taskId];
-            if (taskStatus === 'failure') {
+        for (const taskId of taskIdsInTheOrderTheyStart) {
+            const taskStatus = tasksToTaskStatus[taskId];
+            const terminalOutput = tasksToTerminalOutputs[taskId];
+            // Task Status is null?
+            if (!taskStatus) {
+                output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
+                output_1.output.addNewline();
+                lines.push(`${LEFT_PAD}${output_1.output.colors.cyan(figures.squareSmallFilled)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
+            }
+            else if (taskStatus === 'failure') {
                 output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
                 output_1.output.addNewline();
                 lines.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);

package/src/tasks-runner/pseudo-terminal.d.ts

@@ -12,7 +12,7 @@ export declare class PseudoTerminal {
     static isSupported(): boolean;
     constructor(rustPseudoTerminal: RustPseudoTerminal);
     init(): Promise<void>;
-    shutdown(s?: NodeJS.Signals): void;
+    shutdown(code: number): void;
     runCommand(command: string, { cwd, execArgv, jsEnv, quiet, tty, }?: {
         cwd?: string;
         execArgv?: string[];

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

@@ -6,19 +6,11 @@ const os = require("os");
 const socket_utils_1 = require("../daemon/socket-utils");
 const native_1 = require("../native");
 const pseudo_ipc_1 = require("./pseudo-ipc");
+const exit_codes_1 = require("../utils/exit-codes");
 // Register single event listeners for all pseudo-terminal instances
 const pseudoTerminalShutdownCallbacks = [];
-process.on('SIGINT', () => {
-    pseudoTerminalShutdownCallbacks.forEach((cb) => cb('SIGINT'));
-});
-process.on('SIGTERM', () => {
-    pseudoTerminalShutdownCallbacks.forEach((cb) => cb('SIGTERM'));
-});
-process.on('SIGHUP', () => {
-    pseudoTerminalShutdownCallbacks.forEach((cb) => cb('SIGHUP'));
-});
-process.on('exit', () => {
-    pseudoTerminalShutdownCallbacks.forEach((cb) => cb());
+process.on('exit', (code) => {
+    pseudoTerminalShutdownCallbacks.forEach((cb) => cb(code));
 });
 function createPseudoTerminal(skipSupportCheck = false) {
     if (!skipSupportCheck && !PseudoTerminal.isSupported()) {
@@ -47,10 +39,10 @@ class PseudoTerminal {
         await this.pseudoIPC.init();
         this.initialized = true;
     }
-    shutdown(s) {
+    shutdown(code) {
         for (const cp of this.childProcesses) {
             try {
-                cp.kill(s);
+                cp.kill((0, exit_codes_1.codeToSignal)(code));
             }
             catch { }
         }

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

@@ -333,11 +333,14 @@ class TaskOrchestrator {
                     if (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());
+                        runningTask.onOutput((output) => {
+                            this.options.lifeCycle.appendTaskOutput(task.id, output, true);
+                        });
                     }
                     else {
                         this.options.lifeCycle.registerRunningTaskWithEmptyParser(task.id);
                         runningTask.onOutput((output) => {
-                            this.options.lifeCycle.appendTaskOutput(task.id, output);
+                            this.options.lifeCycle.appendTaskOutput(task.id, output, false);
                         });
                     }
                 }
@@ -391,11 +394,14 @@ class TaskOrchestrator {
                 if (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());
+                    runningTask.onOutput((output) => {
+                        this.options.lifeCycle.appendTaskOutput(task.id, output, true);
+                    });
                 }
                 else if ('onOutput' in runningTask) {
                     this.options.lifeCycle.registerRunningTaskWithEmptyParser(task.id);
                     runningTask.onOutput((output) => {
-                        this.options.lifeCycle.appendTaskOutput(task.id, output);
+                        this.options.lifeCycle.appendTaskOutput(task.id, output, false);
                     });
                 }
             }

package/src/utils/exit-codes.d.ts

@@ -3,3 +3,7 @@
  * @param signal
  */
 export declare function signalToCode(signal: NodeJS.Signals): number;
+/**
+ * Translates numeric exit codes to NodeJS signals
+ */
+export declare function codeToSignal(code: number): NodeJS.Signals;

package/src/utils/exit-codes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signalToCode = signalToCode;
+exports.codeToSignal = codeToSignal;
 /**
  * Translates NodeJS signals to numeric exit code
  * @param signal
@@ -17,3 +18,18 @@ function signalToCode(signal) {
             return 128;
     }
 }
+/**
+ * Translates numeric exit codes to NodeJS signals
+ */
+function codeToSignal(code) {
+    switch (code) {
+        case 128 + 1:
+            return 'SIGHUP';
+        case 128 + 2:
+            return 'SIGINT';
+        case 128 + 15:
+            return 'SIGTERM';
+        default:
+            return 'SIGTERM';
+    }
+}