nx 22.0.0-beta.8 → 22.0.0-beta.9

package/src/devkit-internals.d.ts

@@ -28,4 +28,5 @@ export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
 export { readYamlFile } from './utils/fileutils';
+export { globalSpinner } from './utils/spinner';
 //# sourceMappingURL=devkit-internals.d.ts.map

package/src/devkit-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -61,3 +61,5 @@ var is_using_prettier_1 = require("./utils/is-using-prettier");
 Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
 var fileutils_1 = require("./utils/fileutils");
 Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });
+var spinner_1 = require("./utils/spinner");
+Object.defineProperty(exports, "globalSpinner", { enumerable: true, get: function () { return spinner_1.globalSpinner; } });

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();