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

package/src/generators/remote/remote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
@@ -10,8 +11,14 @@ const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 const lib_1 = require("./lib");
+const assert_mf_utils_1 = require("../utils/assert-mf-utils");
+const convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
 async function remote(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'remote');
+    // TODO: Replace with Rspack when confidence is high enough
+    schema.bundler ??= 'webpack';
+    const isRspack = schema.bundler === 'rspack';
+    (0, assert_mf_utils_1.assertRspackIsCSR)(schema.bundler, schema.ssr ?? false, schema.serverRouting ?? false);
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -75,6 +82,22 @@ async function remote(tree, schema) {
         installTasks.push(ssrInstallTask);
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    if (isRspack) {
+        await (0, convert_to_rspack_1.default)(tree, {
+            project: remoteProjectName,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, remoteProjectName);
+    project.targets.serve ??= {};
+    project.targets.serve.options ??= {};
+    if (options.host) {
+        project.targets.serve.dependsOn ??= [];
+        project.targets.serve.dependsOn.push(`${options.host}:serve`);
+    }
+    project.targets.serve.options.port = port;
+    (0, devkit_1.updateProjectConfiguration)(tree, remoteProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/remote/schema.d.ts

@@ -5,6 +5,7 @@ import type { Styles } from '../utils/types';
 export interface Schema {
   directory: string;
   name?: string;
+  bundler?: 'webpack' | 'rspack';
   host?: string;
   port?: number;
   setParserOptionsProject?: boolean;

package/src/generators/remote/schema.json

@@ -42,6 +42,12 @@
       "type": "number",
       "description": "The port on which this app should be served."
     },
+    "bundler": {
+      "type": "string",
+      "description": "The bundler to use for the remote application.",
+      "default": "webpack",
+      "enum": ["webpack", "rspack"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -165,7 +171,7 @@
       "default": false
     },
     "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"
     },
     "typescriptConfiguration": {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertComponentToScam = convertComponentToScam;
+const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
@@ -21,7 +22,8 @@ function convertComponentToScam(tree, options) {
         tree.write(options.filePath, updatedComponentSource);
         return;
     }
-    tree.write(options.modulePath, getModuleFileContent(options.symbolName, options.fileName));
+    const moduleFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${options.name}.module.ts`);
+    tree.write(moduleFilePath, getModuleFileContent(options.symbolName, options.fileName));
 }
 function getModuleFileContent(componentClassName, componentFileName) {
     return `import { NgModule } from '@angular/core';

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

@@ -3,27 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
-const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 20) {
-        options.type ??= 'component';
-    }
+    options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
-        suffix: options.type,
+        suffix: options.type ?? 'component',
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
     const { className } = (0, devkit_1.names)(name);
-    const suffixClassName = options.type ? (0, devkit_1.names)(options.type).className : '';
+    const { className: suffixClassName } = (0, devkit_1.names)(options.type);
     const symbolName = `${className}${suffixClassName}`;
     (0, validations_1.validateClassName)(symbolName);
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
-    const modulePath = (0, devkit_1.joinPathFragments)(directory, `${name}${moduleTypeSeparator}module.ts`);
     return {
         ...options,
         export: options.export ?? true,
@@ -34,6 +27,5 @@ async function normalizeOptions(tree, options) {
         name,
         symbolName,
         projectName,
-        modulePath,
     };
 }

package/src/generators/scam/schema.d.ts

@@ -26,5 +26,4 @@ export interface NormalizedSchema extends Schema {
   symbolName: string;
   export: boolean;
   inlineScam: boolean;
-  modulePath: string;
 }

package/src/generators/scam/schema.json

@@ -94,7 +94,8 @@
     },
     "type": {
       "type": "string",
-      "description": "Append a custom type to the component's filename. It defaults to 'component' for Angular versions below v20. For Angular v20 and above, no type is appended unless specified."
+      "description": "Adds a developer-defined type to the filename, in the format `name.type.ts`.",
+      "default": "component"
     },
     "prefix": {
       "type": "string",

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertDirectiveToScam = convertDirectiveToScam;
+const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
@@ -21,7 +22,8 @@ function convertDirectiveToScam(tree, options) {
         tree.write(options.filePath, updatedDirectiveSource);
         return;
     }
-    tree.write(options.modulePath, getModuleFileContent(options.symbolName, options.fileName));
+    const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${options.name}.module.ts`);
+    tree.write(scamFilePath, getModuleFileContent(options.symbolName, options.fileName));
 }
 function getModuleFileContent(directiveClassName, directiveFileName) {
     return `import { NgModule } from '@angular/core';

package/src/generators/scam-directive/lib/normalize-options.js

@@ -3,27 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
-const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 20) {
-        options.type ??= 'directive';
-    }
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
-        suffix: options.type,
+        suffix: 'directive',
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
     const { className } = (0, devkit_1.names)(name);
-    const suffixClassName = options.type ? (0, devkit_1.names)(options.type).className : '';
+    const { className: suffixClassName } = (0, devkit_1.names)('directive');
     const symbolName = `${className}${suffixClassName}`;
     (0, validations_1.validateClassName)(symbolName);
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
-    const modulePath = (0, devkit_1.joinPathFragments)(directory, `${name}${moduleTypeSeparator}module.ts`);
     return {
         ...options,
         export: options.export ?? true,
@@ -34,6 +26,5 @@ async function normalizeOptions(tree, options) {
         name,
         symbolName,
         projectName,
-        modulePath,
     };
 }

package/src/generators/scam-directive/schema.d.ts

@@ -6,7 +6,6 @@ export interface Schema {
   prefix?: string;
   selector?: string;
   export?: boolean;
-  type?: string;
   skipFormat?: boolean;
 }
 
@@ -19,5 +18,4 @@ export interface NormalizedSchema extends Schema {
   inlineScam: boolean;
   symbolName: string;
   projectName: string;
-  modulePath: string;
 }

package/src/generators/scam-directive/schema.json

@@ -10,15 +10,11 @@
       "command": "nx g @nx/angular:scam-directive mylib/src/lib/foo.directive.ts"
     },
     {
-      "description": "Generate a directive without providing the file extension. It results in the directive `Foo` at `mylib/src/lib/foo.ts`",
+      "description": "Generate a directive without providing the file extension. It results in the directive `FooDirective` at `mylib/src/lib/foo.directive.ts`",
       "command": "nx g @nx/angular:scam-directive mylib/src/lib/foo"
     },
     {
-      "description": "Generate a directive with a given type/suffix. It results in the directive `FooDirective` at `mylib/src/lib/foo.directive.ts`",
-      "command": "nx g @nx/angular:scam-directive mylib/src/lib/foo --type=directive"
-    },
-    {
-      "description": "Generate a directive with the exported symbol different from the file name. It results in the directive `Custom` at `mylib/src/lib/foo.ts`",
+      "description": "Generate a directive with the exported symbol different from the file name. It results in the directive `CustomDirective` at `mylib/src/lib/foo.directive.ts`",
       "command": "nx g @nx/angular:scam-directive mylib/src/lib/foo --name=custom"
     }
   ],
@@ -74,10 +70,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "type": {
-      "type": "string",
-      "description": "Append a custom type to the directive's filename. It defaults to 'directive' for Angular versions below v20. For Angular v20 and above, no type is appended unless specified."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPipeToScam = convertPipeToScam;
+const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
@@ -21,7 +22,8 @@ function convertPipeToScam(tree, options) {
         tree.write(options.filePath, updatedPipeSource);
         return;
     }
-    tree.write(options.modulePath, getModuleFileContent(options.symbolName, options.fileName));
+    const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${options.name}.module.ts`);
+    tree.write(scamFilePath, getModuleFileContent(options.symbolName, options.fileName));
 }
 function getModuleFileContent(pipeClassName, pipeFileName) {
     return `import { NgModule } from '@angular/core';

package/src/generators/scam-pipe/lib/normalize-options.js

@@ -3,17 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
-const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    options.typeSeparator ??= angularMajorVersion < 20 ? '.' : '-';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: 'pipe',
-        suffixSeparator: options.typeSeparator,
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
@@ -21,8 +16,6 @@ async function normalizeOptions(tree, options) {
     const { className: suffixClassName } = (0, devkit_1.names)('pipe');
     const symbolName = `${className}${suffixClassName}`;
     (0, validations_1.validateClassName)(symbolName);
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
-    const modulePath = (0, devkit_1.joinPathFragments)(directory, `${name}${moduleTypeSeparator}module.ts`);
     return {
         ...options,
         export: options.export ?? true,
@@ -33,6 +26,5 @@ async function normalizeOptions(tree, options) {
         name,
         symbolName,
         projectName,
-        modulePath,
     };
 }

package/src/generators/scam-pipe/schema.d.ts

@@ -4,7 +4,6 @@ export interface Schema {
   skipTests?: boolean;
   inlineScam?: boolean;
   export?: boolean;
-  typeSeparator?: string;
   skipFormat?: boolean;
 }
 
@@ -17,5 +16,4 @@ export interface NormalizedSchema extends Schema {
   inlineScam: boolean;
   projectName: string;
   symbolName: string;
-  modulePath: string;
 }

package/src/generators/scam-pipe/schema.json

@@ -51,11 +51,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "typeSeparator": {
-      "type": "string",
-      "enum": ["-", "."],
-      "description": "The separator character to use before the type within the generated file's name. For example, if you set the option to `.`, the file will be named `example.pipe.ts`. It defaults to '-' for Angular v20+. For versions below v20, it defaults to '.'."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/setup-mf/files/entry-module-files/{entry__componentFileSuffix__.ts__tmpl__ → entry.component.ts__tmpl__}

@@ -7,4 +7,4 @@ import { Component } from '@angular/core';
   selector: '<%= appName %>-entry',
   template: `<nx-welcome></nx-welcome>`<% } %>
 })
-export class RemoteEntry<%= componentType %> {}
+export class RemoteEntryComponent {}

package/src/generators/setup-mf/files/entry-module-files/{__entryModuleFileName__.ts__tmpl__ → entry.module.ts__tmpl__}

@@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';<% if(routing) { %>
 import { RouterModule } from '@angular/router';<% } %>
 
-import { RemoteEntry<%= componentType %> } from './entry<%= componentFileSuffix %>';
-import { <%= nxWelcomeSymbolName %> } from './<%= nxWelcomeFileName %>';<% if(routing) { %>
+import { RemoteEntryComponent } from './entry.component';
+import { NxWelcomeComponent } from './nx-welcome.component';<% if(routing) { %>
 import { remoteRoutes } from './entry.routes';<% } %>
 
 @NgModule({
-  declarations: [RemoteEntry<%= componentType %>, <%= nxWelcomeSymbolName %>],
+  declarations: [RemoteEntryComponent, NxWelcomeComponent],
   imports: [
     CommonModule,<% if(routing) { %>
     RouterModule.forChild(remoteRoutes),<% } %>
   ],
   providers: [],<% if(!routing) { %>
-  exports: [RemoteEntry<%= componentType %>],<% } %>
+  exports: [RemoteEntryComponent],<% } %>
 })
 export class RemoteEntryModule {}

package/src/generators/setup-mf/files/entry-module-files/entry.routes.ts__tmpl__

@@ -1,4 +1,4 @@
 import { Route } from '@angular/router';
-import { RemoteEntry<%= componentType %> } from './entry<%= componentFileSuffix %>';
+import { RemoteEntryComponent } from './entry.component';
 
-export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntry<%= componentType %> }];
+export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntryComponent }];

package/src/generators/setup-mf/files/host-files/app.component.spec.ts__tmpl__

@@ -0,0 +1,47 @@
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+import { NxWelcomeComponent } from './nx-welcome.component';<% if(useRouterTestingModule) { %>
+import { RouterTestingModule } from '@angular/router/testing';<% } %>
+import { Router<% if(!useRouterTestingModule) { %>, RouterModule<% } %> } from '@angular/router';
+
+describe('AppComponent', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [<% if(useRouterTestingModule) { %>
+        RouterTestingModule.withRoutes([
+          { path: '', component: NxWelcomeComponent },
+        ]),<% } %><% if(!useRouterTestingModule) { %>
+        RouterModule.forRoot([
+          { path: '', component: NxWelcomeComponent },
+        ]),<% } %><% if (standalone) { %>
+        AppComponent,
+        NxWelcomeComponent,<% } %>
+      ],<% if (!standalone) { %>
+      declarations: [AppComponent, NxWelcomeComponent],<% } %>
+    }).compileComponents();
+  });
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title '<%= appName %>'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('<%= appName %>');
+  });
+
+  it('should render title', fakeAsync(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const router = TestBed.inject(Router);
+    fixture.ngZone?.run(() => router.navigate(['']));
+    tick();
+    fixture.detectChanges();
+    const compiled = fixture.nativeElement as HTMLElement;
+    expect(compiled.querySelector('h1')?.textContent).toContain(
+      'Welcome <%= appName %>'
+    );
+  }));
+});

package/src/generators/setup-mf/files/standalone-entry-component-files/{entry__componentFileSuffix__.ts__tmpl__ → entry.component.ts__tmpl__}

@@ -1,13 +1,13 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { <%= nxWelcomeSymbolName %> } from './<%= nxWelcomeFileName %>';
+import { NxWelcomeComponent } from './nx-welcome.component';
 
 @Component({<% if (setStandaloneTrue) { %>
   standalone: true,<% } %>
-  imports: [CommonModule, <%= nxWelcomeSymbolName %>],<% if (prefix) { %>
+  imports: [CommonModule, NxWelcomeComponent],<% if (prefix) { %>
   selector: '<%= prefix %>-<%= appName %>-entry',
   template: `<<%= prefix %>-nx-welcome></<%= prefix %>-nx-welcome>`<% } else { %>
   selector: '<%= appName %>-entry',
   template: `<nx-welcome></nx-welcome>`<% } %>
 })
-export class RemoteEntry<%= componentType %> {}
+export class RemoteEntryComponent {}

package/src/generators/setup-mf/files/standalone-entry-component-files/entry.routes.ts__tmpl__

@@ -1,4 +1,4 @@
 import { Route } from '@angular/router';
-import { RemoteEntry<%= componentType %> } from './entry<%= componentFileSuffix %>';
+import { RemoteEntryComponent } from './entry.component';
 
-export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntry<%= componentType %> }];
+export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntryComponent }];

package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__

@@ -17,7 +17,7 @@ const config: ModuleFederationConfig = {
   remotes: [<% if (federationType === 'static') { remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); } %>]<% } %><% if(type === 'remote') { %>
   exposes: {<% if(standalone) { %>
     './Routes': '<%= projectRoot %>/src/app/remote-entry/entry.routes.ts',<% } else { %>
-    './Module': '<%= projectRoot %>/src/app/remote-entry/<%= entryModuleFileName %>.ts',<% } %>
+    './Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',<% } %>
   },<% } %>
 };
 

package/src/generators/setup-mf/files/ts-webpack/tsconfig.lint.json__tmpl__

@@ -5,7 +5,7 @@
   },
   "include": [
     "src/main.ts",
-    <% if(type === "remote") { %> "src/remote-entry/<% if(standalone) { %>entry.routes.ts",<% } else { %><%= entryModuleFileName %>.ts",<% } } %>
+    <% if(type === "remote") { %> "src/remote-entry/<% if(standalone) { %>entry.routes.ts", <% } else { %> entry.module.ts", <% } } %>
     "webpack.config.ts",
     "webpack.prod.config.ts"
   ]

package/src/generators/setup-mf/files/webpack/module-federation.config.js__tmpl__

@@ -18,6 +18,6 @@ module.exports = {
   remotes: [<% if (federationType === 'static') { remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); } %>]<% } %><% if(type === 'remote') { %>
   exposes: {<% if(standalone) { %>
     './Routes': '<%= projectRoot %>/src/app/remote-entry/entry.routes.ts',<% } else { %>
-    './Module': '<%= projectRoot %>/src/app/remote-entry/<%= entryModuleFileName %>.ts',<% } %>
+    './Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',<% } %>
   },<% } %>
 };

package/src/generators/setup-mf/lib/add-remote-entry.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function addRemoteEntry(tree: Tree, options: NormalizedOptions, appRoot: string): void;
+import type { Schema } from '../schema';
+export declare function addRemoteEntry(tree: Tree, { appName, routing, prefix, standalone }: Schema, appRoot: string): void;

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -4,9 +4,8 @@ exports.addRemoteEntry = addRemoteEntry;
 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 addRemoteEntry(tree, options, appRoot) {
+function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const { appName, routing, prefix, standalone, componentType, componentFileSuffix, nxWelcomeComponentInfo, entryModuleFileName, } = options;
     (0, devkit_1.generateFiles)(tree, standalone
         ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
         : (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {
@@ -14,19 +13,14 @@ function addRemoteEntry(tree, options, appRoot) {
         appName,
         routing,
         prefix,
-        // Angular v19 or higher defaults to true, while lower versions default to false
+        // Angular v19 or higher defaults to true, while v18 or lower defaults to false
         setStandaloneFalse: angularMajorVersion >= 19,
         setStandaloneTrue: angularMajorVersion < 19,
-        componentType,
-        componentFileSuffix,
-        entryModuleFileName,
-        nxWelcomeFileName: nxWelcomeComponentInfo.extensionlessFileName,
-        nxWelcomeSymbolName: nxWelcomeComponentInfo.symbolName,
     });
     if (standalone && routing) {
         (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.routes').then(m => m.remoteRoutes)}`);
     }
     else if (routing) {
-        (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{ path: '', loadChildren: () => import('./remote-entry/${entryModuleFileName}').then(m => m.RemoteEntryModule) }`);
+        (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{ path: '', loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule) }`);
     }
 }

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -105,17 +105,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     path: '${options.appName}',
     loadChildren: () => ${routeToAdd}.then(m => m!.${exportedRemote})
     }`);
-    let pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.component.html');
-    const candidatePaths = [
-        pathToAppComponentTemplate,
-        (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.html'),
-    ];
-    for (const path of candidatePaths) {
-        if (tree.exists(path)) {
-            pathToAppComponentTemplate = path;
-            break;
-        }
-    }
+    const pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.component.html');
     const appComponent = tree.read(pathToAppComponentTemplate, 'utf-8');
     if (appComponent.includes(`<ul class="remote-menu">`) &&
         appComponent.includes('</ul>')) {

package/src/generators/setup-mf/lib/fix-bootstrap.d.ts

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

package/src/generators/setup-mf/lib/fix-bootstrap.js

@@ -6,7 +6,7 @@ function fixBootstrap(tree, appRoot, options) {
     const mainFilePath = (0, devkit_1.joinPathFragments)(appRoot, 'src/main.ts');
     const bootstrapCode = tree.read(mainFilePath, 'utf-8');
     if (options.standalone && options.mfType === 'remote') {
-        tree.write(`${appRoot}/src/bootstrap.ts`, standaloneBootstrapCode(options.componentType, options.componentFileSuffix));
+        tree.write(`${appRoot}/src/bootstrap.ts`, standaloneBootstrapCode());
     }
     else {
         tree.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
@@ -30,11 +30,11 @@ fetch('${manifestPath}')
         tree.write(mainFilePath, fetchMFManifestCode);
     }
 }
-const standaloneBootstrapCode = (componentType, componentFileSuffix) => `import { bootstrapApplication } from '@angular/platform-browser';
+const standaloneBootstrapCode = () => `import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
-import { RemoteEntry${componentType} } from './app/remote-entry/entry${componentFileSuffix}';
+import { RemoteEntryComponent } from './app/remote-entry/entry.component';
 
-bootstrapApplication(RemoteEntry${componentType}, appConfig).catch((err) =>
+bootstrapApplication(RemoteEntryComponent, appConfig).catch((err) =>
   console.error(err)
 );
 `;

package/src/generators/setup-mf/lib/generate-config.d.ts

@@ -1,6 +1,6 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function generateWebpackConfig(tree: Tree, options: NormalizedOptions, appRoot: string, remotesWithPorts: {
+import type { Schema } from '../schema';
+export declare function generateWebpackConfig(tree: Tree, options: Schema, appRoot: string, remotesWithPorts: {
     remoteName: string;
     port: number;
 }[]): void;

package/src/generators/setup-mf/lib/generate-config.js

@@ -23,7 +23,6 @@ function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
         remotes: remotesWithPorts ?? [],
         projectRoot: appRoot,
         standalone: options.standalone,
-        entryModuleFileName: options.entryModuleFileName,
     });
     if (!options.setParserOptionsProject) {
         tree.delete((0, devkit_1.joinPathFragments)(appRoot, 'tsconfig.lint.json'));

package/src/generators/setup-mf/lib/normalize-options.d.ts

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

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

@@ -1,26 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
-const app_components_info_1 = require("../../utils/app-components-info");
-const artifact_types_1 = require("../../utils/artifact-types");
 const project_1 = require("../../utils/project");
 function normalizeOptions(tree, options) {
-    const componentType = (0, artifact_types_1.getComponentType)(tree);
-    const componentFileSuffix = componentType ? `.${componentType}` : '';
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
-    const entryModuleFileName = `entry${moduleTypeSeparator}module`;
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     return {
         ...options,
         typescriptConfiguration: options.typescriptConfiguration ?? true,
         federationType: options.federationType ?? 'static',
         prefix: options.prefix ?? (0, project_1.getProjectPrefix)(tree, options.appName) ?? 'app',
         standalone: options.standalone ?? true,
-        componentType: componentType ? (0, devkit_1.names)(componentType).className : '',
-        componentFileSuffix,
-        entryModuleFileName,
-        appComponentInfo: (0, app_components_info_1.getAppComponentInfo)(tree, componentFileSuffix, project),
-        nxWelcomeComponentInfo: (0, app_components_info_1.getNxWelcomeComponentInfo)(tree, componentFileSuffix, project),
     };
 }