nx 22.2.2 → 22.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.2.2",
+  "version": "22.2.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.2.2",
-    "@nx/nx-darwin-x64": "22.2.2",
-    "@nx/nx-freebsd-x64": "22.2.2",
-    "@nx/nx-linux-arm-gnueabihf": "22.2.2",
-    "@nx/nx-linux-arm64-gnu": "22.2.2",
-    "@nx/nx-linux-arm64-musl": "22.2.2",
-    "@nx/nx-linux-x64-gnu": "22.2.2",
-    "@nx/nx-linux-x64-musl": "22.2.2",
-    "@nx/nx-win32-arm64-msvc": "22.2.2",
-    "@nx/nx-win32-x64-msvc": "22.2.2"
+    "@nx/nx-darwin-arm64": "22.2.4",
+    "@nx/nx-darwin-x64": "22.2.4",
+    "@nx/nx-freebsd-x64": "22.2.4",
+    "@nx/nx-linux-arm-gnueabihf": "22.2.4",
+    "@nx/nx-linux-arm64-gnu": "22.2.4",
+    "@nx/nx-linux-arm64-musl": "22.2.4",
+    "@nx/nx-linux-x64-gnu": "22.2.4",
+    "@nx/nx-linux-x64-musl": "22.2.4",
+    "@nx/nx-win32-arm64-msvc": "22.2.4",
+    "@nx/nx-win32-x64-msvc": "22.2.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/format/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/format/format.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA2B/B,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,GAAG,OAAO,EAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,GACpB,OAAO,CAAC,IAAI,CAAC,CA8Df"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/format/format.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA2B/B,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,GAAG,OAAO,EAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,GACpB,OAAO,CAAC,IAAI,CAAC,CA8Df"}

package/src/command-line/format/format.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 const node_child_process_1 = require("node:child_process");
 const path = require("node:path");
+const semver_1 = require("semver");
 const file_utils_1 = require("../../project-graph/file-utils");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const fileutils_1 = require("../../utils/fileutils");
@@ -146,12 +147,15 @@ function write(patterns) {
             return result;
         }, [[], []]);
         const prettierPath = getPrettierPath();
-        (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${regularPatterns.join(' ')}`, {
+        const listDifferentArg = shouldUseListDifferent()
+            ? '--list-different '
+            : '';
+        (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${regularPatterns.join(' ')}`, {
             stdio: [0, 1, 2],
             windowsHide: false,
         });
         if (swcrcPatterns.length > 0) {
-            (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${swcrcPatterns.join(' ')} --parser json`, {
+            (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${swcrcPatterns.join(' ')} --parser json`, {
                 stdio: [0, 1, 2],
                 windowsHide: false,
             });
@@ -201,3 +205,17 @@ function getPrettierPath() {
     prettierPath = require.resolve(path.join('prettier', bin));
     return prettierPath;
 }
+let useListDifferent;
+/**
+ * Determines if --list-different should be used with --write.
+ * Prettier 4+ and 3.6.x with experimental CLI don't support combining these flags.
+ */
+function shouldUseListDifferent() {
+    if (useListDifferent !== undefined) {
+        return useListDifferent;
+    }
+    const prettierMajor = (0, semver_1.major)(require('prettier').version);
+    const isExperimentalCli = process.env.PRETTIER_EXPERIMENTAL_CLI === '1';
+    useListDifferent = prettierMajor < 4 && !isExperimentalCli;
+    return useListDifferent;
+}

package/src/command-line/release/changelog.js

@@ -613,6 +613,7 @@ async function generateChangelogForWorkspace({ tree, args, nxReleaseConfig, work
     const releaseVersion = new shared_1.ReleaseVersion({
         version: workspaceChangelogVersion,
         releaseTagPattern: nxReleaseConfig.releaseTag.pattern,
+        releaseGroupName: Object.keys(nxReleaseConfig.groups)[0],
     });
     if (interpolatedTreePath) {
         const prefix = dryRun ? 'Previewing' : 'Generating';
@@ -719,6 +720,7 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
                 : projectsVersionData[project.name].newVersion,
             releaseTagPattern: releaseGroup.releaseTag.pattern,
             projectName: project.name,
+            releaseGroupName: releaseGroup.name,
         });
         if (interpolatedTreePath) {
             const prefix = dryRun ? 'Previewing' : 'Generating';

package/src/command-line/release/utils/shared.d.ts

@@ -34,10 +34,12 @@ export declare class ReleaseVersion {
     isPrerelease: boolean;
     constructor({ version, // short form version string with no prefixes or patterns, e.g. 1.0.0
     releaseTagPattern, // full pattern to interpolate, e.g. "v{version}" or "{projectName}@{version}"
-    projectName, }: {
+    projectName, // optional project name to interpolate into the releaseTagPattern
+    releaseGroupName, }: {
         version: string;
         releaseTagPattern: string;
         projectName?: string;
+        releaseGroupName?: string;
     });
 }
 export declare function commitChanges({ changedFiles, deletedFiles, isDryRun, isVerbose, gitCommitMessages, gitCommitArgs, }: {

package/src/command-line/release/utils/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAW7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EACL,SAAS,EAIV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,eAAO,MAAM,wBAAwB,QAEpC,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,iBAAiB,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,oBAAoB,EAAE,MAAM,CAAC;QAC7B,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,qBAAa,cAAc;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;gBAEV,EACV,OAAO,EAAE,qEAAqE;IAC9E,iBAAiB,EAAE,8EAA8E;IACjG,WAAW,EAAE,kEAAkE;IAC/E,gBAAgB,GACjB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B;CAWF;AAED,wBAAsB,aAAa,CAAC,EAClC,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,iBAAiB,EACjB,aAAa,GACd,EAAE;IACD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC,iBAsBA;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,CA8GV;AAcD,wBAAgB,wCAAwC,CACtD,YAAY,EAAE,oBAAoB,GACjC,OAAO,GAAG,MAAM,CAElB;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;CAAE,EAC1D,WAAW,EAAE,MAAM,GAClB,OAAO,CAOT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,GACvB,MAAM,EAAE,CAgGV;AAeD,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAcnE;AA6BD,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,EAAE,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,eAAe,EAAE,eAAe,GAElC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAAC,CA6C5E"}

package/src/command-line/release/utils/shared.js

@@ -31,6 +31,7 @@ class ReleaseVersion {
     constructor({ version, // short form version string with no prefixes or patterns, e.g. 1.0.0
     releaseTagPattern, // full pattern to interpolate, e.g. "v{version}" or "{projectName}@{version}"
     projectName, // optional project name to interpolate into the releaseTagPattern
+    releaseGroupName, // optional release group name to interpolate into the releaseTagPattern
      }) {
         this.rawVersion = version;
         this.gitTag = (0, utils_1.interpolate)(releaseTagPattern, {
@@ -38,6 +39,7 @@ class ReleaseVersion {
             projectName: projectName
                 ? (0, git_1.sanitizeProjectNameForGitTag)(projectName)
                 : projectName,
+            releaseGroupName,
         });
         this.isPrerelease = isPrerelease(version);
     }
@@ -79,6 +81,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         const releaseVersion = new ReleaseVersion({
             version: projectVersionData.newVersion,
             releaseTagPattern: releaseGroup.releaseTag.pattern,
+            releaseGroupName: releaseGroup.name,
         });
         commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
             version: releaseVersion.rawVersion,
@@ -101,6 +104,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
                 version: projectVersionData.newVersion,
                 releaseTagPattern: releaseGroup.releaseTag.pattern,
                 projectName: releaseGroupProjectNames[0],
+                releaseGroupName: releaseGroup.name,
             });
             commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
                 version: releaseVersion.rawVersion,
@@ -132,6 +136,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
                         version: projectVersionData.newVersion,
                         releaseTagPattern: releaseGroup.releaseTag.pattern,
                         projectName: project,
+                        releaseGroupName: releaseGroup.name,
                     });
                     commitMessageValues.push(`- project: ${project} ${releaseVersion.rawVersion}`);
                 }
@@ -144,6 +149,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
             const releaseVersion = new ReleaseVersion({
                 version: projectVersionData.newVersion,
                 releaseTagPattern: releaseGroup.releaseTag.pattern,
+                releaseGroupName: releaseGroup.name,
             });
             commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
         }
@@ -187,12 +193,14 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.dockerVersion,
                                 projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
+                                releaseGroupName: releaseGroup.name,
                             }));
                         }
                         if (projectVersionData.newVersion) {
                             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.newVersion,
                                 projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
+                                releaseGroupName: releaseGroup.name,
                             }));
                         }
                     }
@@ -203,6 +211,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                                 ? projectVersionData.dockerVersion
                                 : projectVersionData.newVersion,
                             projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
+                            releaseGroupName: releaseGroup.name,
                         }));
                     }
                 }

package/src/plugins/js/lock-file/pnpm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAuB3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;CACpD,CASA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,+BAUnD;AAiXD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}
+{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAuB3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;CACpD,CASA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,+BAUnD;AAmXD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -271,12 +271,14 @@ function getHoistedVersion(packageName, isV5, hoistedKeysByPackage) {
 }
 function getDependencies(data, keyMap, isV5, ctx) {
     const results = [];
-    Object.entries(data.packages).forEach(([key, snapshot]) => {
+    Object.keys(data.packages).forEach((key) => {
+        const snapshot = data.packages[key];
         const nodes = keyMap.get(key);
         nodes.forEach((node) => {
             [snapshot.dependencies, snapshot.optionalDependencies].forEach((section) => {
                 if (section) {
-                    Object.entries(section).forEach(([name, versionRange]) => {
+                    Object.keys(section).forEach((name) => {
+                        const versionRange = section[name];
                         const version = parseBaseVersion(findVersion(versionRange, name, isV5), isV5);
                         const target = ctx.externalNodes[`npm:${name}@${version}`] ||
                             ctx.externalNodes[`npm:${name}`];

package/src/plugins/js/lock-file/project-graph-pruning.js

@@ -97,9 +97,9 @@ function addNodesAndDependencies(graph, packageJsonDeps, workspacePackages, buil
         }
         else if (workspacePackages.has(name)) {
             // Workspace Node
-            const node = graph.nodes[name];
-            if (node) {
-                traverseWorkspaceNode(graph, builder, node);
+            const workspaceNode = workspacePackages.get(name);
+            if (workspaceNode) {
+                traverseWorkspaceNode(graph, builder, workspaceNode);
             }
         }
     });

package/src/plugins/js/project-graph/build-dependencies/build-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,CAgD7B"}
+{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,CA8C7B"}

package/src/plugins/js/project-graph/build-dependencies/build-dependencies.js

@@ -11,14 +11,14 @@ function buildExplicitDependencies(jsPluginConfig, ctx) {
     // TODO: TargetProjectLocator is a public API, so we can't change the shape of it
     // We should eventually let it accept Record<string, ProjectConfiguration> s.t. we
     // don't have to reshape the CreateDependenciesContext here.
-    const nodes = Object.fromEntries(Object.entries(ctx.projects).map(([key, config]) => [
-        key,
-        {
+    const nodes = {};
+    Object.keys(ctx.projects).forEach((key) => {
+        nodes[key] = {
             name: key,
             type: null,
-            data: config,
-        },
-    ]));
+            data: ctx.projects[key],
+        };
+    });
     const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(nodes, ctx.externalNodes);
     if (jsPluginConfig.analyzeSourceFiles === undefined ||
         jsPluginConfig.analyzeSourceFiles === true) {

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;AAIzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,yBAAyB,EAAE,CAkB7B"}
+{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,yBAAyB,EAAE,CAe7B"}

package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js

@@ -5,25 +5,33 @@ const project_graph_1 = require("../../../../config/project-graph");
 const file_utils_1 = require("../../../../project-graph/file-utils");
 const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
 const json_1 = require("../../../../utils/json");
-const path_1 = require("../../../../utils/path");
 function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
     const res = [];
-    // Build Set of valid package.json paths once for O(1) lookup
-    // instead of O(n) find() per file
-    const projectPackageJsonPaths = new Set(Object.values(ctx.projects).map((project) => (0, path_1.joinPathFragments)(project.root, 'package.json')));
-    for (const source in ctx.filesToProcess.projectFileMap) {
-        for (const f of Object.values(ctx.filesToProcess.projectFileMap[source])) {
-            if (projectPackageJsonPaths.has(f.file)) {
+    const roots = {};
+    Object.values(ctx.projects).forEach((project) => {
+        roots[project.root] = true;
+    });
+    Object.keys(ctx.filesToProcess.projectFileMap).forEach((source) => {
+        Object.values(ctx.filesToProcess.projectFileMap[source]).forEach((f) => {
+            if (isPackageJsonAtProjectRoot(roots, f.file)) {
                 processPackageJson(source, f.file, ctx, targetProjectLocator, res);
             }
-        }
-    }
+        });
+    });
     return res;
 }
+function isPackageJsonAtProjectRoot(roots, fileName) {
+    if (!fileName.endsWith('package.json')) {
+        return false;
+    }
+    const filePath = fileName.slice(0, -13);
+    return !!roots[filePath];
+}
 function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLocator, collectedDeps) {
     try {
         const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(packageJsonPath)));
-        for (const [packageName, packageVersion] of Object.entries(deps)) {
+        Object.keys(deps).forEach((packageName) => {
+            const packageVersion = deps[packageName];
             const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(packageJsonPath, packageName, packageVersion);
             if (localProject) {
                 // package.json refers to another project in the monorepo
@@ -35,11 +43,11 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
                 };
                 (0, project_graph_builder_1.validateDependency)(dependency, ctx);
                 collectedDeps.push(dependency);
-                continue;
+                return;
             }
             const externalNodeName = targetProjectLocator.findNpmProjectFromImport(packageName, packageJsonPath);
             if (!externalNodeName) {
-                continue;
+                return;
             }
             const dependency = {
                 source: sourceProject,
@@ -49,7 +57,7 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
             };
             (0, project_graph_builder_1.validateDependency)(dependency, ctx);
             collectedDeps.push(dependency);
-        }
+        });
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
@@ -70,9 +78,9 @@ function readDeps(packageJson) {
         'dependencies',
     ];
     for (const type of depType) {
-        for (const [depName, depVersion] of Object.entries(packageJson[type] || {})) {
-            deps[depName] = depVersion;
-        }
+        Object.keys(packageJson[type] || {}).forEach((depName) => {
+            deps[depName] = packageJson[type][depName];
+        });
     }
     return deps;
 }

package/src/plugins/js/utils/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/utils/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+ClD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;AACpE;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,OAAE;AA6CxE,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,eAAe,GAC/B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAUjC;AAED,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,eAAe,EAC/B,YAAY,CAAC,EAAE,OAAO,GACrB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAwBjC;AAiFD,wBAAgB,aAAa,CAC3B,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,SALc,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAiFnE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,IAAI,CAUZ;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,KAAA,GAAG,MAAM,IAAI,CAuB9D;AA+ED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxE"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/utils/register.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+ClD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;AACpE;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,OAAE;AA6CxE,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,eAAe,GAC/B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAajC;AAED,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,eAAe,EAChC,aAAa,CAAC,EAAE,eAAe,EAC/B,YAAY,CAAC,EAAE,OAAO,GACrB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAwBjC;AAiFD,wBAAgB,aAAa,CAC3B,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,SALc,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAiFnE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,eAAe,EAChC,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM,IAAI,CAUZ;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,KAAA,GAAG,MAAM,IAAI,CAuB9D;AA+ED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxE"}

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

@@ -88,7 +88,10 @@ function getSwcTranspiler(compilerOptions) {
     // These are requires to prevent it from registering when it shouldn't
     const register = require('@swc-node/register/register')
         .register;
-    const cleanupFn = register(compilerOptions);
+    const cleanupFn = register({
+        ...compilerOptions,
+        baseUrl: compilerOptions.baseUrl ?? './',
+    });
     return typeof cleanupFn === 'function' ? cleanupFn : () => { };
 }
 function getTsNodeTranspiler(compilerOptions, tsNodeOptions, preferTsNode) {

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;eAqekC,SAAS;;EAC3C"}
+{"version":3,"file":"tui-summary-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/tui-summary-life-cycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAa/C,wBAAgB,8BAA8B,CAAC,EAC7C,YAAY,EACZ,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,0BAA0B,GAC3B,EAAE;IACD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,IAAI,EAAE,CAAC;IACxB,0BAA0B,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;CACnD;eAyekC,SAAS;;EAC3C"}

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js

@@ -42,8 +42,10 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
     lifeCycle.printTaskTerminalOutput = (task, taskStatus, output) => {
         tasksToTaskStatus[task.id] = taskStatus;
         // Store the complete output for display in the summary
-        // This is called with the full output for cached and executed tasks
-        if (output) {
+        // This is called with the full output for cached tasks. For non-cached tasks,
+        // the output doesn't include the portion of the output that prints the command that was being ran.
+        if (output &&
+            !['failure', 'success'].includes(taskStatus)) {
             tasksToTerminalOutputs[task.id] = output;
         }
     };

package/src/tasks-runner/run-command.js

@@ -51,7 +51,7 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
     delete overridesWithoutHidden['__overrides_unparsed__'];
     const isRunOne = initiatingProject != null;
     if (tasks.length === 1) {
-        process.env.NX_TUI = 'false';
+        process.env.NX_TUI ??= 'false';
     }
     if ((0, is_tui_enabled_1.isTuiEnabled)()) {
         const interceptedNxCloudLogs = [];