nx 20.3.0-canary.20241213-0d6667d → 20.3.0-canary.20241217-ee4de0b

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

@@ -220,24 +220,46 @@ class ForkedProcessTaskRunner {
                     }
                 }
                 let outWithErr = [];
+                let exitCode;
+                let stdoutHasEnded = false;
+                let stderrHasEnded = false;
+                let processHasExited = false;
+                const handleProcessEnd = () => {
+                    // ensure process has exited and both stdout and stderr have ended before we pass along the logs
+                    // if we only wait for the process to exit, we might miss some logs as stdout and stderr might still be streaming
+                    if (stdoutHasEnded && stderrHasEnded && processHasExited) {
+                        // we didn't print any output as we were running the command
+                        // print all the collected output|
+                        const terminalOutput = outWithErr.join('');
+                        const code = exitCode;
+                        if (!streamOutput) {
+                            this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
+                        }
+                        this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
+                        res({ code, terminalOutput });
+                    }
+                };
                 p.stdout.on('data', (chunk) => {
                     outWithErr.push(chunk.toString());
                 });
+                p.stdout.on('end', () => {
+                    stdoutHasEnded = true;
+                    handleProcessEnd();
+                });
                 p.stderr.on('data', (chunk) => {
                     outWithErr.push(chunk.toString());
                 });
+                p.stderr.on('end', () => {
+                    stderrHasEnded = true;
+                    handleProcessEnd();
+                });
                 p.on('exit', (code, signal) => {
                     this.processes.delete(p);
                     if (code === null)
                         code = (0, exit_codes_1.signalToCode)(signal);
-                    // we didn't print any output as we were running the command
-                    // print all the collected output|
-                    const terminalOutput = outWithErr.join('');
-                    if (!streamOutput) {
-                        this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
-                    }
-                    this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
-                    res({ code, terminalOutput });
+                    exitCode = code;
+                    processHasExited = true;
+                    handleProcessEnd();
                 });
             }
             catch (e) {

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

@@ -0,0 +1,40 @@
+import * as ora from 'ora';
+/**
+ * A class that allows to delay the creation of a spinner, as well
+ * as schedule updates to the message of the spinner. Useful for
+ * scenarios where one wants to only show a spinner if an operation
+ * takes longer than a certain amount of time.
+ */
+export declare class DelayedSpinner {
+    spinner: ora.Ora;
+    timeouts: NodeJS.Timeout[];
+    initial: number;
+    /**
+     * 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
+     */
+    constructor(message: string, ms?: number);
+    /**
+     * Sets the message to display in the spinner.
+     *
+     * @param message The message to display in the spinner
+     * @returns The {@link DelayedSpinner} instance
+     */
+    setMessage(message: string): 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
+     * @returns The {@link DelayedSpinner} instance
+     */
+    scheduleMessageUpdate(message: string, delay: number): 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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SHOULD_SHOW_SPINNERS = exports.DelayedSpinner = void 0;
+const ora = require("ora");
+/**
+ * A class that allows to delay the creation of a spinner, as well
+ * as schedule updates to the message of the spinner. Useful for
+ * scenarios where one wants to only show a spinner if an operation
+ * takes longer than a certain amount of time.
+ */
+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
+     */
+    constructor(message, ms = 500) {
+        this.timeouts = [];
+        this.initial = Date.now();
+        this.timeouts.push(setTimeout(() => {
+            this.spinner = ora(message);
+        }, ms).unref());
+    }
+    /**
+     * Sets the message to display in the spinner.
+     *
+     * @param message The message to display in the spinner
+     * @returns The {@link DelayedSpinner} instance
+     */
+    setMessage(message) {
+        this.spinner.text = 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
+     * @returns The {@link DelayedSpinner} instance
+     */
+    scheduleMessageUpdate(message, delay) {
+        this.timeouts.push(setTimeout(() => {
+            this.spinner.text = message;
+        }, delay).unref());
+        return this;
+    }
+    /**
+     * Stops the spinner and cleans up any scheduled timeouts.
+     */
+    cleanup() {
+        this.spinner?.stop();
+        this.timeouts.forEach((t) => clearTimeout(t));
+    }
+}
+exports.DelayedSpinner = DelayedSpinner;
+exports.SHOULD_SHOW_SPINNERS = process.stdout.isTTY;

package/src/utils/package-json.d.ts

@@ -35,6 +35,7 @@ export interface PackageJson {
         types?: string;
         require?: string;
         import?: string;
+        development?: string;
     }>;
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;

package/src/utils/package-json.js

@@ -58,13 +58,17 @@ function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
 }
 let packageManagerCommand;
 function getMetadataFromPackageJson(packageJson) {
-    const { scripts, nx, description } = packageJson ?? {};
+    const { scripts, nx, description, name, exports } = packageJson;
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     return {
         targetGroups: {
             ...(includedScripts.length ? { 'NPM Scripts': includedScripts } : {}),
         },
         description,
+        js: {
+            packageName: name,
+            packageExports: exports,
+        },
     };
 }
 function getTagsFromPackageJson(packageJson) {

package/src/command-line/import/utils/needs-install.d.ts

@@ -1,3 +0,0 @@
-import { PackageManager } from '../../../utils/package-manager';
-export declare function getPackagesInPackageManagerWorkspace(packageManager: PackageManager): Promise<Set<string>>;
-export declare function needsInstall(packageManager: PackageManager, originalPackagesInPackageManagerWorkspaces: Set<string>): Promise<boolean>;

package/src/command-line/import/utils/needs-install.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackagesInPackageManagerWorkspace = getPackagesInPackageManagerWorkspace;
-exports.needsInstall = needsInstall;
-const package_manager_1 = require("../../../utils/package-manager");
-const workspace_root_1 = require("../../../utils/workspace-root");
-const package_json_1 = require("../../../plugins/package-json");
-const workspace_context_1 = require("../../../utils/workspace-context");
-async function getPackagesInPackageManagerWorkspace(packageManager) {
-    if (!(0, package_manager_1.isWorkspacesEnabled)(packageManager, workspace_root_1.workspaceRoot)) {
-        return new Set();
-    }
-    const patterns = (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(workspace_root_1.workspaceRoot);
-    return new Set(await (0, workspace_context_1.globWithWorkspaceContext)(workspace_root_1.workspaceRoot, patterns));
-}
-async function needsInstall(packageManager, originalPackagesInPackageManagerWorkspaces) {
-    if (!(0, package_manager_1.isWorkspacesEnabled)(packageManager, workspace_root_1.workspaceRoot)) {
-        return false;
-    }
-    const updatedPackagesInPackageManagerWorkspaces = await getPackagesInPackageManagerWorkspace(packageManager);
-    if (updatedPackagesInPackageManagerWorkspaces.size !==
-        originalPackagesInPackageManagerWorkspaces.size) {
-        return true;
-    }
-    for (const pkg of updatedPackagesInPackageManagerWorkspaces) {
-        if (!originalPackagesInPackageManagerWorkspaces.has(pkg)) {
-            return true;
-        }
-    }
-    return false;
-}