nx 22.0.0-canary.20251016-849f356 → 22.0.0-rc.0

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

@@ -14,7 +14,7 @@ export declare function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, ta
     initiatingTasks: Task[];
     resolveRenderIsDonePromise: (value: void) => void;
 }): {
-    lifeCycle: Partial<LifeCycle>;
+    lifeCycle: LifeCycle;
     printSummary: () => void;
 };
 //# sourceMappingURL=tui-summary-life-cycle.d.ts.map

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;;;EAkbA"}
+{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;eAqekC,SAAS;;EAC3C"}

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

@@ -39,8 +39,13 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
         tasksToTerminalOutputs[taskId] += output;
     };
     // TODO(@AgentEnder): The following 2 methods should be one but will need more refactoring
-    lifeCycle.printTaskTerminalOutput = (task, taskStatus) => {
+    lifeCycle.printTaskTerminalOutput = (task, taskStatus, output) => {
         tasksToTaskStatus[task.id] = taskStatus;
+        // Store the complete output for display in the summary
+        // This is called with the full output for cached and executed tasks
+        if (output) {
+            tasksToTerminalOutputs[task.id] = output;
+        }
     };
     lifeCycle.setTaskStatus = (taskId, taskStatus) => {
         if (taskStatus === 9 /* NativeTaskStatus.Stopped */) {
@@ -106,7 +111,6 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
         (0, task_history_life_cycle_1.getTasksHistoryLifeCycle)().printFlakyTasksMessage();
     };
     const printRunOneSummary = ({ failure, cancelled, }) => {
-        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 taskIdsInTheOrderTheyStart) {
@@ -114,62 +118,71 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
             const terminalOutput = tasksToTerminalOutputs[taskId];
             output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
         }
-        lines.push(...output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green'));
+        // Print vertical separator
+        const separatorLines = output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green');
+        for (const line of separatorLines) {
+            console.log(line);
+        }
         if (!failure && !cancelled) {
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)([initiatingProject], targets, tasks)}`;
-            const taskOverridesLines = [];
+            // Build success message with color applied to the entire block
+            const messageLines = [
+                output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim(` (${timeTakenText})`)),
+            ];
             const filteredOverrides = Object.entries(overrides).filter(
             // Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
             ([flag]) => flag !== 'nxReleaseVersionData');
             if (filteredOverrides.length > 0) {
-                taskOverridesLines.push('');
-                taskOverridesLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
+                messageLines.push('');
+                messageLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
                 filteredOverrides
                     .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
-                    .forEach((arg) => taskOverridesLines.push(arg));
+                    .forEach((arg) => messageLines.push(arg));
             }
-            lines.push(output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim(` (${timeTakenText})`)), ...taskOverridesLines);
             if (totalCachedTasks > 0) {
-                lines.push(output_1.output.dim(`${node_os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
+                messageLines.push(output_1.output.dim(`${node_os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
             }
-            lines = [output_1.output.colors.green(lines.join(node_os_1.EOL))];
+            // Print the entire success message block with green color
+            console.log(output_1.output.colors.green(messageLines.join(node_os_1.EOL)));
         }
         else if (!cancelled) {
             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`;
             }
-            const taskOverridesLines = [];
+            // Build failure message lines
+            const messageLines = [
+                output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
+            ];
             const filteredOverrides = Object.entries(overrides).filter(
             // Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
             ([flag]) => flag !== 'nxReleaseVersionData');
             if (filteredOverrides.length > 0) {
-                taskOverridesLines.push('');
-                taskOverridesLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
+                messageLines.push('');
+                messageLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
                 filteredOverrides
                     .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
-                    .forEach((arg) => taskOverridesLines.push(arg));
+                    .forEach((arg) => messageLines.push(arg));
             }
+            messageLines.push('');
+            messageLines.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
+            messageLines.push(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
             const viewLogs = (0, view_logs_utils_1.viewLogsFooterRows)(totalFailedTasks);
-            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)));
+            messageLines.push(...viewLogs);
+            // Print the entire failure message block with red color
+            console.log(output_1.output.colors.red(messageLines.join(node_os_1.EOL)));
         }
         else {
-            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})`)));
+            console.log(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('');
-        console.log(lines.join(node_os_1.EOL));
+        console.log('');
     };
     const printRunManySummary = ({ failure, cancelled, }) => {
         console.log('');
-        const lines = [''];
+        // Collect checklist lines to print after task outputs
+        const checklistLines = [];
+        // First pass: Print task outputs and collect checklist lines
         for (const taskId of taskIdsInTheOrderTheyStart) {
             const taskStatus = tasksToTaskStatus[taskId];
             const terminalOutput = tasksToTerminalOutputs[taskId];
@@ -177,66 +190,82 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
             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}`);
+                checklistLines.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}`);
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
+            }
+            else if (taskStatus === 'local-cache') {
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}  ${output_1.output.dim('[local cache]')}`);
+            }
+            else if (taskStatus === 'local-cache-kept-existing') {
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}  ${output_1.output.dim('[existing outputs match the cache, left as is]')}`);
+            }
+            else if (taskStatus === 'remote-cache') {
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}  ${output_1.output.dim('[remote cache]')}`);
+            }
+            else if (taskStatus === 'success') {
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
             }
             else {
-                lines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
+                checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
             }
         }
-        lines.push(...output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green'));
+        // Print all checklist lines together
+        console.log();
+        for (const line of checklistLines) {
+            console.log(line);
+        }
+        // Print vertical separator
+        const separatorLines = output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green');
+        for (const line of separatorLines) {
+            console.log(line);
+        }
         if (totalSuccessfulTasks + stoppedTasks.size === totalTasks) {
-            const successSummaryRows = [];
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
-            const taskOverridesRows = [];
+            const successSummaryRows = [
+                output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim.white(` (${timeTakenText})`)),
+            ];
             const filteredOverrides = Object.entries(overrides).filter(
             // Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
             ([flag]) => flag !== 'nxReleaseVersionData');
             if (filteredOverrides.length > 0) {
-                taskOverridesRows.push('');
-                taskOverridesRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
+                successSummaryRows.push('');
+                successSummaryRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
                 filteredOverrides
                     .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
-                    .forEach((arg) => taskOverridesRows.push(arg));
+                    .forEach((arg) => successSummaryRows.push(arg));
             }
-            successSummaryRows.push(...[
-                output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim.white(` (${timeTakenText})`)),
-                ...taskOverridesRows,
-            ]);
             if (totalCachedTasks > 0) {
                 successSummaryRows.push(output_1.output.dim(`${node_os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
             }
-            lines.push(successSummaryRows.join(node_os_1.EOL));
+            console.log(successSummaryRows.join(node_os_1.EOL));
         }
         else {
             const text = `${cancelled ? 'Cancelled while running' : 'Ran'} ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
-            const taskOverridesRows = [];
+            const failureSummaryRows = [
+                output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
+            ];
             const filteredOverrides = Object.entries(overrides).filter(
             // Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
             ([flag]) => flag !== 'nxReleaseVersionData');
             if (filteredOverrides.length > 0) {
-                taskOverridesRows.push('');
-                taskOverridesRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
+                failureSummaryRows.push('');
+                failureSummaryRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
                 filteredOverrides
                     .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
-                    .forEach((arg) => taskOverridesRows.push(arg));
+                    .forEach((arg) => failureSummaryRows.push(arg));
             }
-            const numFailedToPrint = 5;
-            const failedTasksForPrinting = Array.from(failedTasks).slice(0, numFailedToPrint);
-            const failureSummaryRows = [
-                output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
-                ...taskOverridesRows,
-                '',
-            ];
+            failureSummaryRows.push('');
             if (totalCompletedTasks > 0) {
                 if (totalSuccessfulTasks > 0) {
                     failureSummaryRows.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`), '');
                 }
                 if (totalFailedTasks > 0) {
+                    const numFailedToPrint = 5;
+                    const failedTasksForPrinting = Array.from(failedTasks).slice(0, numFailedToPrint);
                     failureSummaryRows.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`, '', `${failedTasksForPrinting
                         .map((t) => `${EXTENDED_LEFT_PAD}${output_1.output.colors.red('-')} ${output_1.output.formatCommand(t.toString())}`)
                         .join('\n')}`, '');
@@ -256,12 +285,11 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
                     }
                 }
                 failureSummaryRows.push(...(0, view_logs_utils_1.viewLogsFooterRows)(failedTasks.size));
-                lines.push(output_1.output.colors.red(failureSummaryRows.join(node_os_1.EOL)));
             }
+            console.log(output_1.output.colors.red(failureSummaryRows.join(node_os_1.EOL)));
         }
         // adds some vertical space after the summary to avoid bunching against terminal
-        lines.push('');
-        console.log(lines.join(node_os_1.EOL));
+        console.log('');
     };
-    return { lifeCycle, printSummary };
+    return { lifeCycle: lifeCycle, printSummary };
 }

package/src/utils/catalog/index.d.ts

@@ -1,7 +1,7 @@
 import type { Tree } from '../../generators/tree';
 import type { CatalogManager } from './manager';
 import { getCatalogManager } from './manager-factory';
-export { getCatalogManager };
+export { type CatalogManager, getCatalogManager };
 /**
  * Detects which packages in a package.json use catalog references
  * Returns Map of package name -> catalog name (undefined for default catalog)

package/src/utils/catalog/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,cAAc,GACtB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CA+BjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAElD;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,cAAc,GACtB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CA+BjC"}

package/src/utils/catalog/manager.d.ts

@@ -8,6 +8,7 @@ export interface CatalogManager {
     readonly name: string;
     isCatalogReference(version: string): boolean;
     parseCatalogReference(version: string): CatalogReference | null;
+    getCatalogDefinitionFilePaths(): string[];
     /**
      * Get catalog definitions from the workspace.
      */

package/src/utils/catalog/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAE7C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAEhE;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IACvE,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,uBAAuB,CACrB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IACjB,uBAAuB,CACrB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IAEjB;;OAEG;IACH,wBAAwB,CACtB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IACR,wBAAwB,CACtB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IAER;;OAEG;IACH,qBAAqB,CACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;IACR,qBAAqB,CACnB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;CACT"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAE7C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAEhE,6BAA6B,IAAI,MAAM,EAAE,CAAC;IAE1C;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IACvE,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,uBAAuB,CACrB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IACjB,uBAAuB,CACrB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IAEjB;;OAEG;IACH,wBAAwB,CACtB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IACR,wBAAwB,CACtB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IAER;;OAEG;IACH,qBAAqB,CACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;IACR,qBAAqB,CACnB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;CACT"}

package/src/utils/catalog/pnpm-manager.d.ts

@@ -10,6 +10,7 @@ export declare class PnpmCatalogManager implements CatalogManager {
     readonly catalogProtocol = "catalog:";
     isCatalogReference(version: string): boolean;
     parseCatalogReference(version: string): CatalogReference | null;
+    getCatalogDefinitionFilePaths(): string[];
     getCatalogDefinitions(treeOrRoot: Tree | string): PnpmWorkspaceYaml | null;
     resolveCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): string | null;
     validateCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): void;

package/src/utils/catalog/pnpm-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/pnpm-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,eAAe,cAAc;IAEtC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAe/D,qBAAqB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAe1E,uBAAuB,CACrB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAuBhB,wBAAwB,CACtB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI;IA0HP,qBAAqB,CACnB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI;CAgFR"}
+{"version":3,"file":"pnpm-manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/pnpm-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,eAAe,cAAc;IAEtC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAe/D,6BAA6B,IAAI,MAAM,EAAE;IAIzC,qBAAqB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAe1E,uBAAuB,CACrB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAuBhB,wBAAwB,CACtB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI;IA0HP,qBAAqB,CACnB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI;CAgFR"}

package/src/utils/catalog/pnpm-manager.js

@@ -29,6 +29,9 @@ class PnpmCatalogManager {
             isDefaultCatalog: isDefault,
         };
     }
+    getCatalogDefinitionFilePaths() {
+        return ['pnpm-workspace.yaml'];
+    }
     getCatalogDefinitions(treeOrRoot) {
         if (typeof treeOrRoot === 'string') {
             const pnpmWorkspacePath = (0, node_path_1.join)(treeOrRoot, 'pnpm-workspace.yaml');

package/src/utils/delayed-spinner.d.ts

@@ -1,4 +1,4 @@
-import * as ora from 'ora';
+import { globalSpinner } from './spinner';
 export type DelayedSpinnerOptions = {
     delay?: number;
     ciDelay?: number;
@@ -10,7 +10,7 @@ export type DelayedSpinnerOptions = {
  * takes longer than a certain amount of time.
  */
 export declare class DelayedSpinner {
-    spinner: ora.Ora;
+    spinner: typeof globalSpinner;
     timeouts: NodeJS.Timeout[];
     private lastMessage;
     private ready;

package/src/utils/delayed-spinner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delayed-spinner.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/delayed-spinner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAM;IAEhC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAU;IAEvB;;;;OAIG;gBACS,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB;IAiBzD;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM;IAY1B;;;;;;OAMG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB;IAanE;;OAEG;IACH,OAAO;CAIR"}
+{"version":3,"file":"delayed-spinner.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/delayed-spinner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAwB,MAAM,WAAW,CAAC;AAEhE,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,EAAE,OAAO,aAAa,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAM;IAEhC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAU;IAEvB;;;;OAIG;gBACS,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB;IAiBzD;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM;IAY1B;;;;;;OAMG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB;IAanE;;OAEG;IACH,OAAO;CAIR"}

package/src/utils/delayed-spinner.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DelayedSpinner = void 0;
-const ora = require("ora");
-const is_ci_1 = require("./is-ci");
+const spinner_1 = require("./spinner");
 /**
  * A class that allows to delay the creation of a spinner, as well
  * as schedule updates to the message of the spinner. Useful for
@@ -18,15 +17,15 @@ class DelayedSpinner {
     constructor(message, opts) {
         this.timeouts = [];
         opts = normalizeDelayedSpinnerOpts(opts);
-        const delay = SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay;
+        const delay = spinner_1.SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay;
         this.timeouts.push(setTimeout(() => {
             this.ready = true;
             this.lastMessage = message;
-            if (!SHOULD_SHOW_SPINNERS) {
+            if (!spinner_1.SHOULD_SHOW_SPINNERS) {
                 console.warn(this.lastMessage);
             }
-            else {
-                this.spinner = ora(this.lastMessage).start();
+            else if (!spinner_1.globalSpinner.isSpinning()) {
+                this.spinner = spinner_1.globalSpinner.start(this.lastMessage);
             }
         }, delay).unref());
     }
@@ -37,9 +36,9 @@ class DelayedSpinner {
      * @returns The {@link DelayedSpinner} instance
      */
     setMessage(message) {
-        if (SHOULD_SHOW_SPINNERS) {
+        if (spinner_1.SHOULD_SHOW_SPINNERS) {
             if (this.spinner) {
-                this.spinner.text = message;
+                this.spinner.updateText(message);
             }
         }
         else if (this.ready && this.lastMessage && this.lastMessage !== message) {
@@ -59,7 +58,7 @@ class DelayedSpinner {
         opts = normalizeDelayedSpinnerOpts(opts);
         this.timeouts.push(setTimeout(() => {
             this.setMessage(message);
-        }, SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay).unref());
+        }, spinner_1.SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay).unref());
         return this;
     }
     /**
@@ -71,7 +70,6 @@ class DelayedSpinner {
     }
 }
 exports.DelayedSpinner = DelayedSpinner;
-const SHOULD_SHOW_SPINNERS = process.stdout.isTTY && !(0, is_ci_1.isCI)();
 function normalizeDelayedSpinnerOpts(opts) {
     opts ??= {};
     opts.delay ??= 500;

package/src/utils/spinner.d.ts

@@ -0,0 +1,13 @@
+export declare const SHOULD_SHOW_SPINNERS: boolean;
+declare class SpinnerManager {
+    #private;
+    start(text?: string, prefix?: string): SpinnerManager;
+    succeed(text?: string): void;
+    stop(): void;
+    fail(text?: string): void;
+    updateText(text?: string): void;
+    isSpinning(): boolean;
+}
+export declare const globalSpinner: SpinnerManager;
+export {};
+//# sourceMappingURL=spinner.d.ts.map

package/src/utils/spinner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spinner.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/spinner.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,SAAkC,CAAC;AAEpE,cAAM,cAAc;;IAIlB,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc;IAiBrD,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM;IAIrB,IAAI;IAIJ,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM;IAIlB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM;IAQxB,UAAU;CAYX;AAED,eAAO,MAAM,aAAa,gBAAuB,CAAC"}

package/src/utils/spinner.js

@@ -0,0 +1,61 @@
+"use strict";
+var _SpinnerManager_instances, _SpinnerManager_ora, _SpinnerManager_prefix, _SpinnerManager_createOra;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.globalSpinner = exports.SHOULD_SHOW_SPINNERS = void 0;
+const tslib_1 = require("tslib");
+const ora = require("ora");
+const is_ci_1 = require("./is-ci");
+exports.SHOULD_SHOW_SPINNERS = process.stdout.isTTY && !(0, is_ci_1.isCI)();
+class SpinnerManager {
+    constructor() {
+        _SpinnerManager_instances.add(this);
+        _SpinnerManager_ora.set(this, void 0);
+        _SpinnerManager_prefix.set(this, void 0);
+    }
+    start(text, prefix) {
+        if (!exports.SHOULD_SHOW_SPINNERS) {
+            return this;
+        }
+        if (prefix !== undefined) {
+            tslib_1.__classPrivateFieldSet(this, _SpinnerManager_prefix, prefix, "f");
+        }
+        if (tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")) {
+            tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f").text = text;
+            tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f").prefixText = tslib_1.__classPrivateFieldGet(this, _SpinnerManager_prefix, "f");
+        }
+        else {
+            tslib_1.__classPrivateFieldGet(this, _SpinnerManager_instances, "m", _SpinnerManager_createOra).call(this, text);
+        }
+        tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f").start();
+        return this;
+    }
+    succeed(text) {
+        tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")?.succeed(text);
+    }
+    stop() {
+        tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")?.stop();
+    }
+    fail(text) {
+        tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")?.fail(text);
+    }
+    updateText(text) {
+        if (tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")) {
+            tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f").text = text;
+        }
+        else if (exports.SHOULD_SHOW_SPINNERS) {
+            tslib_1.__classPrivateFieldGet(this, _SpinnerManager_instances, "m", _SpinnerManager_createOra).call(this, text);
+        }
+    }
+    isSpinning() {
+        return tslib_1.__classPrivateFieldGet(this, _SpinnerManager_ora, "f")?.isSpinning ?? false;
+    }
+}
+_SpinnerManager_ora = new WeakMap(), _SpinnerManager_prefix = new WeakMap(), _SpinnerManager_instances = new WeakSet(), _SpinnerManager_createOra = function _SpinnerManager_createOra(text) {
+    tslib_1.__classPrivateFieldSet(this, _SpinnerManager_ora, ora({
+        text: text,
+        prefixText: tslib_1.__classPrivateFieldGet(this, _SpinnerManager_prefix, "f"),
+        hideCursor: false,
+        discardStdin: false,
+    }), "f");
+};
+exports.globalSpinner = new SpinnerManager();