nx 22.7.1 → 22.7.3

package/dist/src/utils/logger.js

@@ -1,47 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.NX_ERROR = exports.NX_PREFIX = void 0;
+exports.createLogger = createLogger;
 exports.stripIndent = stripIndent;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
+const is_on_daemon_1 = require("../daemon/is-on-daemon");
+const logger_1 = require("../daemon/logger");
 exports.NX_PREFIX = pc.inverse(pc.bold(pc.cyan(' NX ')));
 exports.NX_ERROR = pc.inverse(pc.bold(pc.red(' ERROR ')));
-exports.logger = {
-    warn: (s) => console.warn(pc.bold(pc.yellow(s))),
-    error: (s) => {
-        if (typeof s === 'string' && s.startsWith('NX ')) {
-            console.error(`\n${exports.NX_ERROR} ${pc.bold(pc.red(s.slice(3)))}\n`);
-        }
-        else if (s instanceof Error && s.stack) {
-            console.error(pc.bold(pc.red(s.stack)));
-        }
-        else {
-            console.error(pc.bold(pc.red(s)));
-        }
-    },
-    info: (s) => {
-        if (typeof s === 'string' && s.startsWith('NX ')) {
-            console.info(`\n${exports.NX_PREFIX} ${pc.bold(s.slice(3))}\n`);
-        }
-        else {
-            console.info(s);
-        }
-    },
-    log: (...s) => {
-        console.log(...s);
-    },
-    debug: (...s) => {
-        console.debug(...s);
-    },
-    fatal: (...s) => {
-        console.error(...s);
-    },
-    verbose: (...s) => {
-        if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            console.log(...s);
-        }
-    },
-};
+function createLogger(driver) {
+    return {
+        warn: (...v) => driver.warn(...v.map((s) => pc.bold(pc.yellow(s)))),
+        error: (s) => {
+            if (typeof s === 'string' && s.startsWith('NX ')) {
+                driver.error(`\n${exports.NX_ERROR} ${pc.bold(pc.red(s.slice(3)))}\n`);
+            }
+            else if (s instanceof Error && s.stack) {
+                driver.error(pc.bold(pc.red(s.stack)));
+            }
+            else {
+                driver.error(pc.bold(pc.red(s)));
+            }
+        },
+        info: (s) => {
+            if (typeof s === 'string' && s.startsWith('NX ')) {
+                driver.info(`\n${exports.NX_PREFIX} ${pc.bold(s.slice(3))}\n`);
+            }
+            else {
+                driver.info(s);
+            }
+        },
+        log: (...s) => {
+            driver.log(...s);
+        },
+        debug: (...s) => {
+            driver.debug(...s);
+        },
+        fatal: (...s) => {
+            driver.error(...s);
+        },
+        verbose: (...s) => {
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                // verbose logs go to stderr to prevent things like `nx show projects | grep`
+                // breaking when you enable verbose logging. The only potential breakage from
+                // this would be if a tool counts any output on stderr as being an issue, but
+                // there are likely other places that would trigger those same issues.
+                driver.warn(...s);
+            }
+        },
+    };
+}
+exports.logger = createLogger((0, is_on_daemon_1.isOnDaemon)()
+    ? (() => {
+        const log = logger_1.serverLogger.log.bind(logger_1.serverLogger);
+        return {
+            warn: log,
+            error: log,
+            debug: log,
+            info: log,
+            log: log,
+        };
+    })()
+    : console);
 function stripIndent(str) {
     const match = str.match(/^[ \t]*(?=\S)/gm);
     if (!match) {

package/dist/src/utils/nx-key.d.ts

@@ -1,6 +1,5 @@
 import type { NxKey } from '@nx/key';
 export declare function createNxKeyLicenseeInformation(nxKey: NxKey): string;
-export declare function printNxKey(): Promise<void>;
 export declare function getNxKeyInformation(): Promise<NxKey | null>;
 export declare class NxKeyNotInstalledError extends Error {
     constructor(e: Error);

package/dist/src/utils/nx-key.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NxKeyNotInstalledError = void 0;
 exports.createNxKeyLicenseeInformation = createNxKeyLicenseeInformation;
-exports.printNxKey = printNxKey;
 exports.getNxKeyInformation = getNxKeyInformation;
-const logger_1 = require("./logger");
+const installation_directory_1 = require("./installation-directory");
 const package_manager_1 = require("./package-manager");
 const workspace_root_1 = require("./workspace-root");
-const handle_import_1 = require("./handle-import");
 function createNxKeyLicenseeInformation(nxKey) {
     if ('isPowerpack' in nxKey && nxKey.isPowerpack) {
         return `Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${nxKey.seatCount > 1 ? 's' : ''} in ${nxKey.workspaceCount === 9999
@@ -18,32 +16,31 @@ function createNxKeyLicenseeInformation(nxKey) {
         return `Licensed to ${nxKey.organizationName}.`;
     }
 }
-async function printNxKey() {
+// `await handleImport` walks node_modules and pays ~25ms per miss; `resolve`
+// is just the filesystem lookup and is microseconds when the package is absent.
+// Only treat MODULE_NOT_FOUND as "not installed" so unrelated errors (permission,
+// corrupt package.json, etc.) still surface instead of being silently hidden.
+function packageInstalled(name) {
     try {
-        const key = await getNxKeyInformation();
-        if (key) {
-            logger_1.logger.log(createNxKeyLicenseeInformation(key));
-        }
+        require.resolve(name, { paths: (0, installation_directory_1.getNxRequirePaths)() });
+        return true;
+    }
+    catch (e) {
+        if (e?.code === 'MODULE_NOT_FOUND')
+            return false;
+        throw e;
     }
-    catch { }
 }
 async function getNxKeyInformation() {
-    try {
-        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = (await (0, handle_import_1.handleImport)('@nx/powerpack-license'));
-        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
+    if (packageInstalled('@nx/key')) {
+        const { getNxKeyInformationAsync } = await import('@nx/key');
+        return getNxKeyInformationAsync(workspace_root_1.workspaceRoot);
     }
-    catch (e) {
-        try {
-            const { getNxKeyInformationAsync } = (await (0, handle_import_1.handleImport)('@nx/key'));
-            return getNxKeyInformationAsync(workspace_root_1.workspaceRoot);
-        }
-        catch (e) {
-            if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
-                throw new NxKeyNotInstalledError(e);
-            }
-            throw e;
-        }
+    if (packageInstalled('@nx/powerpack-license')) {
+        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = await import('@nx/powerpack-license');
+        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
     }
+    throw new NxKeyNotInstalledError(new Error('MODULE_NOT_FOUND'));
 }
 class NxKeyNotInstalledError extends Error {
     constructor(e) {

package/dist/src/utils/output.d.ts

@@ -1,3 +1,4 @@
+import { WriteStream } from 'tty';
 import type { TaskStatus } from '../tasks-runner/tasks-runner';
 export interface CLIErrorMessageConfig {
     title: string;
@@ -47,12 +48,12 @@ declare class CLIOutput {
     bold: import("picocolors/types").Formatter;
     underline: import("picocolors/types").Formatter;
     dim: import("picocolors/types").Formatter;
-    private writeToStdOut;
+    private writeToStream;
     overwriteLine(lineText?: string): void;
     private writeOutputTitle;
     private writeOptionalOutputBody;
     applyNxPrefix(color: string, text: string): string;
-    addNewline(): void;
+    addNewline(stream?: WriteStream): void;
     addVerticalSeparator(color?: string): void;
     addVerticalSeparatorWithoutNewLines(color?: string): void;
     getVerticalSeparatorLines(color?: string): string[];

package/dist/src/utils/output.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.output = void 0;
 exports.orange = orange;
 const tslib_1 = require("tslib");
-const pc = tslib_1.__importStar(require("picocolors"));
 const os_1 = require("os");
+const pc = tslib_1.__importStar(require("picocolors"));
 const readline = tslib_1.__importStar(require("readline"));
 const GH_GROUP_PREFIX = '::group::';
 const GH_GROUP_SUFFIX = '::endgroup::';
@@ -62,8 +62,8 @@ class CLIOutput {
         }
         return divider;
     }
-    writeToStdOut(str) {
-        process.stdout.write(str);
+    writeToStream(str, stream = process.stdout) {
+        stream.write(str);
     }
     overwriteLine(lineText = '') {
         // Ensure we always start writing from column 0.
@@ -78,23 +78,23 @@ class CLIOutput {
         process.stdout.write('\n');
         readline.cursorTo(process.stdout, 0);
     }
-    writeOutputTitle({ color, title, }) {
-        this.writeToStdOut(`${this.applyNxPrefix(color, title)}${os_1.EOL}`);
+    writeOutputTitle({ color, title, }, stream = process.stdout) {
+        this.writeToStream(`${this.applyNxPrefix(color, title)}${os_1.EOL}`, stream);
     }
-    writeOptionalOutputBody(bodyLines) {
+    writeOptionalOutputBody(bodyLines, stream = process.stdout) {
         if (!bodyLines) {
             return;
         }
-        this.addNewline();
-        bodyLines.forEach((bodyLine) => this.writeToStdOut(`${bodyLine}${os_1.EOL}`));
+        this.addNewline(stream);
+        bodyLines.forEach((bodyLine) => this.writeToStream(`${bodyLine}${os_1.EOL}`, stream));
     }
     applyNxPrefix(color = 'cyan', text) {
         const colorFn = pcColors[color] || ((t) => t);
         const nxPrefix = pc.inverse(pc.bold(colorFn(` ${this.cliName} `)));
         return `${nxPrefix}  ${text}`;
     }
-    addNewline() {
-        this.writeToStdOut(os_1.EOL);
+    addNewline(stream = process.stdout) {
+        this.writeToStream(os_1.EOL, stream);
     }
     addVerticalSeparator(color = 'gray') {
         this.addNewline();
@@ -102,7 +102,7 @@ class CLIOutput {
         this.addNewline();
     }
     addVerticalSeparatorWithoutNewLines(color = 'gray') {
-        this.writeToStdOut(`${this.getVerticalSeparator(color)}${os_1.EOL}`);
+        this.writeToStream(`${this.getVerticalSeparator(color)}${os_1.EOL}`);
     }
     getVerticalSeparatorLines(color = 'gray') {
         return ['', this.getVerticalSeparator(color), ''];
@@ -112,36 +112,37 @@ class CLIOutput {
         return pc.dim(colorFn(this.VERTICAL_SEPARATOR));
     }
     error({ title, slug, bodyLines }) {
-        this.addNewline();
+        const stream = process.stderr;
+        this.addNewline(stream);
         this.writeOutputTitle({
             color: 'red',
             title: pc.red(title),
-        });
-        this.writeOptionalOutputBody(bodyLines);
+        }, stream);
+        this.writeOptionalOutputBody(bodyLines, stream);
         /**
          * Optional slug to be used in an Nx error message redirect URL
          */
         if (slug && typeof slug === 'string') {
-            this.addNewline();
-            this.writeToStdOut(`${pc.gray('  Learn more about this error: ')}https://errors.nx.dev/${slug}${os_1.EOL}`);
+            this.addNewline(stream);
+            this.writeToStream(`${pc.gray('  Learn more about this error: ')}https://errors.nx.dev/${slug}${os_1.EOL}`, stream);
         }
-        this.addNewline();
+        this.addNewline(stream);
     }
     warn({ title, slug, bodyLines }) {
-        this.addNewline();
+        this.addNewline(process.stderr);
         this.writeOutputTitle({
             color: 'yellow',
             title: pc.yellow(title),
-        });
-        this.writeOptionalOutputBody(bodyLines);
+        }, process.stderr);
+        this.writeOptionalOutputBody(bodyLines, process.stderr);
         /**
          * Optional slug to be used in an Nx warning message redirect URL
          */
         if (slug && typeof slug === 'string') {
-            this.addNewline();
-            this.writeToStdOut(`${pc.gray('  Learn more about this warning: ')}https://errors.nx.dev/${slug}${os_1.EOL}`);
+            this.addNewline(process.stderr);
+            this.writeToStream(`${pc.gray('  Learn more about this warning: ')}https://errors.nx.dev/${slug}${os_1.EOL}`, process.stderr);
         }
-        this.addNewline();
+        this.addNewline(process.stderr);
     }
     note({ title, bodyLines }) {
         this.addNewline();
@@ -170,12 +171,12 @@ class CLIOutput {
         this.addNewline();
     }
     logRawLine(message) {
-        this.writeToStdOut(`${message}${os_1.EOL}`);
+        this.writeToStream(`${message}${os_1.EOL}`);
         this.addNewline();
     }
     logCommand(message, taskStatus) {
         this.addNewline();
-        this.writeToStdOut(this.getCommandWithStatus(message, taskStatus));
+        this.writeToStream(this.getCommandWithStatus(message, taskStatus));
         this.addNewline();
         this.addNewline();
     }
@@ -187,13 +188,13 @@ class CLIOutput {
             commandOutputWithStatus = `${GH_GROUP_PREFIX}${icon} ${commandOutputWithStatus}`;
         }
         this.addNewline();
-        this.writeToStdOut(commandOutputWithStatus);
+        this.writeToStream(commandOutputWithStatus);
         this.addNewline();
         this.addNewline();
-        this.writeToStdOut(output);
+        this.writeToStream(output);
         if (process.env.NX_SKIP_LOG_GROUPING !== 'true' &&
             process.env.GITHUB_ACTIONS) {
-            this.writeToStdOut(GH_GROUP_SUFFIX);
+            this.writeToStream(GH_GROUP_SUFFIX);
         }
     }
     getCommandWithStatus(message, taskStatus) {

package/dist/src/utils/package-json.js

@@ -21,6 +21,7 @@ const json_1 = require("../generators/utils/json");
 const target_merging_1 = require("../project-graph/utils/project-configuration/target-merging");
 const catalog_1 = require("./catalog");
 const fileutils_1 = require("./fileutils");
+const has_nx_js_plugin_1 = require("./has-nx-js-plugin");
 const installation_directory_1 = require("./installation-directory");
 const package_manager_1 = require("./package-manager");
 const workspace_root_1 = require("./workspace-root");
@@ -124,7 +125,7 @@ function readTargetsFromPackageJson(packageJson, nxJson, projectRoot, workspaceR
      */
     if (!isPrivate &&
         !res['nx-release-publish'] &&
-        hasNxJsPlugin(projectRoot, workspaceRoot)) {
+        (0, has_nx_js_plugin_1.hasNxJsPlugin)(projectRoot, workspaceRoot)) {
         const nxReleasePublishTargetDefaults = nxJson?.targetDefaults?.['nx-release-publish'] ?? {};
         res['nx-release-publish'] = {
             executor: '@nx/js:release-publish',
@@ -141,18 +142,6 @@ function readTargetsFromPackageJson(packageJson, nxJson, projectRoot, workspaceR
     }
     return res;
 }
-function hasNxJsPlugin(projectRoot, workspaceRoot) {
-    try {
-        // nx-ignore-next-line
-        require.resolve('@nx/js/package.json', {
-            paths: [projectRoot, ...(0, installation_directory_1.getNxRequirePaths)(workspaceRoot), __dirname],
-        });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *

package/dist/src/utils/perf-logging.js

@@ -7,6 +7,7 @@ function isTrackedDetail(detail) {
         detail.track === true);
 }
 new perf_hooks_1.PerformanceObserver((list) => {
+    // observer is configured for 'measure' entries only (see .observe call below)
     const entries = list.getEntries();
     const logEnabled = process.env.NX_PERF_LOGGING === 'true';
     const tracked = entries.filter((e) => isTrackedDetail(e.detail));
@@ -17,9 +18,10 @@ new perf_hooks_1.PerformanceObserver((list) => {
     if (logEnabled) {
         const { isOnDaemon } = require('../daemon/is-on-daemon');
         const { serverLogger } = require('../daemon/logger');
+        const { logger } = require('./logger');
         const log = isOnDaemon()
             ? (msg) => serverLogger.log(msg)
-            : console.log;
+            : (msg) => logger.warn(msg);
         for (const entry of entries) {
             log(`Time taken for '${entry.name}' ${entry.duration}ms`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.1",
+  "version": "22.7.3",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -60,11 +60,11 @@
     "ansi-styles": "4.3.0",
     "argparse": "2.0.1",
     "asynckit": "0.4.0",
-    "axios": "1.15.0",
+    "axios": "1.16.0",
     "balanced-match": "4.0.3",
     "base64-js": "1.5.1",
     "bl": "4.1.0",
-    "brace-expansion": "5.0.2",
+    "brace-expansion": "5.0.5",
     "buffer": "5.7.1",
     "call-bind-apply-helpers": "1.0.2",
     "chalk": "4.1.2",
@@ -93,7 +93,7 @@
     "escape-string-regexp": "1.0.5",
     "figures": "3.2.0",
     "flat": "5.0.2",
-    "follow-redirects": "1.15.11",
+    "follow-redirects": "1.16.0",
     "form-data": "4.0.5",
     "fs-constants": "1.0.0",
     "function-bind": "1.1.2",
@@ -121,7 +121,7 @@
     "mime-db": "1.52.0",
     "mime-types": "2.1.35",
     "mimic-fn": "2.1.0",
-    "minimatch": "10.2.4",
+    "minimatch": "10.2.5",
     "minimist": "1.2.8",
     "npm-run-path": "4.0.1",
     "once": "1.4.0",
@@ -171,16 +171,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.7.1",
-    "@nx/nx-darwin-x64": "22.7.1",
-    "@nx/nx-freebsd-x64": "22.7.1",
-    "@nx/nx-linux-arm-gnueabihf": "22.7.1",
-    "@nx/nx-linux-arm64-gnu": "22.7.1",
-    "@nx/nx-linux-arm64-musl": "22.7.1",
-    "@nx/nx-linux-x64-gnu": "22.7.1",
-    "@nx/nx-linux-x64-musl": "22.7.1",
-    "@nx/nx-win32-arm64-msvc": "22.7.1",
-    "@nx/nx-win32-x64-msvc": "22.7.1"
+    "@nx/nx-darwin-arm64": "22.7.3",
+    "@nx/nx-darwin-x64": "22.7.3",
+    "@nx/nx-freebsd-x64": "22.7.3",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.3",
+    "@nx/nx-linux-arm64-gnu": "22.7.3",
+    "@nx/nx-linux-arm64-musl": "22.7.3",
+    "@nx/nx-linux-x64-gnu": "22.7.3",
+    "@nx/nx-linux-x64-musl": "22.7.3",
+    "@nx/nx-win32-arm64-msvc": "22.7.3",
+    "@nx/nx-win32-x64-msvc": "22.7.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -317,6 +317,9 @@
       "src/utils/catalog": [
         "dist/src/utils/catalog/index.d.ts"
       ],
+      "src/internal-testing-utils/*": [
+        "src/internal-testing-utils/*.ts"
+      ],
       "src/*.js": [
         "dist/src/*.d.ts"
       ],
@@ -485,6 +488,10 @@
       "@nx/nx-source": "./src/native/*.mjs",
       "default": "./dist/src/native/*.mjs"
     },
+    "./src/internal-testing-utils/*": {
+      "types": "./src/internal-testing-utils/*.ts",
+      "default": "./src/internal-testing-utils/*.ts"
+    },
     "./src/*.js": {
       "@nx/nx-source": "./src/*.ts",
       "types": "./dist/src/*.d.ts",