nx 21.0.0-rc.2 → 21.0.0-rc.3

package/src/nx-cloud/update-manager.d.ts

@@ -17,3 +17,4 @@ export declare function verifyOrUpdateNxCloudClient(options: CloudTaskRunnerOpti
     nxCloudClient: NxCloudClient;
     version: string;
 } | null>;
+export declare function getBundleInstallDefaultLocation(): string;

package/src/nx-cloud/update-manager.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NxCloudClientUnavailableError = exports.NxCloudEnterpriseOutdatedError = void 0;
 exports.verifyOrUpdateNxCloudClient = verifyOrUpdateNxCloudClient;
+exports.getBundleInstallDefaultLocation = getBundleInstallDefaultLocation;
 const fs_1 = require("fs");
 const zlib_1 = require("zlib");
 const path_1 = require("path");

package/src/nx-cloud/utilities/client.d.ts

@@ -5,6 +5,6 @@ export declare class UnknownCommandError extends Error {
     constructor(command: string, availableCommands: string[]);
 }
 export declare function getCloudClient(options: CloudTaskRunnerOptions): Promise<{
-    invoke: (command: string) => void;
+    invoke: (command: string, exit?: boolean) => void;
     availableCommands: string[];
 }>;

package/src/nx-cloud/utilities/client.js

@@ -17,13 +17,20 @@ async function getCloudClient(options) {
     const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
     nxCloudClient.configureLightClientRequire()(paths);
     return {
-        invoke: (command) => {
+        invoke: (command, exit = true) => {
             if (command in nxCloudClient.commands) {
                 nxCloudClient.commands[command]()
-                    .then(() => process.exit(0))
+                    .then(() => {
+                    if (exit) {
+                        process.exit(0);
+                    }
+                })
                     .catch((e) => {
                     console.error(e);
-                    process.exit(1);
+                    if (exit) {
+                        process.exit(1);
+                    }
+                    throw e;
                 });
             }
             else {

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

@@ -108,7 +108,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
             }
             lines = [output_1.output.colors.green(lines.join(node_os_1.EOL))];
         }
-        else if (totalCompletedTasks + stoppedTasks.size === totalTasks) {
+        else if (inProgressTasks.size === 0) {
             let text = `Ran target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`;
             if (tasks.length > 1) {
                 text += ` and ${output_1.output.bold(tasks.length - 1)} task(s) they depend on`;
@@ -122,22 +122,17 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
                     .forEach((arg) => taskOverridesLines.push(arg));
             }
             const viewLogs = (0, view_logs_utils_1.viewLogsFooterRows)(totalFailedTasks);
-            lines = [
-                output_1.output.colors.red([
-                    output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
-                    ...taskOverridesLines,
-                    '',
-                    `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
-                    `${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
-                    ...viewLogs,
-                ].join(node_os_1.EOL)),
-            ];
+            lines.push(output_1.output.colors.red([
+                output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
+                ...taskOverridesLines,
+                '',
+                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
+                `${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
+                ...viewLogs,
+            ].join(node_os_1.EOL)));
         }
         else {
-            lines = [
-                ...output_1.output.getVerticalSeparatorLines('red'),
-                output_1.output.applyNxPrefix('red', output_1.output.colors.red(`Cancelled running target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`) + output_1.output.dim(` (${timeTakenText})`)),
-            ];
+            lines.push(output_1.output.applyNxPrefix('red', output_1.output.colors.red(`Cancelled running target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`) + output_1.output.dim(` (${timeTakenText})`)));
         }
         // adds some vertical space after the summary to avoid bunching against terminal
         lines.push('');
@@ -145,12 +140,13 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
     };
     const printRunManySummary = () => {
         console.log('');
-        const lines = [];
+        const lines = [''];
         const failure = totalSuccessfulTasks + stoppedTasks.size !== totalTasks;
         for (const taskId of taskIdsInOrderOfCompletion) {
             const { terminalOutput, taskStatus } = tasksToTerminalOutputs[taskId];
             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}`);
             }
             else {

package/src/tasks-runner/run-command.js

@@ -168,20 +168,14 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
             // The cloud client calls console.log when NX_VERBOSE_LOGGING is set to true
             console.log = createPatchedConsoleMethod(originalConsoleLog);
             console.error = createPatchedConsoleMethod(originalConsoleError);
-            renderIsDone = new Promise((resolve) => {
-                appLifeCycle.__init(() => {
-                    resolve();
-                });
-            })
-                .then(() => {
+            globalThis.tuiOnProcessExit = () => {
                 restoreTerminal();
-            })
-                .finally(() => {
                 // Revert the patched methods
                 process.stdout.write = originalStdoutWrite;
                 process.stderr.write = originalStderrWrite;
                 console.log = originalConsoleLog;
                 console.error = originalConsoleError;
+                process.stdout.write('\n');
                 // Print the intercepted Nx Cloud logs
                 for (const log of interceptedNxCloudLogs) {
                     const logString = log.toString().trimStart();
@@ -190,6 +184,18 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
                         process.stdout.write('\n');
                     }
                 }
+            };
+            renderIsDone = new Promise((resolve) => {
+                appLifeCycle.__init(() => {
+                    resolve();
+                });
+            }).finally(() => {
+                restoreTerminal();
+                // Revert the patched methods
+                process.stdout.write = originalStdoutWrite;
+                process.stderr.write = originalStderrWrite;
+                console.log = originalConsoleLog;
+                console.error = originalConsoleError;
             });
         }
         return {
@@ -575,7 +581,7 @@ async function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nx
         ...runnerOptions,
         lifeCycle: compositedLifeCycle,
     }, {
-        initiatingProject: nxArgs.outputStyle === 'compact' ? null : initiatingProject,
+        initiatingProject,
         initiatingTasks,
         projectGraph,
         nxJson,