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

package/src/generators/host/host.js

@@ -12,8 +12,14 @@ const remote_1 = tslib_1.__importDefault(require("../remote/remote"));
 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 host(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'host');
+    // 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,7 +81,8 @@ async function host(tree, schema) {
         let ssrInstallTask = await (0, lib_1.updateSsrSetup)(tree, options, hostProjectName, typescriptConfiguration);
         installTasks.push(ssrInstallTask);
     }
-    for (const remote of remotesToGenerate) {
+    for (let i = 0; i < remotesToGenerate.length; i++) {
+        const remote = remotesToGenerate[i];
         const remoteDirectory = options.directory
             ? (0, devkit_1.joinPathFragments)(options.directory, '..', remote)
             : appRoot === '.'
@@ -86,12 +93,25 @@ async function host(tree, schema) {
             name: remote,
             directory: remoteDirectory,
             host: hostProjectName,
+            port: isRspack ? 4200 + i + 1 : undefined,
             skipFormat: true,
             standalone: options.standalone,
             typescriptConfiguration,
         });
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    if (isRspack) {
+        await (0, convert_to_rspack_1.default)(tree, {
+            project: hostProjectName,
+            skipInstall: options.skipPackageJson,
+            skipFormat: true,
+        });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, hostProjectName);
+    project.targets.serve ??= {};
+    project.targets.serve.options ??= {};
+    project.targets.serve.options.port = 4200;
+    (0, devkit_1.updateProjectConfiguration)(tree, hostProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

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

package/src/generators/host/schema.json

@@ -37,6 +37,12 @@
       "x-priority": "important",
       "alias": "producers"
     },
+    "bundler": {
+      "type": "string",
+      "description": "The bundler to use for the host application.",
+      "default": "webpack",
+      "enum": ["webpack", "rspack"]
+    },
     "dynamic": {
       "type": "boolean",
       "description": "Should the host application use dynamic federation?",
@@ -172,7 +178,7 @@
       "x-priority": "important"
     },
     "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/init/init.js

@@ -29,7 +29,7 @@ function installAngularDevkitCoreIfMissing(tree, options) {
     const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/core');
     if (!packageVersion) {
         const pkgVersions = (0, version_utils_1.versions)(tree);
-        const devkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
+        const devkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
             pkgVersions.angularDevkitVersion;
         try {
             (0, devkit_1.ensurePackage)('@angular-devkit/core', devkitVersion);

package/src/generators/library/files/ng-module/src/index.ts__tpl__

@@ -1,2 +1,2 @@
-<% if (!skipModule) { %>export * from './lib/<%= libFileName %><%= moduleTypeSeparator %>module';<% } %><% if(routing) { %>
+<% if (!skipModule) { %>export * from './lib/<%= libFileName %>.module';<% } %><% if(routing) { %>
 export * from './lib/lib.routes';<% } %>

package/src/generators/library/files/standalone-components/src/lib/lib.routes.ts__tpl__

@@ -1,6 +1,6 @@
 import { Route } from '@angular/router';
-import { <%= libClassName %><%= componentType %> } from './<%= pathToComponent %><%= componentFileSuffix %>';
+import { <%= libClassName %>Component } from './<%= pathToComponent %>.component';
 
 export const <%= libPropertyName %>Routes: Route[] = [
-  { path: '', component: <%= libClassName %><%= componentType %> }
+  { path: '', component: <%= libClassName %>Component }
 ];

package/src/generators/library/lib/add-standalone-component.js

@@ -14,7 +14,6 @@ async function addStandaloneComponent(tree, { libraryOptions, componentOptions }
             : `${componentOptions.name}/${componentOptions.name}`),
         standalone: true,
         export: true,
-        type: componentOptions.type,
         skipFormat: true,
     });
     if (libraryOptions.routing) {

package/src/generators/library/lib/create-files.js

@@ -15,12 +15,6 @@ function createFiles(tree, options, project) {
     const version = (0, version_utils_1.getInstalledAngularVersion)(tree);
     const { major, minor } = (0, semver_1.parse)(version);
     const disableModernClassFieldsBehavior = (0, semver_1.lt)(version, '18.1.0-rc.0');
-    const componentType = options.componentOptions.type
-        ? (0, devkit_1.names)(options.componentOptions.type).className
-        : '';
-    const componentFileSuffix = options.componentOptions.type
-        ? `.${options.componentOptions.type}`
-        : '';
     const substitutions = {
         libName: options.libraryOptions.name,
         libFileName: options.libraryOptions.fileName,
@@ -36,9 +30,6 @@ function createFiles(tree, options, project) {
         rootOffset,
         angularPeerDepVersion: `^${major}.${minor}.0`,
         disableModernClassFieldsBehavior,
-        componentType,
-        componentFileSuffix,
-        moduleTypeSeparator: options.libraryOptions.moduleTypeSeparator,
         tpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.libraryOptions.projectRoot, substitutions);
@@ -48,7 +39,7 @@ function createFiles(tree, options, project) {
     else {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.libraryOptions.projectRoot, substitutions);
         if (options.libraryOptions.skipModule) {
-            tree.delete(options.libraryOptions.modulePath);
+            tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, `lib/${options.libraryOptions.fileName}.module.ts`));
         }
     }
     if (!options.libraryOptions.routing) {

package/src/generators/library/lib/enable-strict-type-checking.d.ts

@@ -1,5 +1,5 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from './normalized-schema';
+import { NormalizedSchema } from './normalized-schema';
 /**
  * Enable Strict Mode in the library and spec TS Config
  * */

package/src/generators/library/lib/enable-strict-type-checking.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableStrictTypeChecking = enableStrictTypeChecking;
 exports.setLibraryStrictDefault = setLibraryStrictDefault;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../../utils/version-utils");
 /**
  * Enable Strict Mode in the library and spec TS Config
  * */
@@ -22,7 +21,6 @@ function setLibraryStrictDefault(host, isStrict) {
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 function updateTsConfig(host, options) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
     // Update the settings in the tsconfig.app.json to enable strict type checking.
     // This matches the settings defined by the Angular CL https://angular.io/guide/strict-mode
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => {
@@ -42,7 +40,6 @@ function updateTsConfig(host, options) {
             enableI18nLegacyMessageIdFormat: false,
             strictInjectionParameters: true,
             strictInputAccessModifiers: true,
-            typeCheckHostBindings: angularMajorVersion >= 20 ? true : undefined,
             strictTemplates: true,
         };
         return json;

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-import type { NormalizedSchema } from './normalized-schema';
+import { Tree } from '@nx/devkit';
+import { Schema } from '../schema';
+import { NormalizedSchema } from './normalized-schema';
 export declare function normalizeOptions(host: Tree, schema: Schema): Promise<NormalizedSchema>;

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

@@ -4,7 +4,6 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const test_runners_1 = require("../../../utils/test-runners");
-const artifact_types_1 = require("../../utils/artifact-types");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
@@ -36,8 +35,7 @@ async function normalizeOptions(host, schema) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(host);
-    const modulePath = `${projectRoot}/src/lib/${fileName}${moduleTypeSeparator}module.ts`;
+    const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
@@ -55,10 +53,8 @@ async function normalizeOptions(host, schema) {
         ngCliSchematicLibRoot,
         skipTests: options.unitTestRunner === 'none' ? true : options.skipTests,
         standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component`,
-        moduleTypeSeparator,
     };
     const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat, ...libraryOptions } = allNormalizedOptions;
-    const componentType = (0, artifact_types_1.getComponentType)(host);
     return {
         libraryOptions,
         componentOptions: {
@@ -74,7 +70,6 @@ async function normalizeOptions(host, schema) {
             selector,
             skipSelector,
             flat,
-            type: componentType,
         },
     };
 }

package/src/generators/library/lib/normalized-schema.d.ts

@@ -36,7 +36,6 @@ export interface NormalizedSchema {
         parsedTags: string[];
         ngCliSchematicLibRoot: string;
         standaloneComponentName: string;
-        moduleTypeSeparator: '-' | '.';
     };
     componentOptions: {
         name: string;
@@ -51,6 +50,5 @@ export interface NormalizedSchema {
         selector?: string;
         skipSelector?: boolean;
         flat?: boolean;
-        type?: string;
     };
 }

package/src/generators/library-secondary-entry-point/files/src/index.ts__tmpl__

@@ -1 +1 @@
-<% if (!skipModule) { %>export * from './lib/<%= fileName %><%= moduleTypeSeparator %>module';<% } else { %>export const greeting = 'Hello World!';<% } %>
+<% if (!skipModule) { %>export * from './lib/<%= fileName %>.module';<% } else { %>export const greeting = 'Hello World!';<% } %>

package/src/generators/library-secondary-entry-point/lib/add-files.js

@@ -7,10 +7,9 @@ function addFiles(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.entryPointDestination, {
         ...options,
         ...nameVariants,
-        moduleTypeSeparator: options.moduleTypeSeparator,
         tmpl: '',
     });
     if (options.skipModule) {
-        tree.delete((0, devkit_1.joinPathFragments)(options.entryPointDestination, `src/lib/${nameVariants.fileName}${options.moduleTypeSeparator}module.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.entryPointDestination, `src/lib/${nameVariants.fileName}.module.ts`));
     }
 }

package/src/generators/library-secondary-entry-point/lib/normalize-options.d.ts

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

package/src/generators/library-secondary-entry-point/lib/normalize-options.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_types_1 = require("../../utils/artifact-types");
 function normalizeOptions(tree, options) {
     const name = (0, devkit_1.names)(options.name).fileName;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -19,7 +18,6 @@ function normalizeOptions(tree, options) {
     }
     const { name: mainEntryPoint } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(libraryProject.root, 'package.json'));
     const secondaryEntryPoint = `${mainEntryPoint}/${options.name}`;
-    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
     return {
         ...options,
         entryPointDestination,
@@ -28,6 +26,5 @@ function normalizeOptions(tree, options) {
         libraryProject,
         secondaryEntryPoint,
         skipModule: options.skipModule ?? false,
-        moduleTypeSeparator,
     };
 }

package/src/generators/library-secondary-entry-point/schema.d.ts

@@ -13,5 +13,4 @@ export interface NormalizedGeneratorOptions extends GeneratorOptions {
   mainEntryPoint: string;
   secondaryEntryPoint: string;
   skipModule: boolean;
-  moduleTypeSeparator: '-' | '.';
 }

package/src/generators/move/lib/update-module-name.js

@@ -28,19 +28,12 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
         to: `${(0, devkit_1.names)(unscopedNewProjectName).className}Module`,
     };
     const findModuleName = new RegExp(`\\b${moduleName.from}`, 'g');
-    const moduleFiles = [
-        {
-            from: `${oldProjectName}.module`,
-            fromRegex: new RegExp(`\\b${oldProjectName}\\.module`, 'g'),
-            to: `${unscopedNewProjectName}.module`,
-        },
-        {
-            from: `${oldProjectName}-module`,
-            fromRegex: new RegExp(`\\b${oldProjectName}-module`, 'g'),
-            to: `${unscopedNewProjectName}-module`,
-        },
-    ];
-    const filesToRename = moduleFiles.flatMap((moduleFile) => [
+    const moduleFile = {
+        from: `${oldProjectName}.module`,
+        to: `${unscopedNewProjectName}.module`,
+    };
+    const findFileName = new RegExp(`\\b${moduleFile.from}`, 'g');
+    const filesToRename = [
         {
             from: `${project.sourceRoot}/lib/${moduleFile.from}.ts`,
             to: `${project.sourceRoot}/lib/${moduleFile.to}.ts`,
@@ -49,15 +42,15 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
             from: `${project.sourceRoot}/lib/${moduleFile.from}.spec.ts`,
             to: `${project.sourceRoot}/lib/${moduleFile.to}.spec.ts`,
         },
-    ].filter((rename) => rename.from !== rename.to));
+    ].filter((rename) => rename.from !== rename.to);
     if (filesToRename.length === 0) {
         return;
     }
     const replacements = [
-        ...moduleFiles.map((moduleFile) => ({
-            regex: moduleFile.fromRegex,
+        {
+            regex: findFileName,
             replaceWith: moduleFile.to,
-        })),
+        },
         {
             regex: findModuleName,
             replaceWith: moduleName.to,

package/src/generators/move/lib/update-secondary-entry-points.js

@@ -8,6 +8,9 @@ const libraryExecutors = [
     '@angular/build:ng-packagr',
     '@nx/angular:ng-packagr-lite',
     '@nx/angular:package',
+    // TODO(v17): remove when @nrwl/* scope is removed
+    '@nrwl/angular:ng-packagr-lite',
+    '@nrwl/angular:package',
 ];
 function updateSecondaryEntryPoints(tree, schema) {
     if (schema.oldProjectName === schema.newProjectName) {

package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js

@@ -7,7 +7,7 @@ const path_1 = require("path");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
     constructor(tree, project, projectConfig, logger) {
-        super(tree, ['@angular/build:karma', '@angular-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
+        super(tree, ['@angular-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {

package/src/generators/ng-add/migrators/projects/app.migrator.js

@@ -11,7 +11,6 @@ const project_migrator_1 = require("./project.migrator");
 const supportedTargets = {
     build: {
         builders: [
-            '@angular/build:application',
             '@angular-devkit/build-angular:application',
             '@angular-devkit/build-angular:browser',
             '@angular-devkit/build-angular:browser-esbuild',
@@ -24,24 +23,14 @@ const supportedTargets = {
             '@cypress/schematic:cypress',
         ],
     },
-    i18n: {
-        builders: [
-            '@angular/build:extract-i18n',
-            '@angular-devkit/build-angular:extract-i18n',
-        ],
-    },
+    i18n: { builders: ['@angular-devkit/build-angular:extract-i18n'] },
     prerender: {
         builders: [
             '@nguniversal/builders:prerender',
             '@angular-devkit/build-angular:prerender',
         ],
     },
-    serve: {
-        builders: [
-            '@angular/build:dev-server',
-            '@angular-devkit/build-angular:dev-server',
-        ],
-    },
+    serve: { builders: ['@angular-devkit/build-angular:dev-server'] },
     server: { builders: ['@angular-devkit/build-angular:server'] },
     serveSsr: {
         builders: [
@@ -148,34 +137,10 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot);
         this.updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot);
     }
-    convertBuildOptions(buildOptions, target, updateOutputs = true) {
-        const { executor } = target;
-        const isApplicationBuilder = executor === '@angular/build:application' ||
-            executor === '@angular-devkit/build-angular:application';
-        if (updateOutputs) {
-            if (buildOptions.outputPath) {
-                if (isApplicationBuilder) {
-                    if (typeof buildOptions.outputPath === 'string') {
-                        buildOptions.outputPath = (0, devkit_1.joinPathFragments)('dist', this.project.newRoot);
-                    }
-                    else if (buildOptions.outputPath.base) {
-                        buildOptions.outputPath.base = (0, devkit_1.joinPathFragments)('dist', this.project.newRoot);
-                    }
-                }
-                else {
-                    buildOptions.outputPath = (0, devkit_1.joinPathFragments)('dist', this.project.newRoot, this.targetNames.server ? 'browser' : '');
-                }
-            }
-            else if (isApplicationBuilder) {
-                buildOptions.outputPath = (0, devkit_1.joinPathFragments)('dist', this.projectName);
-            }
-            if (typeof buildOptions.outputPath === 'string') {
-                target.outputs = ['{options.outputPath}'];
-            }
-            else if (buildOptions.outputPath?.base) {
-                target.outputs = ['{options.outputPath.base}'];
-            }
-        }
+    convertBuildOptions(buildOptions) {
+        buildOptions.outputPath =
+            buildOptions.outputPath &&
+                (0, devkit_1.joinPathFragments)('dist', this.project.newRoot, this.targetNames.server ? 'browser' : '');
         if (buildOptions.index) {
             if (typeof buildOptions.index === 'string') {
                 buildOptions.index = this.convertAsset(buildOptions.index);
@@ -272,8 +237,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 this.logger.warn(`The tsConfig file "${buildDevTsConfig}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the tsConfig file.`);
             }
         }
-        this.convertBuildOptions(buildTarget.options ?? {}, buildTarget);
-        Object.values(buildTarget.configurations ?? {}).forEach((config) => this.convertBuildOptions(config, buildTarget, false));
+        this.convertBuildOptions(buildTarget.options ?? {});
+        Object.values(buildTarget.configurations ?? {}).forEach((config) => this.convertBuildOptions(config));
     }
     updatePrerenderTargetConfiguration() {
         if (!this.targetNames.prerender ||

package/src/generators/ngrx/schema.json

@@ -8,11 +8,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:ngrx --root --parent=apps/my-app/src/app/app-module.ts --facade=false placeholder",
+      "command": "nx g @nx/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
       "description": "Add root ngrx configration to the `my-app` application"
     },
     {
-      "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib/my-lib-module.ts --facade=true --root=false users",
+      "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
       "description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
     },
     {
@@ -42,7 +42,7 @@
     },
     "parent": {
       "type": "string",
-      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app-module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory.",
+      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app.module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory.",
       "x-prompt": "What is the path to the module or Routes definition where this NgRx state should be registered?",
       "x-priority": "important"
     },

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

@@ -16,11 +16,7 @@ function normalizeOptions(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     const appConfigPath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
-    let appMainPath = project.targets.build.options.main ?? project.targets.build.options.browser;
-    if (!appMainPath) {
-        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
-        appMainPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
-    }
+    const appMainPath = project.targets.build.options.main ?? project.targets.build.options.browser;
     /** If NgModule App
      * -> Use App Module
      * If Standalone
@@ -28,10 +24,7 @@ function normalizeOptions(tree, options) {
      * --> If so, use that
      * --> If not, use main.ts
      */
-    let ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
-    if (!tree.exists(ngModulePath)) {
-        ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app-module.ts');
-    }
+    const ngModulePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts');
     const parent = !isStandalone && tree.exists(ngModulePath)
         ? ngModulePath
         : tree.exists(appConfigPath)

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

@@ -4,15 +4,11 @@ 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 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',
     });

package/src/generators/pipe/pipe.js

@@ -14,7 +14,7 @@ async function pipeGenerator(tree, rawOptions) {
         fileName: options.fileName,
         selector: pipeNames.propertyName,
         standalone: options.standalone,
-        // 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
         setStandalone: (angularMajorVersion >= 19 && !options.standalone) ||
             (angularMajorVersion < 19 && options.standalone),
         tpl: '',

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

@@ -6,7 +6,6 @@ export interface Schema {
   standalone?: boolean;
   module?: string;
   export?: boolean;
-  typeSeparator?: string;
   skipFormat?: boolean;
 }
 

package/src/generators/pipe/schema.json

@@ -12,15 +12,11 @@
       "command": "nx g @nx/angular:pipe mylib/src/lib/foo.pipe.ts"
     },
     {
-      "description": "Generate a pipe without providing the file extension. It results in the pipe `FooPipe` at `mylib/src/lib/foo-pipe.ts`",
+      "description": "Generate a pipe without providing the file extension. It results in the pipe `FooPipe` at `mylib/src/lib/foo.pipe.ts`",
       "command": "nx g @nx/angular:pipe mylib/src/lib/foo"
     },
     {
-      "description": "Generate a pipe with a different type separator. It results in the pipe `FooPipe` at `mylib/src/lib/foo.pipe.ts`",
-      "command": "nx g @nx/angular:pipe mylib/src/lib/foo --typeSeparator=."
-    },
-    {
-      "description": "Generate a pipe with the exported symbol different from the file name. It results in the pipe `CustomPipe` at `mylib/src/lib/foo-pipe.ts`",
+      "description": "Generate a pipe with the exported symbol different from the file name. It results in the pipe `CustomPipe` at `mylib/src/lib/foo.pipe.ts`",
       "command": "nx g @nx/angular:pipe mylib/src/lib/foo --name=custom"
     }
   ],
@@ -63,11 +59,6 @@
       "default": false,
       "description": "The declaring NgModule exports this pipe."
     },
-    "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": {
       "type": "boolean",
       "default": false,

package/src/generators/remote/files/standalone/src/bootstrap.server.ts__tmpl__

@@ -1,7 +1,7 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { RemoteEntry<%= componentType %> } from './app/remote-entry/entry<%= componentFileSuffix %>';
-import { config } from './app/app.config.server';
+import {bootstrapApplication} from '@angular/platform-browser';
+import {RemoteEntryComponent} from './app/remote-entry/entry.component';
+import {config} from './app/app.config.server';
 
-const bootstrap = () => bootstrapApplication(RemoteEntry<%= componentType %>, config);
+const bootstrap = () => bootstrapApplication(RemoteEntryComponent, config);
 
 export default bootstrap;

package/src/generators/remote/lib/update-ssr-setup.js

@@ -4,7 +4,6 @@ exports.updateSsrSetup = updateSsrSetup;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
-const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
@@ -29,13 +28,9 @@ async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfi
         tmpl: '',
     });
     if (standalone) {
-        const componentType = (0, artifact_types_1.getComponentType)(tree);
-        const componentFileSuffix = componentType ? `.${componentType}` : '';
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone'), project.root, {
             appName,
             standalone,
-            componentType: componentType ? (0, devkit_1.names)(componentType).className : '',
-            componentFileSuffix,
             tmpl: '',
         });
     }