nx 21.0.0-canary.20250426-da4f55b → 21.0.0-canary.20250429-cf4a1f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.0.0-canary.20250426-da4f55b",
+  "version": "21.0.0-canary.20250429-cf4a1f3",
   "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": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-darwin-x64": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-freebsd-x64": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-linux-arm-gnueabihf": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-linux-arm64-gnu": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-linux-arm64-musl": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-linux-x64-gnu": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-linux-x64-musl": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-win32-arm64-msvc": "21.0.0-canary.20250426-da4f55b",
-    "@nx/nx-win32-x64-msvc": "21.0.0-canary.20250426-da4f55b"
+    "@nx/nx-darwin-arm64": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-darwin-x64": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-freebsd-x64": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-linux-arm-gnueabihf": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-linux-arm64-gnu": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-linux-arm64-musl": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-linux-x64-gnu": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-linux-x64-musl": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-win32-arm64-msvc": "21.0.0-canary.20250429-cf4a1f3",
+    "@nx/nx-win32-x64-msvc": "21.0.0-canary.20250429-cf4a1f3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/angular-json.js

@@ -18,6 +18,17 @@ exports.NxAngularJsonPlugin = {
             projects: readAngularJson(ctx.workspaceRoot),
         }),
     ],
+    createNodesV2: [
+        'angular.json',
+        (f, _, ctx) => [
+            [
+                'angular.json',
+                {
+                    projects: readAngularJson(ctx.workspaceRoot),
+                },
+            ],
+        ],
+    ],
 };
 exports.default = exports.NxAngularJsonPlugin;
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {

package/src/plugins/js/index.d.ts

@@ -1,4 +1,5 @@
-import { CreateDependencies, CreateNodes } from '../../project-graph/plugins';
+import { CreateDependencies, CreateNodes, CreateNodesV2 } from '../../project-graph/plugins';
 export declare const name = "nx/js/dependencies-and-lockfile";
+export declare const createNodesV2: CreateNodesV2;
 export declare const createNodes: CreateNodes;
 export declare const createDependencies: CreateDependencies;

package/src/plugins/js/index.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDependencies = exports.createNodes = exports.name = void 0;
+exports.createDependencies = exports.createNodes = exports.createNodesV2 = exports.name = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const cache_directory_1 = require("../../utils/cache-directory");
 const globs_1 = require("../../utils/globs");
+const plugins_1 = require("../../project-graph/plugins");
 const lock_file_1 = require("./lock-file/lock-file");
 const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
 const config_1 = require("./utils/config");
@@ -16,6 +17,12 @@ const versions_1 = require("../../utils/versions");
 const child_process_1 = require("child_process");
 exports.name = 'nx/js/dependencies-and-lockfile';
 let parsedLockFile = {};
+exports.createNodesV2 = [
+    (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
+    (files, _, context) => {
+        return (0, plugins_1.createNodesFromFiles)(exports.createNodes[1], files, _, context);
+    },
+];
 exports.createNodes = [
     // Look for all lockfiles
     (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),

package/src/plugins/js/lock-file/utils/package-json.js

@@ -2,18 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHoistedPackageVersion = getHoistedPackageVersion;
 exports.normalizePackageJson = normalizePackageJson;
-const fs_1 = require("fs");
 const workspace_root_1 = require("../../../../utils/workspace-root");
+const fileutils_1 = require("../../../../utils/fileutils");
 /**
  * Get version of hoisted package if available
  */
 function getHoistedPackageVersion(packageName) {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/${packageName}/package.json`;
-    if ((0, fs_1.existsSync)(fullPath)) {
-        const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        return JSON.parse(content)?.version;
+    try {
+        return (0, fileutils_1.readJsonFile)(fullPath)?.version;
+    }
+    catch (e) {
+        return;
     }
-    return;
 }
 /**
  * Strip off non-pruning related fields from package.json

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -9,7 +9,7 @@ exports.usesLeadingDash = usesLeadingDash;
 exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
 exports.parseAndNormalizePnpmLockfile = parseAndNormalizePnpmLockfile;
 exports.stringifyToPnpmYaml = stringifyToPnpmYaml;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 const semver_1 = require("semver");
 const workspace_root_1 = require("../../../../utils/workspace-root");
 const file_hasher_1 = require("../../../../hasher/file-hasher");
@@ -31,8 +31,8 @@ function usesLeadingDash(data) {
 }
 function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
-    if ((0, fs_1.existsSync)(fullPath)) {
-        const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
+    if ((0, node_fs_1.existsSync)(fullPath)) {
+        const content = (0, node_fs_1.readFileSync)(fullPath, 'utf-8');
         const { load } = require('@zkochan/js-yaml');
         return load(content)?.hoistedDependencies ?? {};
     }

package/src/project-graph/plugins/loaded-nx-plugin.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadedNxPlugin = void 0;
 const error_types_1 = require("../error-types");
-const utils_1 = require("./utils");
 const enabled_1 = require("./isolation/enabled");
 const client_1 = require("../../daemon/client/client");
 class LoadedNxPlugin {
@@ -14,10 +13,7 @@ class LoadedNxPlugin {
             this.exclude = pluginDefinition.exclude;
         }
         if (plugin.createNodes && !plugin.createNodesV2) {
-            this.createNodes = [
-                plugin.createNodes[0],
-                (configFiles, context) => (0, utils_1.createNodesFromFiles)(plugin.createNodes[1], configFiles, this.options, context).then((results) => results.map((r) => [this.name, r[0], r[1]])),
-            ];
+            throw new Error(`Plugin ${plugin.name} only provides \`createNodes\` which was removed in Nx 21, it should provide a \`createNodesV2\` implementation.`);
         }
         if (plugin.createNodesV2) {
             this.createNodes = [

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

@@ -194,6 +194,13 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
         }
         return {
             lifeCycle: new life_cycle_1.CompositeLifeCycle(lifeCycles),
+            restoreTerminal: () => {
+                process.stdout.write = originalStdoutWrite;
+                process.stderr.write = originalStderrWrite;
+                console.log = originalConsoleLog;
+                console.error = originalConsoleError;
+                restoreTerminal();
+            },
             printSummary,
             renderIsDone,
         };
@@ -289,24 +296,32 @@ async function runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }
     const tasks = Object.values(taskGraph.tasks);
     const initiatingTasks = tasks.filter((t) => projectNameSet.has(t.target.project) &&
         nxArgs.targets.includes(t.target.target));
-    const { lifeCycle, renderIsDone, printSummary } = await getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, projectNames, tasks, taskGraph, nxArgs, nxJson, overrides);
-    const taskResults = await invokeTasksRunner({
-        tasks,
-        projectGraph,
-        taskGraph,
-        lifeCycle,
-        nxJson,
-        nxArgs,
-        loadDotEnvFiles: extraOptions.loadDotEnvFiles,
-        initiatingProject,
-        initiatingTasks,
-    });
-    await renderIsDone;
-    if (printSummary) {
-        printSummary();
+    const { lifeCycle, renderIsDone, printSummary, restoreTerminal } = await getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, projectNames, tasks, taskGraph, nxArgs, nxJson, overrides);
+    try {
+        const taskResults = await invokeTasksRunner({
+            tasks,
+            projectGraph,
+            taskGraph,
+            lifeCycle,
+            nxJson,
+            nxArgs,
+            loadDotEnvFiles: extraOptions.loadDotEnvFiles,
+            initiatingProject,
+            initiatingTasks,
+        });
+        await renderIsDone;
+        if (printSummary) {
+            printSummary();
+        }
+        await (0, nx_key_1.printNxKey)();
+        return taskResults;
+    }
+    catch (e) {
+        if (restoreTerminal) {
+            restoreTerminal();
+        }
+        throw e;
     }
-    await (0, nx_key_1.printNxKey)();
-    return taskResults;
 }
 async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions) {
     let taskGraph = createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);

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

@@ -421,6 +421,9 @@ class TaskOrchestrator {
             const runningTask = new shared_running_task_1.SharedRunningTask(this.runningTasksService, task.id);
             this.runningContinuousTasks.set(task.id, runningTask);
             runningTask.onExit(() => {
+                if (this.tuiEnabled) {
+                    this.options.lifeCycle.setTaskStatus(task.id, 9 /* NativeTaskStatus.Stopped */);
+                }
                 this.runningContinuousTasks.delete(task.id);
             });
             // task is already running by another process, we schedule the next tasks
@@ -457,6 +460,9 @@ class TaskOrchestrator {
         this.runningTasksService.addRunningTask(task.id);
         this.runningContinuousTasks.set(task.id, childProcess);
         childProcess.onExit(() => {
+            if (this.tuiEnabled) {
+                this.options.lifeCycle.setTaskStatus(task.id, 9 /* NativeTaskStatus.Stopped */);
+            }
             this.runningTasksService.removeRunningTask(task.id);
             this.runningContinuousTasks.delete(task.id);
         });