nx 18.0.4 → 18.0.5

package/src/core/graph/runtime.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={2:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=r,e=[],o.O=(r,t,n,i)=>{if(!t){var l=1/0;for(f=0;f<e.length;f++){for(var[t,n,i]=e[f],a=!0,u=0;u<t.length;u++)(!1&i||l>=i)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,i<l&&(l=i));if(a){e.splice(f--,1);var d=n();void 0!==d&&(r=d)}}return r}i=i||0;for(var f=e.length;f>0&&e[f-1][2]>i;f--)e[f]=e[f-1];e[f]=[t,n,i]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={666:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,i,[l,a,u]=t,d=0;if(l.some((r=>0!==e[r]))){for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o)}for(r&&r(t);d<l.length;d++)i=l[d],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

package/src/core/graph/styles.js

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

package/src/migrations/update-17-0-0/rm-default-collection-npm-scope.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const nx_json_1 = require("../../generators/utils/nx-json");
 const json_1 = require("../../generators/utils/json");
-const logger_1 = require("../../utils/logger");
+const output_1 = require("../../utils/output");
 const path_1 = require("../../utils/path");
 async function update(tree) {
     if (!tree.exists('nx.json')) {
@@ -37,7 +37,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     const packageJsonName = (0, json_1.readJson)(tree, 'package.json').name;
     if (newScope) {
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',
@@ -50,7 +50,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     else {
         // There is no scope in package.json
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',

package/src/plugins/js/utils/register.js

@@ -67,6 +67,7 @@ function getTranspiler(compilerOptions) {
     }
     compilerOptions.lib = ['es2021'];
     compilerOptions.module = ts.ModuleKind.CommonJS;
+    compilerOptions.moduleResolution = ts.ModuleResolutionKind.Node10;
     compilerOptions.target = ts.ScriptTarget.ES2021;
     compilerOptions.inlineSourceMap = true;
     compilerOptions.skipLibCheck = true;

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -1,6 +1,5 @@
-import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+import { TargetConfiguration } from '../../config/workspace-json-project-json';
 import { NxPluginV2 } from '../../utils/nx-plugin';
-import { PackageJson } from '../../utils/package-json';
 /**
  * This symbol marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
@@ -17,7 +16,7 @@ export declare const TargetDefaultsPlugin: NxPluginV2;
  * being scrapped. By adding enough information from the project.json / package.json,
  * we can make sure that the target after merging is compatible with the defined target.
  */
-export declare function getTargetInfo(target: string, projectJson: Pick<ProjectConfiguration, 'targets'>, packageJson: Pick<PackageJson, 'scripts' | 'nx'>): {
+export declare function getTargetInfo(target: string, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
     command: string;
     executor?: undefined;
     options?: undefined;

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -6,6 +6,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const fileutils_1 = require("../../utils/fileutils");
 const globs_1 = require("../../utils/globs");
+const package_json_1 = require("../../utils/package-json");
 const package_json_workspaces_1 = require("../package-json-workspaces");
 /**
  * This symbol marks that a target provides information which should modify a target already registered
@@ -37,18 +38,12 @@ exports.TargetDefaultsPlugin = {
             }
             const projectJson = readJsonOrNull((0, node_path_1.join)(ctx.workspaceRoot, root, 'project.json'));
             const packageJson = readJsonOrNull((0, node_path_1.join)(ctx.workspaceRoot, root, 'package.json'));
-            const includedScripts = packageJson?.nx?.includedScripts;
+            const packageJsonTargets = (0, package_json_1.readTargetsFromPackageJson)(packageJson);
             const projectDefinedTargets = new Set([
-                ...Object.keys(packageJson?.scripts ?? {}).filter((script) => {
-                    if (includedScripts) {
-                        return includedScripts.includes(script);
-                    }
-                    return true;
-                }),
                 ...Object.keys(projectJson?.targets ?? {}),
-                ...Object.keys(packageJson?.nx?.targets ?? {}),
+                ...(packageJson ? Object.keys(packageJsonTargets) : []),
             ]);
-            const executorToTargetMap = getExecutorToTargetMap(packageJson, projectJson);
+            const executorToTargetMap = getExecutorToTargetMap(packageJsonTargets, projectJson?.targets);
             const modifiedTargets = {};
             for (const defaultSpecifier in targetDefaults) {
                 const targetNames = executorToTargetMap.get(defaultSpecifier) ?? new Set();
@@ -59,7 +54,7 @@ exports.TargetDefaultsPlugin = {
                     if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
                         const defaults = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
                         modifiedTargets[targetName] = {
-                            ...getTargetInfo(targetName, projectJson, packageJson),
+                            ...getTargetInfo(targetName, projectJson?.targets, packageJsonTargets),
                             ...defaults,
                         };
                     }
@@ -80,17 +75,14 @@ exports.TargetDefaultsPlugin = {
         },
     ],
 };
-function getExecutorToTargetMap(packageJson, projectJson) {
+function getExecutorToTargetMap(packageJsonTargets, projectJsonTargets) {
     const executorToTargetMap = new Map();
     const targets = Object.keys({
-        ...projectJson?.targets,
-        ...packageJson?.scripts,
-        ...packageJson?.nx?.targets,
+        ...projectJsonTargets,
+        ...packageJsonTargets,
     });
     for (const target of targets) {
-        const executor = projectJson?.targets?.[target]?.executor ??
-            packageJson?.nx?.targets?.[target]?.executor ??
-            'nx:run-script';
+        const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
         const targetsForExecutor = executorToTargetMap.get(executor) ?? new Set();
         targetsForExecutor.add(target);
         executorToTargetMap.set(executor, targetsForExecutor);
@@ -114,10 +106,10 @@ function readJsonOrNull(path) {
  * being scrapped. By adding enough information from the project.json / package.json,
  * we can make sure that the target after merging is compatible with the defined target.
  */
-function getTargetInfo(target, projectJson, packageJson) {
-    const projectJsonTarget = projectJson?.targets?.[target];
-    const packageJsonTarget = packageJson?.nx?.targets?.[target];
-    const executor = getTargetExecutor(target, projectJson, packageJson);
+function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
+    const projectJsonTarget = projectJsonTargets?.[target];
+    const packageJsonTarget = packageJsonTargets?.[target];
+    const executor = getTargetExecutor(target, projectJsonTargets, packageJsonTargets);
     const targetOptions = {
         ...packageJsonTarget?.options,
         ...projectJsonTarget?.options,
@@ -162,17 +154,17 @@ function getTargetInfo(target, projectJson, packageJson) {
     return {};
 }
 exports.getTargetInfo = getTargetInfo;
-function getTargetExecutor(target, projectJson, packageJson) {
-    const projectJsonTarget = projectJson?.targets?.[target];
-    const packageJsonTarget = packageJson?.nx?.targets?.[target];
-    const packageJsonScript = packageJson?.scripts?.[target];
-    if (projectJsonTarget?.command) {
-        return 'nx:run-commands';
+function getTargetExecutor(target, projectJsonTargets, packageJsonTargets) {
+    const projectJsonTargetConfiguration = projectJsonTargets?.[target];
+    const packageJsonTargetConfiguration = packageJsonTargets?.[target];
+    if (!projectJsonTargetConfiguration && packageJsonTargetConfiguration) {
+        return packageJsonTargetConfiguration?.executor ?? 'nx:run-script';
     }
-    if (!projectJsonTarget?.executor &&
-        !packageJsonTarget?.executor &&
-        packageJsonScript) {
-        return 'nx:run-script';
+    if (projectJsonTargetConfiguration?.executor) {
+        return projectJsonTargetConfiguration.executor;
+    }
+    if (projectJsonTargetConfiguration?.command) {
+        return 'nx:run-commands';
     }
-    return projectJsonTarget?.executor ?? packageJsonTarget?.executor;
+    return null;
 }

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

@@ -108,13 +108,13 @@ skipCommandNormalization) {
                 !matchingProject.targets?.[targetName]) {
                 continue;
             }
+            const mergedTarget = mergeTargetConfigurations(skipCommandNormalization
+                ? target
+                : resolveCommandSyntacticSugar(target, project.root), matchingProject.targets?.[targetName], sourceMap, sourceInformation, `targets.${targetName}`);
             // We don't want the symbol to live on past the merge process
-            if (target?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET])
-                delete target?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET];
-            updatedProjectConfiguration.targets[targetName] =
-                mergeTargetConfigurations(skipCommandNormalization
-                    ? target
-                    : resolveCommandSyntacticSugar(target, project.root), matchingProject.targets?.[targetName], sourceMap, sourceInformation, `targets.${targetName}`);
+            if (mergedTarget?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET])
+                delete mergedTarget?.[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET];
+            updatedProjectConfiguration.targets[targetName] = mergedTarget;
         }
     }
     projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
@@ -288,6 +288,13 @@ function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, s
     // Target is "compatible", e.g. executor is defined only once or is the same
     // in both places. This means that it is likely safe to merge
     const isCompatible = isCompatibleTarget(baseTargetProperties, target);
+    // If the targets are not compatible, we would normally overwrite the old target
+    // with the new one. However, we have a special case for targets that have the
+    // ONLY_MODIFIES_EXISTING_TARGET symbol set. This prevents the merged target
+    // equaling info that should have only been used to modify the existing target.
+    if (!isCompatible && target[target_defaults_plugin_1.ONLY_MODIFIES_EXISTING_TARGET]) {
+        return baseTarget;
+    }
     if (!isCompatible && projectConfigSourceMap) {
         // if the target is not compatible, we will simply override the options
         // we have to delete old entries from the source map

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -9,6 +9,8 @@ const output_1 = require("../../utils/output");
 const pretty_time_1 = require("./pretty-time");
 const formatting_utils_1 = require("./formatting-utils");
 const view_logs_utils_1 = require("./view-logs-utils");
+const LEFT_PAD = `  `;
+const EXTENDED_LEFT_PAD = `    `;
 /**
  * The following function is responsible for creating a life cycle with dynamic
  * outputs, meaning previous outputs can be rewritten or modified as new outputs
@@ -74,7 +76,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
         // Create vertical breathing room for cursor position under the pinned footer
         lines.push('');
         for (const line of lines) {
-            output_1.output.overwriteLine(output_1.output.X_PADDING + line);
+            output_1.output.overwriteLine(line);
         }
         pinnedFooterNumLines = lines.length + additionalLines;
         // clear any possible text below the cursor's position
@@ -143,10 +145,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
         const runningTasks = taskRows.filter((row) => row.status === 'running');
         const remainingTasks = totalTasks - totalCompletedTasks;
         if (runningTasks.length > 0) {
-            additionalFooterRows.push(output_1.output.dim(`   ${output_1.output.colors.cyan(figures.arrowRight)}    Executing ${runningTasks.length}/${remainingTasks} remaining tasks${runningTasks.length > 1 ? ' in parallel' : ''}...`));
+            additionalFooterRows.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.colors.cyan(figures.arrowRight)}    Executing ${runningTasks.length}/${remainingTasks} remaining tasks${runningTasks.length > 1 ? ' in parallel' : ''}...`));
             additionalFooterRows.push('');
             for (const runningTask of runningTasks) {
-                additionalFooterRows.push(`   ${output_1.output.dim.cyan(cli_spinners_1.dots.frames[currentFrame])}    ${output_1.output.formatCommand(runningTask.task.id)}`);
+                additionalFooterRows.push(`${LEFT_PAD}${output_1.output.dim.cyan(cli_spinners_1.dots.frames[currentFrame])}    ${output_1.output.formatCommand(runningTask.task.id)}`);
             }
             /**
              * Reduce layout thrashing by ensuring that there is a relatively consistent
@@ -170,21 +172,20 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
             additionalFooterRows.push('');
         }
         if (totalSuccessfulTasks > 0) {
-            additionalFooterRows.push(`   ${output_1.output.colors.green(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
+            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
         }
         if (totalFailedTasks > 0) {
-            additionalFooterRows.push(`   ${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
+            additionalFooterRows.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
         }
         moveCursorToStartOfPinnedFooter();
         if (additionalFooterRows.length > 1) {
             const text = `Running ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
             const taskOverridesRows = [];
             if (Object.keys(overrides).length > 0) {
-                const leftPadding = `${output_1.output.X_PADDING}       `;
                 taskOverridesRows.push('');
-                taskOverridesRows.push(`${leftPadding}${output_1.output.dim.cyan('With additional flags:')}`);
+                taskOverridesRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.cyan('With additional flags:')}`);
                 Object.entries(overrides)
-                    .map(([flag, value]) => output_1.output.dim.cyan((0, formatting_utils_1.formatFlags)(leftPadding, flag, value)))
+                    .map(([flag, value]) => output_1.output.dim.cyan((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
                     .forEach((arg) => taskOverridesRows.push(arg));
             }
             const pinnedFooterLines = [
@@ -221,11 +222,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
             const taskOverridesRows = [];
             if (Object.keys(overrides).length > 0) {
-                const leftPadding = `${output_1.output.X_PADDING}       `;
                 taskOverridesRows.push('');
-                taskOverridesRows.push(`${leftPadding}${output_1.output.dim.green('With additional flags:')}`);
+                taskOverridesRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
                 Object.entries(overrides)
-                    .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(leftPadding, flag, value)))
+                    .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
                     .forEach((arg) => taskOverridesRows.push(arg));
             }
             const pinnedFooterLines = [
@@ -233,7 +233,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 ...taskOverridesRows,
             ];
             if (totalCachedTasks > 0) {
-                pinnedFooterLines.push(output_1.output.dim(`${os_1.EOL}   Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
+                pinnedFooterLines.push(output_1.output.dim(`${os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
             }
             renderPinnedFooter(pinnedFooterLines, 'green');
         }
@@ -241,11 +241,10 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
             const text = `Ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
             const taskOverridesRows = [];
             if (Object.keys(overrides).length > 0) {
-                const leftPadding = `${output_1.output.X_PADDING}       `;
                 taskOverridesRows.push('');
-                taskOverridesRows.push(`${leftPadding}${output_1.output.dim.red('With additional flags:')}`);
+                taskOverridesRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
                 Object.entries(overrides)
-                    .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(leftPadding, flag, value)))
+                    .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
                     .forEach((arg) => taskOverridesRows.push(arg));
             }
             const numFailedToPrint = 5;
@@ -254,15 +253,15 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
                 output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
                 ...taskOverridesRows,
                 '',
-                output_1.output.dim(`   ${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`),
+                output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`),
                 '',
-                `   ${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
+                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
                 `${failedTasksForPrinting
-                    .map((t) => `        ${output_1.output.colors.red('-')} ${output_1.output.formatCommand(t.toString())}`)
+                    .map((t) => `${EXTENDED_LEFT_PAD}${output_1.output.colors.red('-')} ${output_1.output.formatCommand(t.toString())}`)
                     .join('\n ')}`,
             ];
             if (failedTasks.size > numFailedToPrint) {
-                failureSummaryRows.push(output_1.output.dim(`        ...and ${failedTasks.size - numFailedToPrint} more...`));
+                failureSummaryRows.push(output_1.output.dim(`${EXTENDED_LEFT_PAD}...and ${failedTasks.size - numFailedToPrint} more...`));
             }
             failureSummaryRows.push(...(0, view_logs_utils_1.viewLogsFooterRows)(failedTasks.size));
             renderPinnedFooter(failureSummaryRows, 'red');
@@ -314,8 +313,7 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
 }
 exports.createRunManyDynamicOutputRenderer = createRunManyDynamicOutputRenderer;
 function writeCompletedTaskResultLine(line) {
-    const additionalXPadding = '   ';
-    output_1.output.overwriteLine(output_1.output.X_PADDING + additionalXPadding + line);
+    output_1.output.overwriteLine(LEFT_PAD + line);
 }
 /**
  * There's not much we can do in order to "neaten up" the outputs of
@@ -326,7 +324,6 @@ function writeCompletedTaskResultLine(line) {
 function writeCommandOutputBlock(commandOutput) {
     commandOutput = commandOutput || '';
     commandOutput = commandOutput.trimStart();
-    const additionalXPadding = '      ';
     const lines = commandOutput.split(os_1.EOL);
     let totalTrailingEmptyLines = 0;
     for (let i = lines.length - 1; i >= 0; i--) {
@@ -341,5 +338,5 @@ function writeCommandOutputBlock(commandOutput) {
     }
     lines.push('');
     // Indent the command output to make it look more "designed" in the context of the dynamic output
-    lines.forEach((l) => output_1.output.overwriteLine(`${output_1.output.X_PADDING}${additionalXPadding}${l}`));
+    lines.forEach((l) => output_1.output.overwriteLine(`${EXTENDED_LEFT_PAD}${l}`));
 }

package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js

@@ -9,6 +9,8 @@ const output_1 = require("../../utils/output");
 const pretty_time_1 = require("./pretty-time");
 const formatting_utils_1 = require("./formatting-utils");
 const view_logs_utils_1 = require("./view-logs-utils");
+const LEFT_PAD = `  `;
+const EXTENDED_LEFT_PAD = `    `;
 /**
  * The following function is responsible for creating a life cycle with dynamic
  * outputs, meaning previous outputs can be rewritten or modified as new outputs
@@ -57,7 +59,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
     const moveCursorToStartOfDependentTargetLines = () => {
         readline.moveCursor(process.stdout, 0, -dependentTargetsNumLines);
     };
-    const renderLines = (lines, dividerColor = 'cyan', renderDivider = true, skipPadding = false) => {
+    const renderLines = (lines, dividerColor = 'cyan', renderDivider = true) => {
         let additionalLines = 0;
         if (renderDivider) {
             const dividerLines = output_1.output.getVerticalSeparatorLines(dividerColor);
@@ -68,7 +70,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
             lines.push('');
         }
         for (const line of lines) {
-            output_1.output.overwriteLine((skipPadding ? '' : output_1.output.X_PADDING) + line);
+            output_1.output.overwriteLine(line);
         }
         dependentTargetsNumLines = lines.length + additionalLines;
         // clear any possible text below the cursor's position
@@ -86,7 +88,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
         switch (state) {
             case 'EXECUTING_DEPENDENT_TARGETS':
                 if (totalFailedTasks === 0) {
-                    linesToRender.push(`   ${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])}    ${output_1.output.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${initiatingProject}${output_1.output.dim('...')}`);
+                    linesToRender.push(`${LEFT_PAD}${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])}    ${output_1.output.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${initiatingProject}${output_1.output.dim('...')}`);
                     if (totalSuccessfulTasks > 0) {
                         linesToRender.push('');
                     }
@@ -94,14 +96,14 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 break;
         }
         if (totalFailedTasks > 0) {
-            linesToRender.push(output_1.output.colors.red.dim(`   ${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`));
+            linesToRender.push(output_1.output.colors.red.dim(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`));
         }
         if (totalSuccessfulTasks > 0) {
-            linesToRender.push(output_1.output.dim(`   ${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`));
+            linesToRender.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`));
         }
         moveCursorToStartOfDependentTargetLines();
         if (linesToRender.length > 1) {
-            renderLines(linesToRender, 'gray', renderDivider && state !== 'EXECUTING_DEPENDENT_TARGETS', true);
+            renderLines(linesToRender, 'gray', renderDivider && state !== 'EXECUTING_DEPENDENT_TARGETS');
         }
         else {
             renderLines([]);
@@ -120,7 +122,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 renderDependentTargets(false);
                 if (totalDependentTasksNotFromInitiatingProject > 0) {
                     output_1.output.addNewline();
-                    process.stdout.write(`   ${output_1.output.dim('Hint: you can run the command with')} --verbose ${output_1.output.dim('to see the full dependent project outputs')}` + os_1.EOL);
+                    process.stdout.write(`${LEFT_PAD}${output_1.output.dim('Hint: you can run the command with')} --verbose ${output_1.output.dim('to see the full dependent project outputs')}` + os_1.EOL);
                     output_1.output.addVerticalSeparator('gray');
                 }
             }
@@ -176,11 +178,10 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)([initiatingProject], [targetName], tasks)}`;
             const taskOverridesLines = [];
             if (Object.keys(overrides).length > 0) {
-                const leftPadding = `${output_1.output.X_PADDING}       `;
                 taskOverridesLines.push('');
-                taskOverridesLines.push(`${leftPadding}${output_1.output.dim.green('With additional flags:')}`);
+                taskOverridesLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
                 Object.entries(overrides)
-                    .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(leftPadding, flag, value)))
+                    .map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
                     .forEach((arg) => taskOverridesLines.push(arg));
             }
             const pinnedFooterLines = [
@@ -188,7 +189,7 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 ...taskOverridesLines,
             ];
             if (totalCachedTasks > 0) {
-                pinnedFooterLines.push(output_1.output.dim(`${os_1.EOL}   Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
+                pinnedFooterLines.push(output_1.output.dim(`${os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
             }
             renderLines(pinnedFooterLines, 'green');
         }
@@ -200,11 +201,10 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
             }
             const taskOverridesLines = [];
             if (Object.keys(overrides).length > 0) {
-                const leftPadding = `${output_1.output.X_PADDING}       `;
                 taskOverridesLines.push('');
-                taskOverridesLines.push(`${leftPadding}${output_1.output.dim.red('With additional flags:')}`);
+                taskOverridesLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
                 Object.entries(overrides)
-                    .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(leftPadding, flag, value)))
+                    .map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
                     .forEach((arg) => taskOverridesLines.push(arg));
             }
             const viewLogs = (0, view_logs_utils_1.viewLogsFooterRows)(totalFailedTasks);
@@ -212,8 +212,8 @@ async function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, arg
                 output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
                 ...taskOverridesLines,
                 '',
-                `   ${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
-                `   ${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
+                `${LEFT_PAD}${output_1.output.colors.red(figures.cross)}    ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
+                `${LEFT_PAD}${output_1.output.dim(figures.tick)}    ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
                 ...viewLogs,
             ], 'red');
         }

package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js

@@ -27,7 +27,7 @@ class StaticRunManyTerminalOutputLifeCycle {
             output_1.output.logSingleLine(`No projects with ${(0, formatting_utils_1.formatTargetsAndProjects)(this.projectNames, this.args.targets, this.tasks)} were run`);
             return;
         }
-        const bodyLines = this.projectNames.map((affectedProject) => ` ${output_1.output.dim('-')} ${affectedProject}`);
+        const bodyLines = this.projectNames.map((affectedProject) => `${output_1.output.dim('-')} ${affectedProject}`);
         if (Object.keys(this.taskOverrides).length > 0) {
             bodyLines.push('');
             bodyLines.push(`${output_1.output.dim('With additional flags:')}`);

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.