nx 20.3.0-canary.20241218-fb40366 → 20.3.0-canary.20241220-0980006

package/src/core/graph/styles.js

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

package/src/daemon/client/client.js

@@ -115,10 +115,8 @@ class DaemonClient {
     }
     async getProjectGraphAndSourceMaps() {
         let spinner;
-        if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
-            // If the graph takes a while to load, we want to show a spinner.
-            spinner = new delayed_spinner_1.DelayedSpinner('Calculating the project graph on the Nx Daemon', 500).scheduleMessageUpdate('Calculating the project graph on the Nx Daemon is taking longer than expected. Re-run with NX_DAEMON=false to see more details.', 30_000);
-        }
+        // If the graph takes a while to load, we want to show a spinner.
+        spinner = new delayed_spinner_1.DelayedSpinner('Calculating the project graph on the Nx Daemon').scheduleMessageUpdate('Calculating the project graph on the Nx Daemon is taking longer than expected. Re-run with NX_DAEMON=false to see more details.', { ciDelay: 60_000, delay: 30_000 });
         try {
             const response = await this.sendToDaemonViaQueue({
                 type: 'REQUEST_PROJECT_GRAPH',

package/src/project-graph/build-project-graph.js

@@ -190,25 +190,23 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins,
     let spinner;
     const inProgressPlugins = new Set();
     function updateSpinner() {
-        if (!spinner) {
+        if (!spinner || inProgressPlugins.size === 0) {
             return;
         }
         if (inProgressPlugins.size === 1) {
-            return `Creating project graph dependencies with ${inProgressPlugins.keys()[0]}`;
+            spinner.setMessage(`Creating project graph dependencies with ${inProgressPlugins.values().next().value}`);
         }
         else if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            return [
+            spinner.setMessage([
                 `Creating project graph dependencies with ${inProgressPlugins.size} plugins`,
                 ...Array.from(inProgressPlugins).map((p) => `  - ${p}`),
-            ].join('\n');
+            ].join('\n'));
         }
         else {
-            return `Creating project graph dependencies with ${inProgressPlugins.size} plugins`;
+            spinner.setMessage(`Creating project graph dependencies with ${inProgressPlugins.size} plugins`);
         }
     }
-    if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
-        spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph dependencies with ${plugins.length} plugins`);
-    }
+    spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph dependencies with ${plugins.length} plugins`);
     await Promise.all(createDependencyPlugins.map(async (plugin) => {
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
         inProgressPlugins.add(plugin.name);
@@ -265,25 +263,23 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
     let spinner;
     const inProgressPlugins = new Set();
     function updateSpinner() {
-        if (!spinner) {
+        if (!spinner || inProgressPlugins.size === 0) {
             return;
         }
         if (inProgressPlugins.size === 1) {
-            return `Creating project metadata with ${inProgressPlugins.keys()[0]}`;
+            spinner.setMessage(`Creating project metadata with ${inProgressPlugins.values().next().value}`);
         }
         else if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            return [
+            spinner.setMessage([
                 `Creating project metadata with ${inProgressPlugins.size} plugins`,
                 ...Array.from(inProgressPlugins).map((p) => `  - ${p}`),
-            ].join('\n');
+            ].join('\n'));
         }
         else {
-            return `Creating project metadata with ${inProgressPlugins.size} plugins`;
+            spinner.setMessage(`Creating project metadata with ${inProgressPlugins.size} plugins`);
         }
     }
-    if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
-        spinner = new delayed_spinner_1.DelayedSpinner(`Creating project metadata with ${plugins.length} plugins`);
-    }
+    spinner = new delayed_spinner_1.DelayedSpinner(`Creating project metadata with ${plugins.length} plugins`);
     const promises = plugins.map(async (plugin) => {
         if (plugin.createMetadata) {
             perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - start`);

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

@@ -228,25 +228,23 @@ plugins) {
     let spinner;
     const inProgressPlugins = new Set();
     function updateSpinner() {
-        if (!spinner) {
+        if (!spinner || inProgressPlugins.size === 0) {
             return;
         }
         if (inProgressPlugins.size === 1) {
-            return `Creating project graph nodes with ${inProgressPlugins.keys()[0]}`;
+            spinner.setMessage(`Creating project graph nodes with ${inProgressPlugins.values().next().value}`);
         }
         else if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            return [
+            spinner.setMessage([
                 `Creating project graph nodes with ${inProgressPlugins.size} plugins`,
                 ...Array.from(inProgressPlugins).map((p) => `  - ${p}`),
-            ].join('\n');
+            ].join('\n'));
         }
         else {
-            return `Creating project graph nodes with ${inProgressPlugins.size} plugins`;
+            spinner.setMessage(`Creating project graph nodes with ${inProgressPlugins.size} plugins`);
         }
     }
-    if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
-        spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph nodes with ${plugins.length} plugins`);
-    }
+    spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph nodes with ${plugins.length} plugins`);
     const results = [];
     const errors = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.

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

@@ -1,4 +1,8 @@
 import * as ora from 'ora';
+export type DelayedSpinnerOptions = {
+    delay?: number;
+    ciDelay?: number;
+};
 /**
  * A class that allows to delay the creation of a spinner, as well
  * as schedule updates to the message of the spinner. Useful for
@@ -8,14 +12,14 @@ import * as ora from 'ora';
 export declare class DelayedSpinner {
     spinner: ora.Ora;
     timeouts: NodeJS.Timeout[];
-    initial: number;
+    private lastMessage;
+    private ready;
     /**
      * Constructs a new {@link DelayedSpinner} instance.
      *
-     * @param message The message to display in the spinner
-     * @param ms The number of milliseconds to wait before creating the spinner
+     * @param opts The options for the spinner
      */
-    constructor(message: string, ms?: number);
+    constructor(message: string, opts?: DelayedSpinnerOptions);
     /**
      * Sets the message to display in the spinner.
      *
@@ -27,14 +31,12 @@ export declare class DelayedSpinner {
      * Schedules an update to the message of the spinner. Useful for
      * changing the message after a certain amount of time has passed.
      *
-     * @param message The message to display in the spinner
-     * @param delay How long to wait before updating the message
+     * @param opts The options for the update
      * @returns The {@link DelayedSpinner} instance
      */
-    scheduleMessageUpdate(message: string, delay: number): this;
+    scheduleMessageUpdate(message: string, opts?: DelayedSpinnerOptions): this;
     /**
      * Stops the spinner and cleans up any scheduled timeouts.
      */
     cleanup(): void;
 }
-export declare const SHOULD_SHOW_SPINNERS: boolean;

package/src/utils/delayed-spinner.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SHOULD_SHOW_SPINNERS = exports.DelayedSpinner = void 0;
+exports.DelayedSpinner = void 0;
 const ora = require("ora");
+const is_ci_1 = require("./is-ci");
 /**
  * A class that allows to delay the creation of a spinner, as well
  * as schedule updates to the message of the spinner. Useful for
@@ -12,15 +13,22 @@ class DelayedSpinner {
     /**
      * Constructs a new {@link DelayedSpinner} instance.
      *
-     * @param message The message to display in the spinner
-     * @param ms The number of milliseconds to wait before creating the spinner
+     * @param opts The options for the spinner
      */
-    constructor(message, ms = 500) {
+    constructor(message, opts) {
         this.timeouts = [];
-        this.initial = Date.now();
+        opts = normalizeDelayedSpinnerOpts(opts);
+        const delay = SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay;
         this.timeouts.push(setTimeout(() => {
-            this.spinner = ora(message);
-        }, ms).unref());
+            this.ready = true;
+            if (!SHOULD_SHOW_SPINNERS) {
+                console.warn(this.lastMessage);
+            }
+            else {
+                this.spinner = ora(this.lastMessage).start();
+            }
+            this.lastMessage = message;
+        }, delay).unref());
     }
     /**
      * Sets the message to display in the spinner.
@@ -29,21 +37,29 @@ class DelayedSpinner {
      * @returns The {@link DelayedSpinner} instance
      */
     setMessage(message) {
-        this.spinner.text = message;
+        if (SHOULD_SHOW_SPINNERS) {
+            if (this.spinner) {
+                this.spinner.text = message;
+            }
+        }
+        else if (this.ready && this.lastMessage && this.lastMessage !== message) {
+            console.warn(message);
+        }
+        this.lastMessage = message;
         return this;
     }
     /**
      * Schedules an update to the message of the spinner. Useful for
      * changing the message after a certain amount of time has passed.
      *
-     * @param message The message to display in the spinner
-     * @param delay How long to wait before updating the message
+     * @param opts The options for the update
      * @returns The {@link DelayedSpinner} instance
      */
-    scheduleMessageUpdate(message, delay) {
+    scheduleMessageUpdate(message, opts) {
+        opts = normalizeDelayedSpinnerOpts(opts);
         this.timeouts.push(setTimeout(() => {
-            this.spinner.text = message;
-        }, delay).unref());
+            this.setMessage(message);
+        }, SHOULD_SHOW_SPINNERS ? opts.delay : opts.ciDelay).unref());
         return this;
     }
     /**
@@ -55,4 +71,10 @@ class DelayedSpinner {
     }
 }
 exports.DelayedSpinner = DelayedSpinner;
-exports.SHOULD_SHOW_SPINNERS = process.stdout.isTTY;
+const SHOULD_SHOW_SPINNERS = process.stdout.isTTY && !(0, is_ci_1.isCI)();
+function normalizeDelayedSpinnerOpts(opts) {
+    opts ??= {};
+    opts.delay ??= 500;
+    opts.ciDelay ??= 30_000;
+    return opts;
+}