nx 22.2.3 → 22.2.5

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/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 = [];