@nx/angular 0.0.0-pr-33838-05b9549 → 0.0.0-pr-34018-741bc4e

package/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": {
@@ -381,6 +373,22 @@
       },
       "description": "Update 'vitest' unit test runner option to 'vitest-analog' in generator defaults.",
       "factory": "./src/migrations/update-22-3-0/update-unit-test-runner-option"
+    },
+    "set-isolated-modules-22-3-0": {
+      "version": "22.3.0-beta.3",
+      "requires": {
+        "@angular/core": ">=21.0.0"
+      },
+      "description": "Set 'isolatedModules' to 'true' in TypeScript test configurations for Angular projects.",
+      "factory": "./src/migrations/update-22-3-0/set-isolated-modules"
+    },
+    "update-jest-preset-angular-setup": {
+      "version": "22.3.0-beta.3",
+      "requires": {
+        "@angular/core": ">=21.0.0"
+      },
+      "description": "Replace 'jest-preset-angular/setup-jest' imports with the new 'setupZoneTestEnv' function.",
+      "factory": "./src/migrations/update-22-3-0/update-jest-preset-angular-setup"
     }
   },
   "packageJsonUpdates": {
@@ -1996,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
@@ -2145,18 +2159,14 @@
         }
       }
     },
-    "22.3.0-jest": {
-      "version": "22.3.0-beta.0",
+    "22.3.2-ngrx": {
+      "version": "22.3.2-beta.0",
       "requires": {
-        "@angular/compiler-cli": ">=19.0.0 <22.0.0",
-        "@angular/core": ">=19.0.0 <22.0.0",
-        "@angular/platform-browser": ">=19.0.0 <22.0.0",
-        "@angular/platform-browser-dynamic": ">=19.0.0 <22.0.0",
-        "jest": "^30.0.0"
+        "@angular/core": "^21.0.0"
       },
       "packages": {
-        "jest-preset-angular": {
-          "version": "~16.0.0",
+        "@ngrx/store": {
+          "version": "^21.0.0",
           "alwaysAddToPackageJson": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-33838-05b9549",
+  "version": "0.0.0-pr-34018-741bc4e",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -62,14 +62,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-33838-05b9549",
-    "@nx/eslint": "0.0.0-pr-33838-05b9549",
-    "@nx/js": "0.0.0-pr-33838-05b9549",
-    "@nx/module-federation": "0.0.0-pr-33838-05b9549",
-    "@nx/rspack": "0.0.0-pr-33838-05b9549",
-    "@nx/web": "0.0.0-pr-33838-05b9549",
-    "@nx/webpack": "0.0.0-pr-33838-05b9549",
-    "@nx/workspace": "0.0.0-pr-33838-05b9549",
+    "@nx/devkit": "0.0.0-pr-34018-741bc4e",
+    "@nx/eslint": "0.0.0-pr-34018-741bc4e",
+    "@nx/js": "0.0.0-pr-34018-741bc4e",
+    "@nx/module-federation": "0.0.0-pr-34018-741bc4e",
+    "@nx/rspack": "0.0.0-pr-34018-741bc4e",
+    "@nx/web": "0.0.0-pr-34018-741bc4e",
+    "@nx/webpack": "0.0.0-pr-34018-741bc4e",
+    "@nx/workspace": "0.0.0-pr-34018-741bc4e",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/builders/dev-server/lib/validate-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/builders/dev-server/lib/validate-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CASrD"}
+{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/builders/dev-server/lib/validate-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAUrD"}

package/src/builders/dev-server/lib/validate-options.js

@@ -4,10 +4,10 @@ exports.validateOptions = validateOptions;
 const devkit_1 = require("@nx/devkit");
 const angular_version_utils_1 = require("../../../executors/utilities/angular-version-utils");
 function validateOptions(options) {
-    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     if (angularMajorVersion < 21) {
-        if (options.define) {
-            throw new Error((0, devkit_1.stripIndents) `The "define" option is only supported in Angular >= 21.0.0. You are currently using "${angularMajorVersion}".
+        if (options.define && Object.keys(options.define).length > 0) {
+            throw new Error((0, devkit_1.stripIndents) `The "define" option is only supported in Angular >= 21.0.0. You are currently using "${angularVersion}".
         You can resolve this error by removing the "define" option or by migrating to Angular 21.0.0.`);
         }
     }

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAgBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CA+C5B;AAmJD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAsD5B;AAoJD,eAAe,6BAA6B,CAAC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 const devkit_1 = require("@nx/devkit");
@@ -10,6 +43,7 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
+const semver_1 = require("semver");
 const webpackExecutors = new Set([
     '@nx/angular:webpack-browser',
     '@nrwl/angular:webpack-browser',
@@ -27,8 +61,8 @@ const esbuildExecutors = new Set([
  * storybook + cypress then use the componentCypressGenerator instead.
  */
 async function cypressComponentConfiguration(tree, options) {
+    const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    // Cypress Component Testing requires Zone.js
     let isZoneless;
     if (projectConfig.projectType === 'application') {
         // For applications, check the polyfills in the build target
@@ -39,11 +73,16 @@ async function cypressComponentConfiguration(tree, options) {
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
     if (isZoneless) {
-        throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects yet. ` +
-            `The project "${options.project}" is configured without Zone.js. ` +
-            `See https://github.com/cypress-io/cypress/issues/31504.`);
+        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/src/utils/versions')));
+        const installedCypressVersion = getInstalledCypressVersion(tree);
+        // Zoneless support was introduced in Cypress 15.8.0
+        // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
+        if (installedCypressVersion && (0, semver_1.lt)(installedCypressVersion, '15.8.0')) {
+            throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects for your installed Cypress version (${installedCypressVersion}). ` +
+                `The project "${options.project}" is configured without Zone.js. ` +
+                `Please upgrade Cypress to version 15.8.0 or higher.`);
+        }
     }
-    const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const tasks = [];
     tasks.push(await baseCyCTConfig(tree, {
         project: options.project,
@@ -53,7 +92,7 @@ async function cypressComponentConfiguration(tree, options) {
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
-    tasks.push(await addFiles(tree, projectConfig, options));
+    tasks.push(await addFiles(tree, projectConfig, options, isZoneless));
     if (projectConfig.projectType === 'application') {
         (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
     }
@@ -62,11 +101,11 @@ async function cypressComponentConfiguration(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-async function addFiles(tree, projectConfig, options) {
+async function addFiles(tree, projectConfig, options, isZoneless) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const { addMountDefinition } = require('@nx/cypress/src/utils/config');
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
-    tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
+    tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
         return () => { };
     }

package/src/generators/library/lib/normalize-options.js

@@ -17,7 +17,7 @@ async function normalizeOptions(host, schema) {
         // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
         compilationMode: schema.publishable
             ? 'partial'
-            : schema.compilationMode ?? 'full',
+            : (schema.compilationMode ?? 'full'),
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };

package/src/generators/ng-add/utilities/dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,IAAI,EAAE,MAAM,YAAY,CAAC;AAI1E,wBAAgB,+CAA+C,CAC7D,IAAI,EAAE,IAAI,GACT,IAAI,CA4BN"}
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,IAAI,EAAE,MAAM,YAAY,CAAC;AAI1E,wBAAgB,+CAA+C,CAC7D,IAAI,EAAE,IAAI,GACT,IAAI,CA+BN"}

package/src/generators/ngrx/lib/normalize-options.js

@@ -22,7 +22,7 @@ function normalizeOptions(tree, options) {
             : options.parent
                 ? (0, path_1.dirname)(options.parent)
                 : undefined,
-        route: options.route === '' ? `''` : options.route ?? `''`,
+        route: options.route === '' ? `''` : (options.route ?? `''`),
         directory: (0, devkit_1.names)(options.directory).fileName,
         rxjsVersion,
         rxjsMajorVersion,

package/src/generators/ngrx-feature-store/lib/normalize-options.js

@@ -21,7 +21,7 @@ function normalizeOptions(tree, options) {
         name,
         subdirectory,
         parentDirectory: options.parent ? (0, path_1.dirname)(options.parent) : undefined,
-        route: options.route === '' ? `''` : options.route ?? `''`,
+        route: options.route === '' ? `''` : (options.route ?? `''`),
         directory: (0, devkit_1.names)(options.directory).fileName,
         rxjsVersion,
         rxjsMajorVersion,

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,EACxB,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,QAyDtB"}
+{"version":3,"file":"convert-scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,UAAU,EACxB,qBAAqB,EAAE,MAAM,EAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,EACxB,IAAI,EAAE,IAAI,EACV,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,MAAM,QA2DtB"}

package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js

@@ -11,7 +11,9 @@ function convertScamToStandalone(componentAST, componentFileContents, importsArr
     const componentDecoratorMetadataNode = tsquery(componentAST, COMPONENT_PROPERTY_SELECTOR, { visitAllChildren: true })[0];
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({
-    imports: [${importsArray.join(',')}],${providersArray.length > 0 ? `providers: [${providersArray.join(',')}],` : ''}${componentFileContents.slice(componentDecoratorMetadataNode.getStart() + 1, moduleNodes[0].getStart() - 1)}`;
+    imports: [${importsArray.join(',')}],${providersArray.length > 0
+        ? `providers: [${providersArray.join(',')}],`
+        : ''}${componentFileContents.slice(componentDecoratorMetadataNode.getStart() + 1, moduleNodes[0].getStart() - 1)}`;
     tree.write(normalizedComponentPath, newComponentContents);
     const componentPathParts = (0, path_1.parse)(normalizedComponentPath);
     const pathToComponentSpec = (0, devkit_1.joinPathFragments)(componentPathParts.dir, '/', `${componentPathParts.name}.spec.ts`);

package/src/generators/setup-ssr/lib/generate-files.js

@@ -32,7 +32,7 @@ function generateSSRFiles(tree, options) {
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
-        ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
+        ? ((0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version)
         : null;
     const componentType = (0, artifact_types_1.getComponentType)(tree);
     const appComponentInfo = (0, app_components_info_1.getAppComponentInfo)(tree, componentType ? `.${componentType}` : '', project);

package/src/generators/utils/entry-point.js

@@ -6,7 +6,7 @@ const path_1 = require("path");
 function locateLibraryEntryPointFromDirectory(tree, directory, projectRoot, projectSourceRoot) {
     const ngPackageJsonPath = (0, devkit_1.joinPathFragments)(directory, 'ng-package.json');
     let entryPointFile = tree.exists(ngPackageJsonPath)
-        ? (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib?.entryFile ?? 'src/public_api.ts'
+        ? ((0, devkit_1.readJson)(tree, ngPackageJsonPath).lib?.entryFile ?? 'src/public_api.ts')
         : null;
     if (entryPointFile) {
         return (0, devkit_1.joinPathFragments)(directory, entryPointFile);

package/src/generators/web-worker/lib/normalize-options.js

@@ -10,7 +10,7 @@ function normalizeOptions(tree, options) {
     if (projectType !== 'application') {
         throw new Error(`Web Worker can only be added to an application. Project '${options.project}' is a library.`);
     }
-    const path = options.path ?? sourceRoot
+    const path = (options.path ?? sourceRoot)
         ? (0, devkit_1.joinPathFragments)(sourceRoot, 'app')
         : (0, devkit_1.joinPathFragments)(root, 'src', 'app');
     if (!tree.exists(path)) {

package/src/migrations/update-22-3-0/set-isolated-modules.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=set-isolated-modules.d.ts.map

package/src/migrations/update-22-3-0/set-isolated-modules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"set-isolated-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/set-isolated-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAWpB,yBAA+B,IAAI,EAAE,IAAI,iBA6CxC"}

package/src/migrations/update-22-3-0/set-isolated-modules.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
+const targets_1 = require("../../utils/targets");
+const projects_1 = require("../utils/projects");
+async function default_1(tree) {
+    const uniqueSpecTsConfigs = new Set();
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@angular/core',
+        'npm:jest-preset-angular',
+    ]);
+    for (const graphNode of projects) {
+        const projectRoot = graphNode.data.root;
+        // add tsconfig.spec.json if it exists
+        const specTsConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.spec.json');
+        if (tree.exists(specTsConfigPath)) {
+            uniqueSpecTsConfigs.add(specTsConfigPath);
+        }
+        // look for tsConfig in @nx/jest:jest tasks in case there are any
+        // custom test tsconfig files
+        for (const [, target] of (0, targets_1.allProjectTargets)(graphNode.data)) {
+            if (target.executor !== '@nx/jest:jest') {
+                continue;
+            }
+            for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
+                if (typeof options?.tsConfig === 'string' &&
+                    tree.exists(options.tsConfig)) {
+                    uniqueSpecTsConfigs.add(options.tsConfig);
+                }
+            }
+        }
+    }
+    for (const tsConfig of uniqueSpecTsConfigs) {
+        setIsolatedModules(tree, tsConfig);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function setIsolatedModules(tree, tsConfigPath) {
+    const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
+    if (compilerOptions.isolatedModules === true) {
+        // already set to true
+        return;
+    }
+    // set isolatedModules to true
+    (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.isolatedModules = true;
+        return json;
+    });
+}

package/src/migrations/update-22-3-0/update-jest-preset-angular-setup.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-jest-preset-angular-setup.d.ts.map

package/src/migrations/update-22-3-0/update-jest-preset-angular-setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-jest-preset-angular-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-jest-preset-angular-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAG1E,yBAA+B,IAAI,EAAE,IAAI,iBA2ExC"}

package/src/migrations/update-22-3-0/update-jest-preset-angular-setup.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const projects_1 = require("../utils/projects");
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:jest-preset-angular',
+    ]);
+    if (!projects.length) {
+        return;
+    }
+    // The old 'jest-preset-angular/setup-jest' import only supported zone-based testing.
+    // Zoneless support was added in jest-preset-angular v14.3.0 with the new
+    // setupZonelessTestEnv function. Therefore, all projects using the old import
+    // were zone-based and should be migrated to setupZoneTestEnv.
+    // Regex patterns to match removed imports
+    // Matches: import 'jest-preset-angular/setup-jest'; (with optional .js/.mjs extension)
+    // Captures .mjs extension in group 3 to preserve it in the replacement
+    const setupJestImportRegex = /^(\s*)import\s+(['"`])jest-preset-angular\/setup-jest(?:\.js)?(\.mjs)?\2;?\s*$/gm;
+    // Matches: require('jest-preset-angular/setup-jest'); (with optional .js extension)
+    // Note: .mjs is not supported with require() so we don't capture it
+    const setupJestRequireRegex = /^(\s*)require\s*\(\s*(['"`])jest-preset-angular\/setup-jest(?:\.js)?\2\s*\)\s*;?\s*$/gm;
+    for (const project of projects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, project.data.root, (file) => {
+            if (!file.endsWith('.ts')) {
+                return;
+            }
+            let content = tree.read(file, 'utf-8');
+            if (!content.includes('jest-preset-angular/setup-jest')) {
+                return;
+            }
+            let wasUpdated = false;
+            // Replace import statements, preserving .mjs extension if present
+            setupJestImportRegex.lastIndex = 0;
+            if (setupJestImportRegex.test(content)) {
+                setupJestImportRegex.lastIndex = 0;
+                content = content.replace(setupJestImportRegex, (_match, _leadingWhitespace, _quote, mjsExt) => {
+                    const modulePath = mjsExt
+                        ? 'jest-preset-angular/setup-env/zone/index.mjs'
+                        : 'jest-preset-angular/setup-env/zone';
+                    return `import { setupZoneTestEnv } from '${modulePath}';
+
+setupZoneTestEnv();`;
+                });
+                wasUpdated = true;
+            }
+            // Replace require statements, keeping require syntax
+            setupJestRequireRegex.lastIndex = 0;
+            if (setupJestRequireRegex.test(content)) {
+                setupJestRequireRegex.lastIndex = 0;
+                content = content.replace(setupJestRequireRegex, `const { setupZoneTestEnv } = require('jest-preset-angular/setup-env/zone');
+
+setupZoneTestEnv();`);
+                wasUpdated = true;
+            }
+            if (wasUpdated) {
+                tree.write(file, content);
+            }
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/utils/file-change-recorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-change-recorder.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/file-change-recorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,qBAAa,kBAAkB;IAWjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAQ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAVlE,OAAO,CAAC,cAAc,CAAc;IAEpC,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;gBAE4B,IAAI,EAAE,IAAI,EAAmB,QAAQ,EAAE,MAAM;IAI1E,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,OAAO;IAIrB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAIhD,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAIjD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAI1C,uBAAuB,IAAI,IAAI;CAKhC"}
+{"version":3,"file":"file-change-recorder.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/file-change-recorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,qBAAa,kBAAkB;IAY3B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAZ3B,OAAO,CAAC,cAAc,CAAc;IAEpC,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;gBAGkB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM;IAKnC,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,OAAO;IAIrB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAIhD,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAIjD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAI1C,uBAAuB,IAAI,IAAI;CAKhC"}

package/src/utils/version-utils.js

@@ -9,12 +9,12 @@ const versions = tslib_1.__importStar(require("./versions"));
 const versions_1 = require("./versions");
 function getPkgVersionForAngularMajorVersion(pkgVersionName, angularMajorVersion) {
     return angularMajorVersion < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
-        ? backward_compatible_versions_1.backwardCompatibleVersions[angularMajorVersion]?.[pkgVersionName] ??
-            versions[pkgVersionName]
+        ? (backward_compatible_versions_1.backwardCompatibleVersions[angularMajorVersion]?.[pkgVersionName] ??
+            versions[pkgVersionName])
         : versions[pkgVersionName];
 }
 function getPkgVersionsForAngularMajorVersion(angularMajorVersion) {
     return angularMajorVersion < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
-        ? backward_compatible_versions_1.backwardCompatibleVersions[angularMajorVersion] ?? versions
+        ? (backward_compatible_versions_1.backwardCompatibleVersions[angularMajorVersion] ?? versions)
         : versions;
 }

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~21.0.0";
 export declare const angularDevkitVersion = "~21.0.0";
 export declare const ngPackagrVersion = "~21.0.0";
-export declare const ngrxVersion = "^20.0.0";
+export declare const ngrxVersion = "^21.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~21.0.0';
 exports.angularDevkitVersion = '~21.0.0';
 exports.ngPackagrVersion = '~21.0.0';
-exports.ngrxVersion = '^20.0.0';
+exports.ngrxVersion = '^21.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';
 exports.tsLibVersion = '^2.3.0';

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

@@ -1,4 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export declare const angularCliVersion = "~21.0.0";
-export default function (tree: Tree): Promise<void>;
-//# sourceMappingURL=update-angular-cli.d.ts.map

package/src/migrations/update-22-3-0/update-angular-cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}

package/src/migrations/update-22-3-0/update-angular-cli.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularCliVersion = void 0;
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~21.0.0';
-async function default_1(tree) {
-    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
-        await (0, devkit_1.formatFiles)(tree);
-    }
-}