@nx/angular 22.2.3 → 22.3.0-beta.0

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -4,7 +4,6 @@ exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplica
 exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -29,27 +28,18 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             }
         }
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
-    if (angularMajorVersion >= 19) {
-        buildTarget.options.ssr = {
-            entry: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
-        };
-        if (options.serverRouting) {
-            buildTarget.options.outputMode = 'server';
-        }
-        else {
-            buildTarget.options.prerender = true;
-        }
+    buildTarget.options.ssr = {
+        entry: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
+    };
+    if (options.serverRouting) {
+        buildTarget.options.outputMode = 'server';
     }
     else {
         buildTarget.options.prerender = true;
-        buildTarget.options.ssr = {
-            entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
-        };
     }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
@@ -65,7 +55,6 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
             configurations[key] = getServerOptions(options);
         }
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
@@ -74,7 +63,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
             : '@nx/angular:webpack-server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
-            main: (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : projectConfig.root, options.serverFileName),
+            main: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
             tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
             ...(buildTarget.options ? getServerOptions(buildTarget.options) : {}),
         },

package/src/generators/setup-ssr/lib/validate-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/validate-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAWjE"}
+{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/validate-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAyBjE"}

package/src/generators/setup-ssr/lib/validate-options.js

@@ -11,6 +11,15 @@ function validateOptions(tree, options) {
     if (angularMajorVersion !== 19 && options.serverRouting !== undefined) {
         throw new Error(`The "serverRouting" option is only supported in Angular versions 19.x.x. You are using Angular ${angularVersion}.`);
     }
+    if (options.serverRouting) {
+        const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+        const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
+            targets.build.executor === '@angular/build:application' ||
+            targets.build.executor === '@nx/angular:application';
+        if (!isUsingApplicationBuilder) {
+            throw new Error('Server routing APIs can only be added to a project using the "application" builder.');
+        }
+    }
 }
 function validateProject(tree, project) {
     (0, validations_1.validateProject)(tree, project);

package/src/generators/utils/add-jest.d.ts

@@ -4,6 +4,8 @@ export type AddJestOptions = {
     projectRoot: string;
     skipPackageJson: boolean;
     strict: boolean;
+    runtimeTsconfigFileName: 'tsconfig.app.json' | 'tsconfig.lib.json';
+    zoneless: boolean;
     addPlugin?: boolean;
 };
 export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

package/src/generators/utils/add-jest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,uBAAuB,EAAE,mBAAmB,GAAG,mBAAmB,CAAC;IACnE,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAkEf"}

package/src/generators/utils/add-jest.js

@@ -7,14 +7,18 @@ const version_utils_1 = require("./version-utils");
 async function addJest(tree, options) {
     if (!options.skipPackageJson) {
         const pkgVersions = (0, version_utils_1.versions)(tree);
+        const devDependencies = {
+            'jest-preset-angular': pkgVersions.jestPresetAngularVersion,
+        };
+        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        if (angularMajorVersion < 21) {
+            // force jest v29.7.0
+            devDependencies.jest = '^29.7.0';
+        }
         (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            // TODO(leo): jest-preset-angular still needs this until https://github.com/thymikee/jest-preset-angular/pull/3079 is merged
+            // TODO(leo): jest-preset-angular still needs this, it has it as a peer dependency
             '@angular/platform-browser-dynamic': pkgVersions.angularVersion,
-        }, {
-            // force jest v29.7.0, Angular doesn't support Jest v30 yet: https://github.com/angular/angular-cli/pull/30761
-            jest: '^29.7.0',
-            'jest-preset-angular': pkgVersions.jestPresetAngularVersion,
-        }, undefined, true);
+        }, devDependencies, undefined, true);
     }
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
     await configurationGenerator(tree, {
@@ -28,11 +32,37 @@ async function addJest(tree, options) {
         addExplicitTargets: !options.addPlugin,
     });
     const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
-    if (options.strict && tree.exists(setupFile)) {
-        const contents = tree.read(setupFile, 'utf-8');
-        tree.write(setupFile, contents.replace('setupZoneTestEnv();', `setupZoneTestEnv({
+    if (options.zoneless) {
+        tree.write(setupFile, getZonelessSetupFile(options.strict));
+    }
+    else {
+        tree.write(setupFile, getZoneSetupFile(options.strict));
+    }
+    const runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.runtimeTsconfigFileName);
+    if (tree.exists(runtimeTsconfigPath)) {
+        (0, devkit_1.updateJson)(tree, runtimeTsconfigPath, (json) => {
+            const excludeSet = new Set([
+                ...(json.exclude ?? []),
+                'src/test-setup.ts',
+            ]);
+            json.exclude = Array.from(excludeSet);
+            return json;
+        });
+    }
+}
+const strictTestEnvOptions = `{
   errorOnUnknownElements: true,
   errorOnUnknownProperties: true
-});`));
-    }
+}`;
+function getZonelessSetupFile(strict) {
+    return `import { setupZonelessTestEnv } from 'jest-preset-angular/setup-env/zoneless';
+
+setupZonelessTestEnv(${strict ? strictTestEnvOptions : ''});
+`;
+}
+function getZoneSetupFile(strict) {
+    return `import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
+
+setupZoneTestEnv(${strict ? strictTestEnvOptions : ''});
+`;
 }

package/src/generators/utils/add-vitest.d.ts

@@ -1,10 +1,19 @@
 import { type Tree } from '@nx/devkit';
-export type AddVitestOptions = {
+export type AddVitestAngularOptions = {
     name: string;
     projectRoot: string;
     skipPackageJson: boolean;
+    useNxUnitTestRunnerExecutor?: boolean;
+};
+export type AddVitestAnalogOptions = {
+    name: string;
+    projectRoot: string;
+    skipFormat: boolean;
+    skipPackageJson: boolean;
     strict: boolean;
+    zoneless: boolean;
     addPlugin?: boolean;
 };
-export declare function addVitest(tree: Tree, options: AddVitestOptions): Promise<void>;
+export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<void>;
+export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<void>;
 //# sourceMappingURL=add-vitest.d.ts.map

package/src/generators/utils/add-vitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,SAAS,CAC7B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAUpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAoCf"}

package/src/generators/utils/add-vitest.js

@@ -33,11 +33,61 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addVitest = addVitest;
+exports.addVitestAngular = addVitestAngular;
+exports.addVitestAnalog = addVitestAnalog;
 const devkit_1 = require("@nx/devkit");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("./version-utils");
-async function addVitest(tree, options) {
+async function addVitestAngular(tree, options) {
+    validateVitestVersion(tree);
+    const executor = options.useNxUnitTestRunnerExecutor
+        ? '@nx/angular:unit-test'
+        : '@angular/build:unit-test';
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    project.targets ??= {};
+    project.targets.test = { executor, options: {} };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[executor] ??= {
+        cache: true,
+        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
+            ? ['default', '^production']
+            : ['default', '^default'],
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    configureTypeScriptForVitest(tree, options.projectRoot);
+    addVitestScreenshotsToGitIgnore(tree);
+    if (!options.skipPackageJson) {
+        const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
+        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
+            pkgVersions.angularDevkitVersion;
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@angular/build': angularDevkitVersion,
+            jsdom: pkgVersions.jsdomVersion,
+            vitest: pkgVersions.vitestVersion,
+        }, undefined, true);
+    }
+}
+async function addVitestAnalog(tree, options) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (!options.skipPackageJson) {
+        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
+            (0, version_utils_1.versions)(tree).angularDevkitVersion;
+        const devDependencies = {
+            '@angular/build': angularDevkitVersion,
+        };
+        // Add compatible vitest/jsdom versions BEFORE calling configurationGenerator
+        // so that @nx/vitest respects existing versions
+        if (angularMajorVersion < 21) {
+            const pkgVersions = (0, version_utils_1.versions)(tree);
+            devDependencies['vitest'] = pkgVersions.vitestVersion;
+            devDependencies['jsdom'] = pkgVersions.jsdomVersion;
+        }
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
+    }
     (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
     const { configurationGenerator } = await Promise.resolve().then(() => __importStar(require('@nx/vitest/generators')));
     await configurationGenerator(tree, {
@@ -46,10 +96,127 @@ async function addVitest(tree, options) {
         testEnvironment: 'jsdom',
         coverageProvider: 'v8',
         addPlugin: options.addPlugin ?? false,
+        skipFormat: options.skipFormat,
+        skipPackageJson: options.skipPackageJson,
     });
-    if (!options.skipPackageJson) {
-        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
-            (0, version_utils_1.versions)(tree).angularDevkitVersion;
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': angularDevkitVersion }, undefined, true);
+    createAnalogSetupFile(tree, options, angularMajorVersion);
+}
+function validateVitestVersion(tree) {
+    let installedVitestVersion = null;
+    // Try to get the actual installed version from node_modules
+    try {
+        const { packageJson } = (0, devkit_internals_1.readModulePackageJson)('vitest');
+        installedVitestVersion = packageJson.version;
+    }
+    catch { }
+    const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
+    const requiredRange = pkgVersions.vitestVersion;
+    if (installedVitestVersion) {
+        if (!(0, semver_1.satisfies)(installedVitestVersion, requiredRange, {
+            includePrerelease: true,
+        })) {
+            throw new Error(`The installed vitest version "${installedVitestVersion}" is not compatible with the version range Angular requires: "${requiredRange}".`);
+        }
+        return;
+    }
+    // not installed, get it from package.json
+    installedVitestVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vitest');
+    if (!installedVitestVersion) {
+        // not declared anywhere, it'll be installed with the correct version
+        return;
+    }
+    if ((0, semver_1.valid)(installedVitestVersion)) {
+        if (!(0, semver_1.satisfies)(installedVitestVersion, requiredRange, {
+            includePrerelease: true,
+        })) {
+            throw new Error(`The installed vitest version "${installedVitestVersion}" is not compatible with the version range Angular requires: "${requiredRange}".`);
+        }
+    }
+    else if ((0, semver_1.validRange)(installedVitestVersion)) {
+        // it's a range from package.json, check if it intersects with the required range
+        if (!(0, semver_1.intersects)(installedVitestVersion, requiredRange, {
+            includePrerelease: true,
+        })) {
+            throw new Error(`The declared vitest version range "${installedVitestVersion}" does not overlap with the version range Angular requires: "${requiredRange}". When installed, this may cause compatibility issues.`);
+        }
+    }
+    else {
+        // it can be anything, we don't have a way to validate it
+        // log a warning and continue
+        devkit_1.logger.warn(`The declared vitest version "${installedVitestVersion}" is not a valid semver range, ` +
+            `so we can't validate if it's compatible with the version range Angular requires: "${requiredRange}". ` +
+            `The generation will continue, but you may encounter issues if the version is not compatible.`);
+    }
+}
+function configureTypeScriptForVitest(tree, projectRoot) {
+    (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.spec.json'), {
+        extends: './tsconfig.json',
+        compilerOptions: {
+            outDir: `${(0, devkit_1.offsetFromRoot)(projectRoot)}dist/out-tsc`,
+            types: ['vitest/globals'],
+        },
+        include: ['src/**/*.ts', 'src/**/*.d.ts'],
+    });
+    const projectTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    (0, devkit_1.updateJson)(tree, projectTsconfigPath, (json) => {
+        json.references ??= [];
+        if (!json.references.some((ref) => ref.path === './tsconfig.spec.json')) {
+            json.references.push({ path: './tsconfig.spec.json' });
+        }
+        return json;
+    });
+}
+function addVitestScreenshotsToGitIgnore(tree) {
+    if (tree.exists('.gitignore')) {
+        let content = tree.read('.gitignore', 'utf-8');
+        if (/^__screenshots__\/$/gm.test(content)) {
+            return;
+        }
+        content = `${content}\n__screenshots__/\n`;
+        tree.write('.gitignore', content);
+    }
+    else {
+        devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
+    }
+}
+function createAnalogSetupFile(tree, options, angularMajorVersion) {
+    let setupFile;
+    if (angularMajorVersion >= 21) {
+        setupFile = `import '@angular/compiler';
+import '@analogjs/vitest-angular/setup-snapshots';
+import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
+
+setupTestBed(${options.zoneless ? '' : '{ zoneless: false }'});
+`;
+    }
+    else if (angularMajorVersion === 20) {
+        setupFile = `import '@angular/compiler';
+import '@analogjs/vitest-angular/setup-zone';
+import {
+  BrowserTestingModule,
+  platformBrowserTesting,
+} from '@angular/platform-browser/testing';
+import { getTestBed } from '@angular/core/testing';
+
+getTestBed().initTestEnvironment(
+  BrowserTestingModule,
+  platformBrowserTesting(),
+);
+`;
+    }
+    else {
+        setupFile = `import '@analogjs/vitest-angular/setup-zone';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+import { getTestBed } from '@angular/core/testing';
+
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);
+`;
     }
+    tree.write((0, devkit_1.joinPathFragments)(options.projectRoot, 'src/test-setup.ts'), setupFile);
 }

package/src/generators/utils/assert-mf-utils.d.ts

@@ -1,2 +1,2 @@
-export declare function assertRspackIsCSR(bundler: 'webpack' | 'rspack', ssr: boolean, serverRouting: boolean): void;
+export declare function assertRspackIsCSR(bundler: 'webpack' | 'rspack', ssr: boolean): void;
 //# sourceMappingURL=assert-mf-utils.d.ts.map

package/src/generators/utils/assert-mf-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assert-mf-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/assert-mf-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,GAAG,QAAQ,EAC7B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,OAAO,QAYvB"}
+{"version":3,"file":"assert-mf-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/assert-mf-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ,EAAE,GAAG,EAAE,OAAO,QAM5E"}

package/src/generators/utils/assert-mf-utils.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertRspackIsCSR = assertRspackIsCSR;
-function assertRspackIsCSR(bundler, ssr, serverRouting) {
-    if (bundler === 'rspack' && serverRouting) {
-        throw new Error('Server Routing is not currently supported for Angular Rspack Module Federation. Please use webpack instead.');
-    }
+function assertRspackIsCSR(bundler, ssr) {
     if (bundler === 'rspack' && ssr) {
         throw new Error('SSR is not currently supported for Angular Rspack Module Federation. Please use webpack instead.');
     }

package/src/generators/utils/ensure-angular-dependencies.d.ts

@@ -1,3 +1,3 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
-export declare function ensureAngularDependencies(tree: Tree): GeneratorCallback;
+export declare function ensureAngularDependencies(tree: Tree, zoneless: boolean): GeneratorCallback;
 //# sourceMappingURL=ensure-angular-dependencies.d.ts.map

package/src/generators/utils/ensure-angular-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-angular-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/ensure-angular-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAuEvE"}
+{"version":3,"file":"ensure-angular-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/ensure-angular-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,OAAO,GAChB,iBAAiB,CA0EnB"}

package/src/generators/utils/ensure-angular-dependencies.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureAngularDependencies = ensureAngularDependencies;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("./version-utils");
-function ensureAngularDependencies(tree) {
+function ensureAngularDependencies(tree, zoneless) {
     const dependencies = {};
     const devDependencies = {};
     const pkgVersions = (0, version_utils_1.versions)(tree);
@@ -21,8 +21,6 @@ function ensureAngularDependencies(tree) {
             pkgVersions.rxjsVersion;
         const tsLibVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'tslib', packageJson) ??
             pkgVersions.tsLibVersion;
-        const zoneJsVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js', packageJson) ??
-            pkgVersions.zoneJsVersion;
         dependencies['@angular/common'] = angularVersion;
         dependencies['@angular/compiler'] = angularVersion;
         dependencies['@angular/core'] = angularVersion;
@@ -31,7 +29,11 @@ function ensureAngularDependencies(tree) {
         dependencies['@angular/router'] = angularVersion;
         dependencies.rxjs = rxjsVersion;
         dependencies.tslib = tsLibVersion;
-        dependencies['zone.js'] = zoneJsVersion;
+        if (!zoneless) {
+            const zoneJsVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js', packageJson) ??
+                pkgVersions.zoneJsVersion;
+            dependencies['zone.js'] = zoneJsVersion;
+        }
     }
     const installedAngularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree);
     if (!installedAngularDevkitVersion) {

package/src/generators/utils/storybook-ast/component-info.js

@@ -6,7 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const version_utils_1 = require("../version-utils");
 const module_info_1 = require("./module-info");
 let tsModule;
 let tsquery;
@@ -61,15 +60,8 @@ function getStandaloneComponents(tree, filePath) {
     }
     const fileContent = tree.read(filePath, 'utf-8');
     const ast = tsquery.ast(fileContent);
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 19) {
-        // in angular 18 and below, standalone: false is the default, so only
-        // components with standalone: true are considered standalone
-        const components = tsquery(ast, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression PropertyAssignment:has(Identifier[name=standalone]) > TrueKeyword) > Identifier', { visitAllChildren: true });
-        return components.map((component) => component.getText());
-    }
-    // in angular 19 and above, standalone: true is the default, so all components
-    // except those with standalone: false are considered standalone
+    // standalone: true is the default, so all components except those with
+    // standalone: false are considered standalone
     const standaloneComponentNodes = tsquery(ast, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression:not(:has(PropertyAssignment:has(Identifier[name=standalone]) > FalseKeyword))) > Identifier', { visitAllChildren: true });
     return standaloneComponentNodes.map((component) => component.getText());
 }

package/src/generators/utils/tsconfig-utils.d.ts

@@ -0,0 +1,13 @@
+import type { Tree } from '@nx/devkit';
+import type * as ts from 'typescript';
+/**
+ * Gets the resolved value of a specific compiler option from the TypeScript configuration hierarchy.
+ *
+ * @param tree - The file system tree
+ * @param tsConfigPath - Path to the tsconfig file to resolve
+ * @param optionName - Name of the compiler option to retrieve
+ * @returns The resolved value of the compiler option, or undefined if not set
+ */
+export declare function getDefinedCompilerOption(tree: Tree, tsConfigPath: string, optionName: keyof ts.CompilerOptions): any | undefined;
+export declare function readCompilerOptionsFromTsConfig(tree: Tree, tsConfigPath: string): ts.CompilerOptions;
+//# sourceMappingURL=tsconfig-utils.d.ts.map

package/src/generators/utils/tsconfig-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsconfig-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/tsconfig-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAAE,CAAC,eAAe,GACnC,GAAG,GAAG,SAAS,CAIjB;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,EAAE,CAAC,eAAe,CAgBpB"}

package/src/generators/utils/tsconfig-utils.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefinedCompilerOption = getDefinedCompilerOption;
+exports.readCompilerOptionsFromTsConfig = readCompilerOptionsFromTsConfig;
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const node_path_1 = require("node:path");
+/**
+ * Gets the resolved value of a specific compiler option from the TypeScript configuration hierarchy.
+ *
+ * @param tree - The file system tree
+ * @param tsConfigPath - Path to the tsconfig file to resolve
+ * @param optionName - Name of the compiler option to retrieve
+ * @returns The resolved value of the compiler option, or undefined if not set
+ */
+function getDefinedCompilerOption(tree, tsConfigPath, optionName) {
+    const compilerOptions = readCompilerOptionsFromTsConfig(tree, tsConfigPath);
+    return compilerOptions[optionName];
+}
+function readCompilerOptionsFromTsConfig(tree, tsConfigPath) {
+    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const tsSysFromTree = {
+        ...ts.sys,
+        readDirectory: () => [],
+        readFile: (path) => tree.read(path, 'utf-8'),
+        fileExists: (path) => tree.exists(path),
+    };
+    const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsConfigPath, tsSysFromTree.readFile).config, tsSysFromTree, (0, node_path_1.dirname)(tsConfigPath));
+    return parsed.options;
+}

package/src/generators/utils/version-utils.d.ts

@@ -1,5 +1,5 @@
 import { type Tree } from '@nx/devkit';
-import { type PackageCompatVersions, type PackageLatestVersions } from '../../utils/backward-compatible-versions';
+import { type PackageCompatVersions, type SupportedVersion, supportedVersions, type VersionMap } from '../../utils/backward-compatible-versions';
 export declare function getInstalledAngularDevkitVersion(tree: Tree): string | null;
 export declare function getInstalledAngularVersion(tree: Tree): string;
 export declare function getInstalledAngularMajorVersion(tree: Tree): number;
@@ -11,10 +11,20 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
     major: number;
     version: string;
 };
-export declare function versions(tree: Tree): PackageLatestVersions | PackageCompatVersions;
+export declare function versions(tree: Tree): PackageCompatVersions;
+export declare function versions<V extends SupportedVersion>(tree: Tree, options: {
+    minAngularMajorVersion: V;
+}): MinVersionReturnType<V>;
 /**
  * Temporary helper to abstract away the version of angular-rspack to be installed
  * until we stop supporting Angular 19.
  */
-export declare function getAngularRspackVersion(tree: Tree): string | null;
+export declare function getAngularRspackVersion(tree: Tree): string;
+type TakeUntil<Arr extends readonly any[], Target> = Arr extends readonly [
+    infer Head,
+    ...infer Rest
+] ? Head extends Target ? [Head] : [Head, ...TakeUntil<Rest, Target>] : [];
+type VersionsAtLeast<MinV extends SupportedVersion> = Extract<SupportedVersion, TakeUntil<typeof supportedVersions, MinV>[number]>;
+type MinVersionReturnType<MinV extends SupportedVersion> = VersionMap[VersionsAtLeast<MinV>];
+export {};
 //# sourceMappingURL=version-utils.d.ts.map

package/src/generators/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAO1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,GACT,qBAAqB,GAAG,qBAAqB,CAU/C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcjE"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,KAAK,UAAU,EAChB,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAO1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,qBAAqB,CAAC;AAC5D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,gBAAgB,EACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IAAE,sBAAsB,EAAE,CAAC,CAAA;CAAE,GACrC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAoB3B;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAQ1D;AAID,KAAK,SAAS,CAAC,GAAG,SAAS,SAAS,GAAG,EAAE,EAAE,MAAM,IAAI,GAAG,SAAS,SAAS;IACxE,MAAM,IAAI;IACV,GAAG,MAAM,IAAI;CACd,GACG,IAAI,SAAS,MAAM,GACjB,CAAC,IAAI,CAAC,GACN,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GACpC,EAAE,CAAC;AACP,KAAK,eAAe,CAAC,IAAI,SAAS,gBAAgB,IAAI,OAAO,CAC3D,gBAAgB,EAChB,SAAS,CAAC,OAAO,iBAAiB,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAClD,CAAC;AACF,KAAK,oBAAoB,CAAC,IAAI,SAAS,gBAAgB,IACrD,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC"}

package/src/generators/utils/version-utils.js

@@ -39,16 +39,14 @@ function getInstalledPackageVersionInfo(tree, pkgName) {
     const version = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
     return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
 }
-function versions(tree) {
+function versions(tree, options) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
-    switch (majorAngularVersion) {
-        case 18:
-            return backward_compatible_versions_1.backwardCompatibleVersions.angularV18;
-        case 19:
-            return backward_compatible_versions_1.backwardCompatibleVersions.angularV19;
-        default:
-            return latestVersions;
+    if (options?.minAngularMajorVersion &&
+        majorAngularVersion < options.minAngularMajorVersion) {
+        throw new Error(`This operation requires Angular ${options.minAngularMajorVersion}+, but found version ${majorAngularVersion}. ` +
+            `This shouldn't happen. Please report it as a bug and include the stack trace.`);
     }
+    return backward_compatible_versions_1.backwardCompatibleVersions[majorAngularVersion] ?? latestVersions;
 }
 /**
  * Temporary helper to abstract away the version of angular-rspack to be installed
@@ -56,14 +54,9 @@ function versions(tree) {
  */
 function getAngularRspackVersion(tree) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
-    if (majorAngularVersion === 19) {
-        return backward_compatible_versions_1.backwardCompatibleVersions.angularV19.angularRspackVersion;
-    }
-    if (majorAngularVersion >= 20) {
-        // Starting with Angular 20, we can use an Angular Rspack version that is
-        // aligned with the Nx version
-        return latestVersions.nxVersion;
-    }
-    // Lower versions of Angular are not supported
-    return null;
+    // Starting with Angular 20, we can use an Angular Rspack version that is
+    // aligned with the Nx version
+    return majorAngularVersion === 19
+        ? backward_compatible_versions_1.backwardCompatibleVersions[19].angularRspackVersion
+        : latestVersions.nxVersion;
 }

package/src/migrations/update-21-2-0/update-module-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-module-resolution.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-module-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAW1E,yBAA+B,IAAI,EAAE,IAAI,iBA0BxC"}
+{"version":3,"file":"update-module-resolution.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-module-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAkBpB,yBAA+B,IAAI,EAAE,IAAI,iBAqCxC"}