@nx/angular 22.3.0-beta.2 → 22.3.0-beta.3

package/migrations.json

@@ -381,6 +381,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": {
@@ -2144,22 +2160,6 @@
           "alwaysAddToPackageJson": false
         }
       }
-    },
-    "22.3.0-jest": {
-      "version": "22.3.0-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"
-      },
-      "packages": {
-        "jest-preset-angular": {
-          "version": "~16.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.3.0-beta.2",
+  "version": "22.3.0-beta.3",
   "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": "22.3.0-beta.2",
-    "@nx/eslint": "22.3.0-beta.2",
-    "@nx/js": "22.3.0-beta.2",
-    "@nx/module-federation": "22.3.0-beta.2",
-    "@nx/rspack": "22.3.0-beta.2",
-    "@nx/web": "22.3.0-beta.2",
-    "@nx/webpack": "22.3.0-beta.2",
-    "@nx/workspace": "22.3.0-beta.2",
+    "@nx/devkit": "22.3.0-beta.3",
+    "@nx/eslint": "22.3.0-beta.3",
+    "@nx/js": "22.3.0-beta.3",
+    "@nx/module-federation": "22.3.0-beta.3",
+    "@nx/rspack": "22.3.0-beta.3",
+    "@nx/web": "22.3.0-beta.3",
+    "@nx/webpack": "22.3.0-beta.3",
+    "@nx/workspace": "22.3.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

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;
 }