nx 21.0.0-canary.20250425-ee097a8 → 21.0.0-canary.20250426-da4f55b

package/migrations.json

@@ -1,40 +1,5 @@
 {
   "generators": {
-    "17.0.0-move-cache-directory": {
-      "cli": "nx",
-      "version": "17.0.0-beta.1",
-      "description": "Updates the default cache directory to .nx/cache",
-      "implementation": "./src/migrations/update-17-0-0/move-cache-directory"
-    },
-    "17.0.0-use-minimal-config-for-tasks-runner-options": {
-      "cli": "nx",
-      "version": "17.0.0-beta.3",
-      "description": "Use minimal config for tasksRunnerOptions",
-      "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options"
-    },
-    "rm-default-collection-npm-scope": {
-      "version": "17.0.0-rc.1",
-      "description": "Migration for v17.0.0-rc.1",
-      "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope"
-    },
-    "17.3.0-update-nx-wrapper": {
-      "cli": "nx",
-      "version": "17.3.0-beta.6",
-      "description": "Updates the nx wrapper.",
-      "implementation": "./src/migrations/update-17-3-0/update-nxw"
-    },
-    "18.0.0-disable-adding-plugins-for-existing-workspaces": {
-      "cli": "nx",
-      "version": "18.0.0-beta.2",
-      "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
-      "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
-      "x-repair-skip": true
-    },
-    "move-default-base-to-nx-json-root": {
-      "version": "18.1.0-beta.3",
-      "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
-      "implementation": "./src/migrations/update-17-2-0/move-default-base"
-    },
     "19-2-0-move-graph-cache-directory": {
       "cli": "nx",
       "version": "19.2.0-beta.2",

package/package.json

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

package/src/command-line/migrate/migrate-ui-api.d.ts

@@ -33,6 +33,7 @@ export declare function runSingleMigration(workspacePath: string, migration: Mig
 export declare function getImplementationPath(workspacePath: string, migration: MigrationDetailsWithId): Promise<string>;
 export declare function modifyMigrationsJsonMetadata(workspacePath: string, modify: (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata): void;
 export declare function addSuccessfulMigration(id: string, fileChanges: Omit<FileChange, 'content'>[], ref: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
+export declare function updateRefForSuccessfulMigration(id: string, ref: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
 export declare function addFailedMigration(id: string, error: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => {
     completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration>;
     runningMigrations?: string[];
@@ -54,3 +55,4 @@ export declare function addSkippedMigration(id: string): (migrationsJsonMetadata
     targetVersion?: string;
 };
 export declare function readMigrationsJsonMetadata(workspacePath: string): MigrationsJsonMetadata;
+export declare function undoMigration(workspacePath: string, id: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;

package/src/command-line/migrate/migrate-ui-api.js

@@ -6,9 +6,11 @@ exports.runSingleMigration = runSingleMigration;
 exports.getImplementationPath = getImplementationPath;
 exports.modifyMigrationsJsonMetadata = modifyMigrationsJsonMetadata;
 exports.addSuccessfulMigration = addSuccessfulMigration;
+exports.updateRefForSuccessfulMigration = updateRefForSuccessfulMigration;
 exports.addFailedMigration = addFailedMigration;
 exports.addSkippedMigration = addSkippedMigration;
 exports.readMigrationsJsonMetadata = readMigrationsJsonMetadata;
+exports.undoMigration = undoMigration;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -88,6 +90,12 @@ async function runSingleMigration(workspacePath, migration, configuration) {
                 cwd: workspacePath,
                 encoding: 'utf-8',
             });
+            // The revision changes after the amend, so we need to update it
+            const amendedGitRef = (0, child_process_1.execSync)('git rev-parse HEAD', {
+                cwd: workspacePath,
+                encoding: 'utf-8',
+            }).trim();
+            modifyMigrationsJsonMetadata(workspacePath, updateRefForSuccessfulMigration(migration.id, amendedGitRef));
         }
     }
     catch (e) {
@@ -130,6 +138,22 @@ function addSuccessfulMigration(id, fileChanges, ref) {
         return copied;
     };
 }
+function updateRefForSuccessfulMigration(id, ref) {
+    return (migrationsJsonMetadata) => {
+        const copied = { ...migrationsJsonMetadata };
+        if (!copied.completedMigrations) {
+            copied.completedMigrations = {};
+        }
+        const existing = copied.completedMigrations[id];
+        if (existing && existing.type === 'successful') {
+            existing.ref = ref;
+        }
+        else {
+            throw new Error(`Attempted to update ref for unsuccessful migration`);
+        }
+        return copied;
+    };
+}
 function addFailedMigration(id, error) {
     return (migrationsJsonMetadata) => {
         const copied = { ...migrationsJsonMetadata };
@@ -186,3 +210,18 @@ function readMigrationsJsonMetadata(workspacePath) {
     const migrationsJson = JSON.parse((0, fs_1.readFileSync)(migrationsJsonPath, 'utf-8'));
     return migrationsJson['nx-console'];
 }
+function undoMigration(workspacePath, id) {
+    return (migrationsJsonMetadata) => {
+        const existing = migrationsJsonMetadata.completedMigrations[id];
+        if (existing.type !== 'successful')
+            throw new Error(`undoMigration called on unsuccessful migration: ${id}`);
+        (0, child_process_1.execSync)(`git reset --hard ${existing.ref}^`, {
+            cwd: workspacePath,
+            encoding: 'utf-8',
+        });
+        migrationsJsonMetadata.completedMigrations[id] = {
+            type: 'skipped',
+        };
+        return migrationsJsonMetadata;
+    };
+}

package/src/command-line/migrate/migrate.d.ts

@@ -41,7 +41,6 @@ export declare class Migrator {
             name: string;
             version: string;
             description?: string;
-            cli?: string;
             implementation?: string;
             factory?: string;
             requires?: Record<string, string>;
@@ -101,20 +100,17 @@ export declare function executeMigrations(root: string, migrations: {
     name: string;
     description?: string;
     version: string;
-    cli?: 'nx' | 'angular';
 }[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string): Promise<{
     package: string;
     name: string;
     description?: string;
     version: string;
-    cli?: "nx" | "angular";
 }[]>;
 export declare function runNxOrAngularMigration(root: string, migration: {
     package: string;
     name: string;
     description?: string;
     version: string;
-    cli?: 'nx' | 'angular';
 }, isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, installDepsIfChanged?: () => void, handleInstallDeps?: boolean): Promise<FileChange[]>;
 export declare function migrate(root: string, args: {
     [k: string]: any;

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

@@ -647,7 +647,11 @@ async function getPackageMigrationsUsingInstall(packageName, packageVersion) {
         result = { ...migrations, packageGroup, version: packageJson.version };
     }
     catch (e) {
-        logger_1.logger.warn(`Unable to fetch migrations for ${packageName}@${packageVersion}: ${e.message}`);
+        output_1.output.warn({
+            title: `Failed to fetch migrations for ${packageName}@${packageVersion}`,
+            bodyLines: [e.message],
+        });
+        return {};
     }
     finally {
         await cleanup();
@@ -870,7 +874,6 @@ function addSplitConfigurationMigrationIfAvailable(from, packageJson) {
             {
                 version: '15.7.0-beta.0',
                 description: 'Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.',
-                cli: 'nx',
                 implementation: './src/migrations/update-15-7-0/split-configuration-into-project-json-files',
                 package: '@nrwl/workspace',
                 name: '15-7-0-split-configuration-into-project-json-files',
@@ -973,7 +976,7 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
     }
     const { collection, collectionPath } = readMigrationCollection(migration.package, root);
     let changes = [];
-    if (!isAngularMigration(collection, collectionPath, migration.name)) {
+    if (!isAngularMigration(collection, migration.name)) {
         changes = await runNxMigration(root, collectionPath, collection, migration.name);
         logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
         logger_1.logger.info(`  ${migration.description}\n`);
@@ -1214,24 +1217,8 @@ function addToNodePath(dir) {
     // Update the env variable.
     process.env.NODE_PATH = paths.join(delimiter);
 }
-// TODO (v21): Remove CLI determination of Angular Migration
-function isAngularMigration(collection, collectionPath, name) {
-    const entry = collection.generators?.[name] || collection.schematics?.[name];
-    const shouldBeNx = !!collection.generators?.[name];
-    const shouldBeNg = !!collection.schematics?.[name];
-    if (entry.cli && entry.cli !== 'nx' && collection.generators?.[name]) {
-        output_1.output.warn({
-            title: `The migration '${collection.name}:${name}' appears to be an Angular CLI migration, but is located in the 'generators' section of migrations.json.`,
-            bodyLines: [
-                'In Nx 21, migrations inside `generators` will be treated as Nx Devkit migrations and therefore may not run correctly if they are using Angular Devkit.',
-                'If the migration should be run with Angular Devkit, please place the migration inside `schematics` instead.',
-                "Please open an issue on the plugin's repository if you believe this is an error.",
-            ],
-        });
-    }
-    // Currently, if the cli property exists we listen to it. If its nx, its not an ng cli migration.
-    // If the property is not set, we will fall back to our intuition.
-    return entry.cli ? entry.cli !== 'nx' : !shouldBeNx && shouldBeNg;
+function isAngularMigration(collection, name) {
+    return !collection.generators?.[name] && collection.schematics?.[name];
 }
 const getNgCompatLayer = (() => {
     let _ngCliAdapter;

package/src/command-line/release/version/release-group-processor.js

@@ -205,6 +205,14 @@ class ReleaseGroupProcessor {
                 const currentVersion = await (0, resolve_current_version_1.resolveCurrentVersion)(this.tree, projectGraphNode, releaseGroupNode.group, versionActions, this.projectLoggers.get(projectName), this.currentVersionsPerFixedReleaseGroup, finalConfigForProject, releaseTagPattern, latestMatchingGitTag);
                 this.cachedCurrentVersions.set(projectName, currentVersion);
             }
+            // Ensure that there is an entry in versionData for each project being processed, even if they don't end up being bumped
+            for (const projectName of this.allProjectsToProcess) {
+                this.versionData.set(projectName, {
+                    currentVersion: this.getCurrentCachedVersionForProject(projectName),
+                    newVersion: null,
+                    dependentProjects: this.getOriginalDependentProjects(projectName),
+                });
+            }
         }
         // Build the dependency relationships between groups
         this.buildGroupDependencyGraph();

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

@@ -12,7 +12,6 @@ async function repair(args, extraMigrations = []) {
             if (!skip) {
                 agg.push({
                     package: 'nx',
-                    cli: 'nx',
                     name,
                     description: migration.description,
                     version: migration.version,

package/src/config/misc-interfaces.d.ts

@@ -53,7 +53,6 @@ export type PackageJsonUpdates = {
 export interface MigrationsJsonEntry {
     version: string;
     description?: string;
-    cli?: string;
     implementation?: string;
     factory?: string;
     requires?: Record<string, string>;