@nx/angular 0.0.0-pr-30715-a5f5e3b → 0.0.0-pr-31313-387cdca

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function removeDeadCodeFromRemote(tree: Tree, options: NormalizedOptions): void;
+import { Schema } from '../schema';
+export declare function removeDeadCodeFromRemote(tree: Tree, options: Schema): void;

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js

@@ -5,50 +5,46 @@ const devkit_1 = require("@nx/devkit");
 function removeDeadCodeFromRemote(tree, options) {
     const projectName = options.appName;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const { appComponentInfo, nxWelcomeComponentInfo, entryModuleFileName } = options;
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
-        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);
+        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
         if (tree.exists(pathToComponentStyle)) {
             tree.delete(pathToComponentStyle);
         }
     });
-    tree.rename(nxWelcomeComponentInfo.path, (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/remote-entry/${nxWelcomeComponentInfo.fileName}`));
-    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.spec.ts`));
-    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `app/${appComponentInfo.extensionlessFileName}.html`));
+    tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/nx-welcome.component.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/remote-entry/nx-welcome.component.ts'));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.spec.ts'));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.html'));
+    const pathToAppComponent = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.ts');
     if (!options.standalone) {
-        const componentContents = tree.read(appComponentInfo.path, 'utf-8');
+        const componentContents = tree.read(pathToAppComponent, 'utf-8');
         const isInlineTemplate = !componentContents.includes('templateUrl');
         const component = componentContents.split(isInlineTemplate ? 'template' : 'templateUrl')[0] +
             `template: '<router-outlet></router-outlet>'
 
 })
-export class ${appComponentInfo.symbolName} {}`;
-        tree.write(appComponentInfo.path, component);
-        let modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
-        if (!tree.exists(modulePath)) {
-            modulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
-        }
-        tree.write(modulePath, `import { NgModule } from '@angular/core';
+export class AppComponent {}`;
+        tree.write(pathToAppComponent, component);
+        tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts'), `import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule } from '@angular/router';
-import { ${appComponentInfo.symbolName} } from './${appComponentInfo.extensionlessFileName}';
+import { AppComponent } from './app.component';
 
 @NgModule({
-  declarations: [${appComponentInfo.symbolName}],
+  declarations: [AppComponent],
   imports: [
     BrowserModule,
     RouterModule.forRoot([{
       path: '',
-      loadChildren: () => import('./remote-entry/${entryModuleFileName}').then(m => m.RemoteEntryModule)
+      loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)
     }], { initialNavigation: 'enabledBlocking' }),
   ],
   providers: [],
-  bootstrap: [${appComponentInfo.symbolName}],
+  bootstrap: [AppComponent],
 })
 export class AppModule {}`);
     }
     else {
-        tree.delete(appComponentInfo.path);
+        tree.delete(pathToAppComponent);
         const pathToIndexHtml = project.targets.build.options.index;
         const indexContents = tree.read(pathToIndexHtml, 'utf-8');
         const rootSelectorRegex = new RegExp(`${options.prefix || 'app'}-root`, 'ig');

package/src/generators/setup-mf/lib/setup-host-if-dynamic.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupHostIfDynamic = setupHostIfDynamic;
 const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../utils/version-utils");
 function setupHostIfDynamic(tree, options) {
     if (options.federationType === 'static') {
         return;
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
-    const pathToMFManifest = (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json');
+    const pathToMFManifest = angularMajorVersion >= 18
+        ? (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json')
+        : (0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets/module-federation.manifest.json');
     if (!tree.exists(pathToMFManifest)) {
         tree.write(pathToMFManifest, '{}');
     }

package/src/generators/setup-mf/lib/setup-tspath-for-remote.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function setupTspathForRemote(tree: Tree, options: NormalizedOptions): void;
+import type { Schema } from '../schema';
+export declare function setupTspathForRemote(tree: Tree, options: Schema): void;

package/src/generators/setup-mf/lib/setup-tspath-for-remote.js

@@ -7,7 +7,7 @@ function setupTspathForRemote(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     const exportPath = options.standalone
         ? `./src/app/remote-entry/entry.routes.ts`
-        : `./src/app/remote-entry/${options.entryModuleFileName}.ts`;
+        : `./src/app/remote-entry/entry.module.ts`;
     const exportName = options.standalone ? 'Routes' : 'Module';
     (0, js_1.addTsConfigPath)(tree, `${options.appName.replace(/-/g, '_')}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),

package/src/generators/setup-mf/lib/update-host-app-routes.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function updateHostAppRoutes(tree: Tree, options: NormalizedOptions): void;
+import type { Schema } from '../schema';
+export declare function updateHostAppRoutes(tree: Tree, options: Schema): void;

package/src/generators/setup-mf/lib/update-host-app-routes.js

@@ -3,34 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateHostAppRoutes = updateHostAppRoutes;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
+const version_utils_1 = require("../../utils/version-utils");
 function updateHostAppRoutes(tree, options) {
     const { sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
-    const { appComponentInfo, nxWelcomeComponentInfo } = options;
-    tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app', `${appComponentInfo.extensionlessFileName}.html`), `<ul class="remote-menu">
+    tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html'), `<ul class="remote-menu">
 <li><a routerLink="/">Home</a></li>
 </ul>
 <router-outlet></router-outlet>
 `);
     let pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
-    if (!tree.exists(pathToHostRootRoutingFile)) {
+    let hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
+    if (!hostRootRoutingFile) {
         pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing.module.ts');
-    }
-    if (!tree.exists(pathToHostRootRoutingFile)) {
-        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing-module.ts');
+        hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
     }
     (0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
       path: '',
-      component: ${nxWelcomeComponentInfo.symbolName}
+      component: NxWelcomeComponent
     }`);
-    tree.write(pathToHostRootRoutingFile, `import { ${nxWelcomeComponentInfo.symbolName} } from './${nxWelcomeComponentInfo.extensionlessFileName}';
+    tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './nx-welcome.component';
 ${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/host-files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
         appName: options.appName,
         standalone: options.standalone,
-        appFileName: appComponentInfo.extensionlessFileName,
-        appSymbolName: appComponentInfo.symbolName,
-        nxWelcomeFileName: nxWelcomeComponentInfo.extensionlessFileName,
-        nxWelcomeSymbolName: nxWelcomeComponentInfo.symbolName,
+        useRouterTestingModule: angularMajorVersion < 18,
         tmpl: '',
     });
 }

package/src/generators/setup-mf/lib/update-tsconfig.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function updateTsConfig(tree: Tree, options: NormalizedOptions): void;
+import type { Schema } from '../schema';
+export declare function updateTsConfig(tree: Tree, schema: Schema): void;

package/src/generators/setup-mf/lib/update-tsconfig.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = updateTsConfig;
 const devkit_1 = require("@nx/devkit");
-function updateTsConfig(tree, options) {
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
+function updateTsConfig(tree, schema) {
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.appName);
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(root, `tsconfig.app.json`), (json) => {
         json.compilerOptions ??= {};
         json.compilerOptions.target = 'ES2020';
-        if (options.mfType === 'remote') {
+        if (schema.mfType === 'remote') {
             json.files ??= [];
-            json.files.push(options.standalone
+            json.files.push(schema.standalone
                 ? 'src/app/remote-entry/entry.routes.ts'
-                : `src/app/remote-entry/${options.entryModuleFileName}.ts`);
+                : 'src/app/remote-entry/entry.module.ts');
         }
         return json;
     });

package/src/generators/setup-mf/schema.d.ts

@@ -1,5 +1,3 @@
-import type { ComponentMetadata } from '../utils/app-components-info';
-
 type FederationType = 'static' | 'dynamic';
 
 export interface Schema {
@@ -23,9 +21,4 @@ export interface Schema {
 export interface NormalizedOptions extends Schema {
   federationType: FederationType;
   prefix: string | undefined;
-  componentType: string;
-  componentFileSuffix: string;
-  entryModuleFileName: string;
-  appComponentInfo: ComponentMetadata;
-  nxWelcomeComponentInfo: ComponentMetadata;
 }

package/src/generators/setup-ssr/lib/add-dependencies.js

@@ -2,20 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = addDependencies;
 const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function addDependencies(tree, isUsingApplicationBuilder) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const dependencies = {
-        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/platform-server') ??
-            pkgVersions.angularVersion,
+        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
+            ?.version ?? pkgVersions.angularVersion,
         express: pkgVersions.expressVersion,
     };
     const devDependencies = {
         '@types/express': pkgVersions.typesExpressVersion,
     };
     dependencies['@angular/ssr'] =
-        (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
-    if (!isUsingApplicationBuilder) {
+        (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular-devkit/build-angular')
+            ?.version ?? pkgVersions.angularDevkitVersion;
+    if (!isUsingApplicationBuilder && (0, semver_1.gte)(angularVersion, '17.1.0')) {
         devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -14,16 +14,9 @@ function addHydration(tree, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
-    let pathToClientConfigFile;
-    if (options.standalone) {
-        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts');
-    }
-    else {
-        pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
-        if (!tree.exists(pathToClientConfigFile)) {
-            pathToClientConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app-module.ts');
-        }
-    }
+    const pathToClientConfigFile = options.standalone
+        ? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts')
+        : (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
     const sourceText = tree.read(pathToClientConfigFile, 'utf-8');
     let sourceFile = tsModule.createSourceFile(pathToClientConfigFile, sourceText, tsModule.ScriptTarget.Latest, true);
     const provideClientHydrationCallExpression = tsquery(sourceFile, 'ObjectLiteralExpression PropertyAssignment:has(Identifier[name=providers]) ArrayLiteralExpression CallExpression:has(Identifier[name=provideClientHydration])')[0];

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -14,13 +14,8 @@ function addServerFile(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
     let pathToFiles;
-    if (angularMajorVersion >= 20) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v20+', options.isUsingApplicationBuilder
-            ? 'application-builder'
-            : 'server-builder', 'server');
-    }
-    else if (angularMajorVersion === 19) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', options.isUsingApplicationBuilder
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', options.isUsingApplicationBuilder
             ? 'application-builder' +
                 (options.serverRouting ? '' : '-common-engine')
             : 'server-builder', 'server');

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

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const semver_1 = require("semver");
-const app_components_info_1 = require("../../utils/app-components-info");
-const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
 function generateSSRFiles(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (project.targets.server ||
@@ -18,13 +16,8 @@ function generateSSRFiles(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
     let pathToFiles;
-    if (angularMajorVersion >= 20) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v20+', options.isUsingApplicationBuilder
-            ? 'application-builder'
-            : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
-    }
-    else if (angularMajorVersion === 19) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', options.isUsingApplicationBuilder
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', options.isUsingApplicationBuilder
             ? 'application-builder'
             : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
@@ -36,20 +29,14 @@ function generateSSRFiles(tree, options) {
     const cleanedSsrVersion = ssrVersion
         ? (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);
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,
         provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
             ? 'provideServerRouting'
             : 'provideServerRoutesConfig',
-        appFileName: appComponentInfo.extensionlessFileName,
-        appSymbolName: appComponentInfo.symbolName,
-        moduleTypeSeparator,
         tpl: '',
     });
-    if (angularMajorVersion === 19 && !options.serverRouting) {
+    if (angularMajorVersion >= 19 && !options.serverRouting) {
         tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }
 }

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -34,11 +34,8 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         !!packageJson.devDependencies?.['@angular/localize'];
     const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
     let pathToFiles;
-    if (angularMajorVersion >= 20) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v20+', 'server-builder', 'root');
-    }
-    else if (angularMajorVersion === 19) {
-        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19', 'server-builder', 'root');
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', 'server-builder', 'root');
     }
     else {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'root');

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

@@ -12,7 +12,7 @@ async function normalizeOptions(tree, options) {
         targets.build.executor === '@nx/angular:application';
     if (options.serverRouting === undefined && isUsingApplicationBuilder) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if (angularMajorVersion === 19) {
+        if (angularMajorVersion >= 19) {
             options.serverRouting = await (0, prompt_1.promptWhenInteractive)({
                 type: 'confirm',
                 name: 'serverRouting',
@@ -21,7 +21,7 @@ async function normalizeOptions(tree, options) {
             }, { serverRouting: false }).then(({ serverRouting }) => serverRouting);
         }
         else {
-            options.serverRouting = angularMajorVersion >= 20;
+            options.serverRouting = false;
         }
     }
     else if (options.serverRouting !== undefined &&

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

@@ -21,11 +21,6 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
         }
         else {
             outputPath = outputPath.base;
-            if (buildTarget.outputs && buildTarget.outputs.length > 0) {
-                buildTarget.outputs = buildTarget.outputs.map((output) => output === '{options.outputPath.base}'
-                    ? '{options.outputPath}'
-                    : output);
-            }
         }
     }
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);

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

@@ -8,8 +8,8 @@ function validateOptions(tree, options) {
     validateProject(tree, options.project);
     validateBuildTarget(tree, options.project);
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    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 (angularMajorVersion < 19 && options.serverRouting) {
+        throw new Error(`The "serverRouting" option is only supported in Angular versions >= 19.0.0. You are using Angular ${angularVersion}.`);
     }
 }
 function validateProject(tree, project) {

package/src/generators/setup-ssr/schema.json

@@ -53,7 +53,7 @@
       "default": true
     },
     "serverRouting": {
-      "description": "Creates a server application using the Server Routing and App Engine APIs for application using the `application` builder (Developer Preview). _Note: this is only supported in Angular versions 19.x.x_. From Angular 20 onwards, SSR will always enable server routing when using the `application` builder.",
+      "description": "Creates a server application using the Server Routing and App Engine APIs (Developer Preview). _Note: this is only supported in Angular versions >= 19.0.0_.",
       "type": "boolean"
     },
     "skipFormat": {

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

@@ -3,15 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = addJest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-const version_utils_1 = require("./version-utils");
 async function addJest(tree, options) {
     if (!options.skipPackageJson) {
         process.env.npm_config_legacy_peer_deps ??= 'true';
-        const pkgVersions = (0, version_utils_1.versions)(tree);
-        (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
-            '@angular/platform-browser-dynamic': pkgVersions.angularVersion,
-        }, { 'jest-preset-angular': pkgVersions.jestPresetAngularVersion }, undefined, true);
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'jest-preset-angular': versions_1.jestPresetAngularVersion }, undefined, true);
     }
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
     await configurationGenerator(tree, {

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

@@ -0,0 +1 @@
+export declare function assertRspackIsCSR(bundler: 'webpack' | 'rspack', ssr: boolean, serverRouting: boolean): void;

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

@@ -0,0 +1,11 @@
+"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.');
+    }
+    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.js

@@ -24,12 +24,13 @@ function ensureAngularDependencies(tree) {
         dependencies['@angular/core'] = angularVersion;
         dependencies['@angular/forms'] = angularVersion;
         dependencies['@angular/platform-browser'] = angularVersion;
+        dependencies['@angular/platform-browser-dynamic'] = angularVersion;
         dependencies['@angular/router'] = angularVersion;
         dependencies.rxjs = rxjsVersion;
         dependencies.tslib = tsLibVersion;
         dependencies['zone.js'] = zoneJsVersion;
     }
-    const installedAngularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree);
+    const installedAngularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular');
     if (!installedAngularDevkitVersion) {
         /**
          * If `@angular-devkit/build-angular` is already installed, we assume the workspace
@@ -42,12 +43,8 @@ function ensureAngularDependencies(tree) {
     }
     // Ensure the `@nx/angular` peer dependencies are always installed.
     const angularDevkitVersion = installedAngularDevkitVersion ?? pkgVersions.angularDevkitVersion;
+    devDependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
     devDependencies['@angular-devkit/schematics'] = angularDevkitVersion;
     devDependencies['@schematics/angular'] = angularDevkitVersion;
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 20) {
-        devDependencies['@angular/build'] = angularDevkitVersion;
-        devDependencies['@angular-devkit/build-angular'] = angularDevkitVersion;
-    }
     return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies, undefined, true);
 }

package/src/generators/utils/export-scam.d.ts

@@ -4,7 +4,6 @@ export type GenerationOptions = {
     filePath: string;
     name: string;
     projectName: string;
-    modulePath: string;
     export?: boolean;
     inlineScam?: boolean;
 };

package/src/generators/utils/export-scam.js

@@ -27,7 +27,8 @@ function exportScam(tree, options) {
     let updatedEntryPointContent = (0, devkit_1.stripIndents) `${entryPointContent}
     export * from '${relativePathFromEntryPoint}';`;
     if (!options.inlineScam) {
-        const relativePathFromModule = (0, path_1.getRelativeImportToFile)(entryPointPath, options.modulePath);
+        const moduleFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${(0, devkit_1.names)(options.name).fileName}.module.ts`);
+        const relativePathFromModule = (0, path_1.getRelativeImportToFile)(entryPointPath, moduleFilePath);
         updatedEntryPointContent = (0, devkit_1.stripIndents) `${updatedEntryPointContent}
         export * from '${relativePathFromModule}';`;
     }

package/src/generators/utils/find-module.js

@@ -9,43 +9,38 @@ const js_1 = require("@nx/js");
 const insert_ngmodule_import_1 = require("./insert-ngmodule-import");
 let tsModule;
 function findModule(tree, path, module) {
-    const candidatePaths = [];
+    let modulePath = '';
     let pathToSearch = path;
     while (pathToSearch !== '.' && pathToSearch !== '/') {
         if (module) {
             const pathToModule = (0, devkit_1.joinPathFragments)(pathToSearch, module);
             if (tree.exists(pathToModule)) {
-                candidatePaths.push(pathToModule);
+                modulePath = pathToModule;
                 break;
             }
         }
         else {
             const potentialOptions = tree
                 .children(pathToSearch)
-                .filter((f) => f.endsWith('.module.ts') || f.endsWith('-module.ts'));
-            if (potentialOptions.length > 0) {
-                candidatePaths.push(...potentialOptions.map((p) => (0, devkit_1.joinPathFragments)(pathToSearch, p)));
+                .filter((f) => f.endsWith('.module.ts'));
+            if (potentialOptions.length > 1) {
+                throw new Error(`More than one NgModule was found. Please provide the NgModule you wish to use.`);
+            }
+            else if (potentialOptions.length === 1) {
+                modulePath = (0, devkit_1.joinPathFragments)(pathToSearch, potentialOptions[0]);
                 break;
             }
         }
         pathToSearch = (0, path_1.dirname)(pathToSearch);
     }
-    if (candidatePaths.length === 0) {
+    if (modulePath === '') {
         throw new Error('Could not find a declaring module file.');
     }
-    const modules = candidatePaths.filter((p) => {
-        const moduleContents = tree.read(p, 'utf-8');
-        return moduleContents.includes('@NgModule');
-    });
-    if (modules.length === 0) {
-        throw new Error(candidatePaths.length === 1
-            ? `Declaring module file (${candidatePaths[0]}) does not contain an @NgModule Declaration.`
-            : `Declaring module files (${candidatePaths.join(', ')}) do not contain an @NgModule Declaration.`);
-    }
-    if (modules.length > 1) {
-        throw new Error(`More than one NgModule was found. Please provide the NgModule you wish to use.`);
+    const moduleContents = tree.read(modulePath, 'utf-8');
+    if (!moduleContents.includes('@NgModule')) {
+        throw new Error(`Declaring module file (${modulePath}) does not contain an @NgModule Declaration.`);
     }
-    return modules[0];
+    return modulePath;
 }
 function addToNgModule(tree, path, modulePath, name, className, fileName, ngModuleProperty, 
 // TODO(leo): remove once all consumers are updated