nx 18.0.3 → 18.0.5

package/src/tasks-runner/life-cycles/view-logs-utils.js

@@ -7,7 +7,7 @@ const output_1 = require("../../utils/output");
 const VIEW_LOGS_MESSAGE = `Hint: Try "nx view-logs" to get structured, searchable errors logs in your browser.`;
 function viewLogsFooterRows(failedTasks) {
     if (failedTasks >= 2 && !(0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
-        return [``, output_1.output.dim(`${output_1.output.X_PADDING} ${VIEW_LOGS_MESSAGE}`)];
+        return [``, output_1.output.dim(` ${VIEW_LOGS_MESSAGE}`)];
     }
     else {
         return [];

package/src/tasks-runner/task-orchestrator.js

@@ -9,6 +9,7 @@ const utils_1 = require("./utils");
 const tasks_schedule_1 = require("./tasks-schedule");
 const hash_task_1 = require("../hasher/hash-task");
 const task_env_1 = require("./task-env");
+const os = require("os");
 class TaskOrchestrator {
     // endregion internal state
     constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon) {
@@ -216,8 +217,10 @@ class TaskOrchestrator {
     }
     async runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput) {
         try {
+            let usePtyFork = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
+                supportedPtyPlatform();
             // execution
-            const { code, terminalOutput } = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false'
+            const { code, terminalOutput } = usePtyFork
                 ? await this.forkedProcessTaskRunner.forkProcess(task, {
                     temporaryOutputPath,
                     streamOutput,
@@ -373,3 +376,22 @@ class TaskOrchestrator {
     }
 }
 exports.TaskOrchestrator = TaskOrchestrator;
+function supportedPtyPlatform() {
+    if (process.platform !== 'win32') {
+        return true;
+    }
+    let windowsVersion = os.release().split('.');
+    let windowsBuild = windowsVersion[2];
+    if (!windowsBuild) {
+        return false;
+    }
+    // Mininum supported Windows version:
+    // https://en.wikipedia.org/wiki/Windows_10,_version_1809
+    // https://learn.microsoft.com/en-us/windows/console/createpseudoconsole#requirements
+    if (+windowsBuild < 17763) {
+        return false;
+    }
+    else {
+        return true;
+    }
+}

package/src/utils/json.js

@@ -15,7 +15,9 @@ const code_frames_1 = require("./code-frames");
  */
 function parseJson(input, options) {
     try {
-        return JSON.parse(input);
+        if (options?.expectComments !== true) {
+            return JSON.parse(input);
+        }
     }
     catch { }
     options = { allowTrailingComma: true, ...options };

package/src/utils/logger.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripIndent = exports.logger = exports.NX_ERROR = exports.NX_PREFIX = void 0;
 const chalk = require("chalk");
-exports.NX_PREFIX = `${chalk.cyan('>')} ${chalk.inverse(chalk.bold(chalk.cyan(' NX ')))}`;
+exports.NX_PREFIX = chalk.inverse(chalk.bold(chalk.cyan(' NX ')));
 exports.NX_ERROR = chalk.inverse(chalk.bold(chalk.red(' ERROR ')));
 exports.logger = {
     warn: (s) => console.warn(chalk.bold(chalk.yellow(s))),

package/src/utils/output.d.ts

@@ -19,7 +19,6 @@ export interface CLISuccessMessageConfig {
     bodyLines?: string[];
 }
 declare class CLIOutput {
-    readonly X_PADDING = " ";
     cliName: string;
     formatCommand: (taskId: string) => string;
     /**

package/src/utils/output.js

@@ -16,7 +16,6 @@ if ((0, is_ci_1.isCI)() && !forceColor) {
 }
 class CLIOutput {
     constructor() {
-        this.X_PADDING = ' ';
         this.cliName = 'NX';
         this.formatCommand = (taskId) => `${chalk.dim('nx run')} ${taskId}`;
         /**
@@ -41,7 +40,7 @@ class CLIOutput {
      */
     get VERTICAL_SEPARATOR() {
         let divider = '';
-        for (let i = 0; i < process.stdout.columns - this.X_PADDING.length * 2; i++) {
+        for (let i = 0; i < process.stdout.columns - 1; i++) {
             divider += '\u2014';
         }
         return divider;
@@ -58,22 +57,22 @@ class CLIOutput {
         process.stdout.write(os_1.EOL);
     }
     writeOutputTitle({ color, title, }) {
-        this.writeToStdOut(` ${this.applyNxPrefix(color, title)}${os_1.EOL}`);
+        this.writeToStdOut(`${this.applyNxPrefix(color, title)}${os_1.EOL}`);
     }
     writeOptionalOutputBody(bodyLines) {
         if (!bodyLines) {
             return;
         }
         this.addNewline();
-        bodyLines.forEach((bodyLine) => this.writeToStdOut(`   ${bodyLine}${os_1.EOL}`));
+        bodyLines.forEach((bodyLine) => this.writeToStdOut(`${bodyLine}${os_1.EOL}`));
     }
     applyNxPrefix(color = 'cyan', text) {
         let nxPrefix = '';
         if (chalk[color]) {
-            nxPrefix = `${chalk[color]('>')} ${chalk.reset.inverse.bold[color](` ${this.cliName} `)}`;
+            nxPrefix = chalk.reset.inverse.bold[color](` ${this.cliName} `);
         }
         else {
-            nxPrefix = `${chalk.keyword(color)('>')} ${chalk.reset.inverse.bold.keyword(color)(` ${this.cliName} `)}`;
+            nxPrefix = chalk.reset.inverse.bold.keyword(color)(` ${this.cliName} `);
         }
         return `${nxPrefix}  ${text}`;
     }
@@ -92,7 +91,7 @@ class CLIOutput {
         return ['', this.getVerticalSeparator(color), ''];
     }
     getVerticalSeparator(color) {
-        return `${this.X_PADDING}${chalk.dim[color](this.VERTICAL_SEPARATOR)}`;
+        return chalk.dim[color](this.VERTICAL_SEPARATOR);
     }
     error({ title, slug, bodyLines }) {
         this.addNewline();

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

@@ -64,7 +64,7 @@ export declare function normalizePackageGroup(packageGroup: PackageGroup): Array
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
     packageGroup?: ArrayPackageGroup;
 };
-export declare function buildTargetFromScript(script: string, nx: NxProjectPackageJsonConfiguration): TargetConfiguration;
+export declare function buildTargetFromScript(script: string): TargetConfiguration;
 export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.

package/src/utils/package-json.js

@@ -5,6 +5,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
+const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
@@ -37,32 +38,32 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script, nx) {
-    const nxTargetConfiguration = nx?.targets?.[script] || {};
+function buildTargetFromScript(script) {
     return {
-        ...nxTargetConfiguration,
         executor: 'nx:run-script',
         options: {
-            ...(nxTargetConfiguration.options || {}),
             script,
         },
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
 function readTargetsFromPackageJson(packageJson) {
-    const { scripts, nx } = packageJson;
+    const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
-    Object.keys(scripts || {}).forEach((script) => {
-        if (!nx?.includedScripts || nx?.includedScripts.includes(script)) {
-            res[script] = buildTargetFromScript(script, nx);
-        }
-    });
+    const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
+    //
+    for (const script of includedScripts) {
+        res[script] = buildTargetFromScript(script);
+    }
+    for (const targetName in nx?.targets) {
+        res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);
+    }
     /**
      * Add implicit nx-release-publish target for all package.json files that are
      * not marked as `"private": true` to allow for lightweight configuration for
      * package based repos.
      */
-    if (!packageJson.private && !res['nx-release-publish']) {
+    if (!isPrivate && !res['nx-release-publish']) {
         res['nx-release-publish'] = {
             dependsOn: ['^nx-release-publish'],
             executor: '@nx/js:release-publish',

package/src/utils/plugins/core-plugins.js

@@ -53,6 +53,10 @@ function fetchCorePlugins() {
             name: '@nx/node',
             capabilities: 'executors,generators',
         },
+        {
+            name: '@nx/nuxt',
+            capabilities: 'generators',
+        },
         {
             name: 'nx',
             capabilities: 'executors',