fix(angular): support @angular/cli package update during nx migrate (#33918)

## Current Behavior

When migrating Angular packages the `@angular/cli` package is not
updated as part of the `nx migrate` initial package updates to the
`package.json` file. Instead, it's updated at a later stage with a
migration generator. This happens for a couple of reasons:

- Angular CLI package group will update all the packages using a `^`,
which can result in workspaces getting a minor version of the packages
installed before Nx adds support for that minor version.
- Angular CLI migrations can error due to some assumptions that are not
always correct in Nx workspaces.
- The `nx migrate` command currently doesn't have the ability to ignore
the package group or migrations of a given package.

This is why the `@angular/cli` package is migrated "manually" in a
migration generator.

## Expected Behavior

The `@angular/cli` package should be updated as part of the package
updates performed by the `nx migrate` command while ignoring its package
group and migrations. The `@nx/angular` package already provides the
same set of migrations and more.

Co-authored-by: Jack Hsu <[email protected]>

Author: leosvelperez

packages/angular/migrations.json

@@ -342,14 +342,6 @@
       "description": "Update the @angular/cli package version to ~20.3.0.",
       "factory": "./src/migrations/update-21-6-1/update-angular-cli"
     },
-    "update-angular-cli-version-21-0-0": {
-      "version": "22.3.0-beta.0",
-      "requires": {
-        "@angular/core": ">=21.0.0"
-      },
-      "description": "Update the @angular/cli package version to ~21.0.0.",
-      "factory": "./src/migrations/update-22-3-0/update-angular-cli"
-    },
     "update-ssr-webpack-config-22-2-0": {
       "version": "22.3.0-beta.0",
       "requires": {
@@ -2012,6 +2004,12 @@
         "@angular/core": ">=20.3.0 <21.0.0"
       },
       "packages": {
+        "@angular/cli": {
+          "version": "~21.0.0",
+          "alwaysAddToPackageJson": false,
+          "ignorePackageGroup": true,
+          "ignoreMigrations": true
+        },
         "@angular-devkit/build-angular": {
           "version": "~21.0.0",
           "alwaysAddToPackageJson": false

packages/angular/src/migrations/update-22-3-0/update-angular-cli.md

@@ -124,7 +124,7 @@ describe('app', () => {
           ).toMatchSnapshot();
           expect(tree.read(`${name}/tsconfig.json`, 'utf-8')).toMatchSnapshot();
           const packageJson = readJson(tree, 'package.json');
-          expect(packageJson.devDependencies['vitest']).toEqual('^4.0.0');
+          expect(packageJson.devDependencies['vitest']).toEqual('^4.0.8');
         });
 
         it('should configure tsconfig and project.json correctly', async () => {

packages/angular/src/migrations/update-22-3-0/update-angular-cli.spec.ts

@@ -476,6 +476,121 @@ describe('Migration', () => {
       });
     });
 
+    it('should skip package group processing when ignorePackageGroup is true', async () => {
+      const migrator = new Migrator({
+        packageJson: {
+          name: 'some-workspace',
+          version: '0.0.0',
+          devDependencies: {
+            parent: '1.0.0',
+            '@my-company/nx-workspace': '1.0.0',
+            '@my-company/lib-1': '1.0.0',
+            '@my-company/lib-2': '1.0.0',
+          },
+        },
+        getInstalledPackageVersion: () => '1.0.0',
+        fetch: async (pkg) => {
+          if (pkg === 'parent') {
+            return {
+              version: '2.0.0',
+              packageJsonUpdates: {
+                version2: {
+                  version: '2.0.0',
+                  packages: {
+                    '@my-company/nx-workspace': {
+                      version: '2.0.0',
+                      ignorePackageGroup: true,
+                    },
+                  },
+                },
+              },
+            };
+          }
+          if (pkg === '@my-company/nx-workspace') {
+            return {
+              version: '2.0.0',
+              packageGroup: [
+                { package: '@my-company/lib-1', version: '^2.0.0' },
+                { package: '@my-company/lib-2', version: '^2.0.0' },
+              ],
+            };
+          }
+          return { version: '2.1.0' };
+        },
+        from: {},
+        to: {},
+      });
+
+      const result = await migrator.migrate('parent', '2.0.0');
+
+      // @my-company/nx-workspace should be updated but its package group should NOT be processed
+      expect(result.packageUpdates).toStrictEqual({
+        parent: { version: '2.0.0', addToPackageJson: false },
+        '@my-company/nx-workspace': {
+          version: '2.0.0',
+          addToPackageJson: false,
+        },
+      });
+      // lib-1 and lib-2 should NOT be in the updates because ignorePackageGroup was true
+      expect(result.packageUpdates['@my-company/lib-1']).toBeUndefined();
+      expect(result.packageUpdates['@my-company/lib-2']).toBeUndefined();
+    });
+
+    it('should skip migration collection when ignoreMigrations is true', async () => {
+      const migrator = new Migrator({
+        packageJson: {
+          name: 'some-workspace',
+          version: '0.0.0',
+          devDependencies: {
+            parent: '1.0.0',
+            child: '1.0.0',
+          },
+        },
+        getInstalledPackageVersion: () => '1.0.0',
+        fetch: async (pkg) => {
+          if (pkg === 'parent') {
+            return {
+              version: '2.0.0',
+              packageJsonUpdates: {
+                version2: {
+                  version: '2.0.0',
+                  packages: {
+                    child: {
+                      version: '2.0.0',
+                      ignoreMigrations: true,
+                    },
+                  },
+                },
+              },
+            };
+          }
+          if (pkg === 'child') {
+            return {
+              version: '2.0.0',
+              generators: {
+                'child-migration': {
+                  version: '2.0.0',
+                  description: 'A migration that should be skipped',
+                  factory: './migrations/child-migration',
+                },
+              },
+            };
+          }
+          return { version: '2.0.0' };
+        },
+        from: {},
+        to: {},
+      });
+
+      const result = await migrator.migrate('parent', '2.0.0');
+
+      // child package should be updated
+      expect(result.packageUpdates['child']).toBeDefined();
+      expect(result.packageUpdates['child'].version).toBe('2.0.0');
+      // But migrations from child should NOT be collected
+      expect(result.migrations).toEqual([]);
+    });
+
     it('should properly handle cyclic dependency in nested packageGroup', async () => {
       const migrator = new Migrator({
         packageJson: {

packages/angular/src/migrations/update-22-3-0/update-angular-cli.ts

@@ -193,6 +193,10 @@ export class Migrator {
   private async createMigrateJson() {
     const migrations = await Promise.all(
       Object.keys(this.packageUpdates).map(async (packageName) => {
+        if (this.packageUpdates[packageName].ignoreMigrations) {
+          return [];
+        }
+
         const currentVersion = this.getPkgVersion(packageName);
         if (currentVersion === null) return [];
 
@@ -279,6 +283,7 @@ export class Migrator {
       this.addPackageUpdate(targetPackage, {
         version: target.version,
         addToPackageJson: target.addToPackageJson || false,
+        ...(target.ignoreMigrations && { ignoreMigrations: true }),
       });
       return [];
     }
@@ -308,13 +313,15 @@ export class Migrator {
     this.addPackageUpdate(targetPackage, {
       version: migrationConfig.version,
       addToPackageJson: target.addToPackageJson || false,
+      ...(target.ignoreMigrations && { ignoreMigrations: true }),
     });
 
     const { packageJsonUpdates, packageGroupOrder } =
       this.getPackageJsonUpdatesFromMigrationConfig(
         targetPackage,
         targetVersion,
-        migrationConfig
+        migrationConfig,
+        target.ignorePackageGroup
       );
 
     if (!Object.keys(packageJsonUpdates).length) {
@@ -359,7 +366,8 @@ export class Migrator {
   private getPackageJsonUpdatesFromMigrationConfig(
     packageName: string,
     targetVersion: string,
-    migrationConfig: ResolvedMigrationConfiguration
+    migrationConfig: ResolvedMigrationConfiguration,
+    ignorePackageGroup?: boolean
   ): {
     packageJsonUpdates: PackageJsonUpdates;
     packageGroupOrder: string[];
@@ -368,7 +376,8 @@ export class Migrator {
       this.getPackageJsonUpdatesFromPackageGroup(
         packageName,
         targetVersion,
-        migrationConfig
+        migrationConfig,
+        ignorePackageGroup
       );
 
     if (
@@ -398,8 +407,13 @@ export class Migrator {
   private getPackageJsonUpdatesFromPackageGroup(
     packageName: string,
     targetVersion: string,
-    migrationConfig: ResolvedMigrationConfiguration
+    migrationConfig: ResolvedMigrationConfiguration,
+    ignorePackageGroup?: boolean
   ) {
+    if (ignorePackageGroup) {
+      return [];
+    }
+
     const packageGroup: ArrayPackageGroup =
       packageName === '@nrwl/workspace' && lt(targetVersion, '14.0.0-beta.0')
         ? LEGACY_NRWL_PACKAGE_GROUP
@@ -480,6 +494,12 @@ export class Migrator {
                 ? packageUpdate.alwaysAddToPackageJson
                 : 'dependencies'
               : packageUpdate.addToPackageJson || false,
+            ...(packageUpdate.ignorePackageGroup && {
+              ignorePackageGroup: true,
+            }),
+            ...(packageUpdate.ignoreMigrations && {
+              ignoreMigrations: true,
+            }),
           };
         }
       }

packages/nuxt/src/generators/application/application.spec.ts

@@ -54,6 +54,8 @@ export interface PackageJsonUpdateForPackage {
   ifPackageInstalled?: string;
   alwaysAddToPackageJson?: boolean | Dependencies;
   addToPackageJson?: boolean | Dependencies;
+  ignorePackageGroup?: boolean;
+  ignoreMigrations?: boolean;
 }
 
 export type PackageJsonUpdates = {