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

package/src/generators/application/lib/create-project.js

@@ -2,117 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = createProject;
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const version_utils_1 = require("../../utils/version-utils");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 function createProject(tree, options) {
-    let project;
-    if (options.bundler === 'esbuild') {
-        project = createProjectForEsbuild(tree, options);
-    }
-    else {
-        project = createProjectForWebpack(tree, options);
-    }
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, project);
-}
-function createProjectForEsbuild(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const buildExecutor = angularMajorVersion >= 20
-        ? '@angular/build:application'
+    const buildExecutor = options.bundler === 'webpack'
+        ? '@angular-devkit/build-angular:browser'
         : '@angular-devkit/build-angular:application';
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
-    let budgets = undefined;
-    if (options.strict) {
-        budgets = [
-            { type: 'initial', maximumWarning: '500kb', maximumError: '1mb' },
-            {
-                type: 'anyComponentStyle',
-                maximumWarning: '4kb',
-                maximumError: '8kb',
-            },
-        ];
-    }
-    else {
-        budgets = [
-            { type: 'initial', maximumWarning: '2mb', maximumError: '5mb' },
-            {
-                type: 'anyComponentStyle',
-                maximumWarning: '6kb',
-                maximumError: '10kb',
-            },
-        ];
-    }
-    const inlineStyleLanguage = options?.style !== 'css' ? options.style : undefined;
-    const project = {
-        name: options.name,
-        projectType: 'application',
-        prefix: options.prefix,
-        root: options.appProjectRoot,
-        sourceRoot: options.appProjectSourceRoot,
-        tags: options.parsedTags,
-        targets: {
-            build: {
-                executor: buildExecutor,
-                outputs: ['{options.outputPath}'],
-                options: {
-                    outputPath: options.outputPath,
-                    index: angularMajorVersion >= 20
-                        ? undefined
-                        : `${options.appProjectSourceRoot}/index.html`,
-                    browser: `${options.appProjectSourceRoot}/main.ts`,
-                    polyfills: ['zone.js'],
-                    tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-                    inlineStyleLanguage,
-                    assets: [
-                        {
-                            glob: '**/*',
-                            input: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'public'),
-                        },
-                    ],
-                    styles: [`${options.appProjectSourceRoot}/styles.${options.style}`],
-                },
-                configurations: {
-                    production: {
-                        budgets,
-                        outputHashing: 'all',
-                    },
-                    development: {
-                        optimization: false,
-                        extractLicenses: false,
-                        sourceMap: true,
-                    },
-                },
-                defaultConfiguration: 'production',
-            },
-            serve: {
-                continuous: true,
-                executor: angularMajorVersion >= 20
-                    ? '@angular/build:dev-server'
-                    : '@angular-devkit/build-angular:dev-server',
-                options: options.port ? { port: options.port } : undefined,
-                configurations: {
-                    production: {
-                        buildTarget: `${options.name}:build:production`,
-                    },
-                    development: {
-                        buildTarget: `${options.name}:build:development`,
-                    },
-                },
-                defaultConfiguration: 'development',
-            },
-            'extract-i18n': {
-                executor: angularMajorVersion >= 20
-                    ? '@angular/build:extract-i18n'
-                    : '@angular-devkit/build-angular:extract-i18n',
-                options: {
-                    buildTarget: `${options.name}:build`,
-                },
-            },
-        },
-    };
-    return project;
-}
-function createProjectForWebpack(tree, options) {
-    const buildExecutor = '@angular-devkit/build-angular:browser';
+    const buildMainOptionName = options.bundler === 'esbuild' ? 'browser' : 'main';
     (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.strict) {
@@ -150,17 +47,23 @@ function createProjectForWebpack(tree, options) {
                 options: {
                     outputPath: options.outputPath,
                     index: `${options.appProjectSourceRoot}/index.html`,
-                    main: `${options.appProjectSourceRoot}/main.ts`,
+                    [buildMainOptionName]: `${options.appProjectSourceRoot}/main.ts`,
                     polyfills: ['zone.js'],
                     tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
                     inlineStyleLanguage,
-                    assets: [
-                        {
-                            glob: '**/*',
-                            input: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'public'),
-                        },
-                    ],
+                    assets: angularMajorVersion >= 18
+                        ? [
+                            {
+                                glob: '**/*',
+                                input: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'public'),
+                            },
+                        ]
+                        : [
+                            `${options.appProjectSourceRoot}/favicon.ico`,
+                            `${options.appProjectSourceRoot}/assets`,
+                        ],
                     styles: [`${options.appProjectSourceRoot}/styles.${options.style}`],
+                    scripts: [],
                 },
                 configurations: {
                     production: {
@@ -168,12 +71,12 @@ function createProjectForWebpack(tree, options) {
                         outputHashing: 'all',
                     },
                     development: {
-                        buildOptimizer: false,
+                        buildOptimizer: options.bundler === 'webpack' ? false : undefined,
                         optimization: false,
-                        vendorChunk: true,
+                        vendorChunk: options.bundler === 'webpack' ? true : undefined,
                         extractLicenses: false,
                         sourceMap: true,
-                        namedChunks: true,
+                        namedChunks: options.bundler === 'webpack' ? true : undefined,
                     },
                 },
                 defaultConfiguration: 'production',
@@ -181,7 +84,11 @@ function createProjectForWebpack(tree, options) {
             serve: {
                 continuous: true,
                 executor: '@angular-devkit/build-angular:dev-server',
-                options: options.port ? { port: options.port } : undefined,
+                options: options.port
+                    ? {
+                        port: options.port,
+                    }
+                    : undefined,
                 configurations: {
                     production: {
                         buildTarget: `${options.name}:build:production`,
@@ -200,5 +107,5 @@ function createProjectForWebpack(tree, options) {
             },
         },
     };
-    return project;
+    (0, devkit_1.addProjectConfiguration)(tree, options.name, project);
 }

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableStrictTypeChecking = enableStrictTypeChecking;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../../utils/version-utils");
 function enableStrictTypeChecking(host, options) {
     // This matches the settings defined by the Angular CLI https://angular.io/guide/strict-mode
     const compilerOptions = {
@@ -15,14 +14,12 @@ function enableStrictTypeChecking(host, options) {
     };
     const appTsConfigPath = `${options.appProjectRoot}/tsconfig.json`;
     if (host.exists(appTsConfigPath)) {
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
         (0, devkit_1.updateJson)(host, appTsConfigPath, (json) => {
             json.compilerOptions = { ...json.compilerOptions, ...compilerOptions };
             json.angularCompilerOptions = {
                 enableI18nLegacyMessageIdFormat: false,
                 strictInjectionParameters: true,
                 strictInputAccessModifiers: true,
-                typeCheckHostBindings: angularMajorVersion >= 20 ? true : undefined,
                 strictTemplates: true,
             };
             return json;

package/src/generators/application/schema.json

@@ -177,7 +177,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"
     }
   },

package/src/generators/component/component.js

@@ -22,11 +22,10 @@ async function componentGenerator(tree, rawOptions) {
         viewEncapsulation: options.viewEncapsulation,
         displayBlock: options.displayBlock,
         selector: options.selector,
-        // 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),
         angularMajorVersion,
-        ngext: options.ngHtml ? '.ng' : '',
         tpl: '',
     });
     if (options.skipTests) {
@@ -42,17 +41,7 @@ async function componentGenerator(tree, rawOptions) {
         tree.delete(pathToStyleFile);
     }
     if (!options.skipImport && !options.standalone) {
-        let modulePath;
-        try {
-            modulePath = (0, lib_1.findModuleFromOptions)(tree, options, options.projectRoot);
-        }
-        catch (e) {
-            modulePath = (0, lib_1.findModuleFromOptions)(tree, {
-                ...options,
-                moduleExt: '-module.ts',
-                routingModuleExt: '-routing-module.ts',
-            }, options.projectRoot);
-        }
+        const modulePath = (0, lib_1.findModuleFromOptions)(tree, options, options.projectRoot);
         (0, utils_1.addToNgModule)(tree, options.directory, modulePath, options.name, options.symbolName, options.fileName, 'declarations', true, options.export);
     }
     (0, lib_1.exportComponentInEntryPoint)(tree, options);

package/src/generators/component/files/__fileName__.ts__tpl__

@@ -6,7 +6,7 @@ import { CommonModule } from '@angular/common';<% } %>
   standalone: <%= standalone %>,<% } %><% if(standalone) { %>
   imports: [CommonModule],<%}%><% if(inlineTemplate) { %>
   template: `<p><%= name %> works!</p>`<% } else { %>
-  templateUrl: './<%= fileName %><%= ngext %>.html'<% } if(inlineStyle) { %>,
+  templateUrl: './<%= fileName %>.html'<% } if(inlineStyle) { %>,
   styles: `<% if(displayBlock){ %>
     :host {
       display: block;

package/src/generators/component/lib/component.js

@@ -21,17 +21,7 @@ function exportComponentInEntryPoint(tree, schema) {
         return;
     }
     if (!schema.standalone) {
-        let modulePath;
-        try {
-            modulePath = (0, module_1.findModuleFromOptions)(tree, schema, root);
-        }
-        catch (e) {
-            modulePath = (0, module_1.findModuleFromOptions)(tree, {
-                ...schema,
-                moduleExt: '-module.ts',
-                routingModuleExt: '-routing-module.ts',
-            }, root);
-        }
+        const modulePath = (0, module_1.findModuleFromOptions)(tree, schema, root);
         if (!shouldExportInEntryPoint(tree, entryPointPath, modulePath)) {
             return;
         }

package/src/generators/component/lib/module.d.ts

@@ -1,8 +1,3 @@
 import type { Tree } from '@nx/devkit';
-export type ModuleOptions = {
-    directory: string;
-    module?: string;
-    moduleExt?: string;
-    routingModuleExt?: string;
-};
-export declare function findModuleFromOptions(tree: Tree, options: ModuleOptions, projectRoot: string): string;
+import type { NormalizedSchema } from '../schema';
+export declare function findModuleFromOptions(tree: Tree, options: NormalizedSchema, projectRoot: string): string;

package/src/generators/component/lib/module.js

@@ -5,13 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 // Adapted from https://github.com/angular/angular-cli/blob/732aab5fa7e63618c89dfbbb6f78753f706d7014/packages/schematics/angular/utility/find-module.ts#L29
 // to match the logic from the Angular CLI component schematic.
-const MODULE_EXT = '.module.ts';
-const ROUTING_MODULE_EXT = '-routing.module.ts';
+const moduleExt = '.module.ts';
+const routingModuleExt = '-routing.module.ts';
 function findModuleFromOptions(tree, options, projectRoot) {
-    const moduleExt = options.moduleExt || MODULE_EXT;
-    const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
     if (!options.module) {
-        return (0, devkit_1.normalizePath)(findModule(tree, options.directory, projectRoot, moduleExt, routingModuleExt));
+        return (0, devkit_1.normalizePath)(findModule(tree, options.directory, projectRoot));
     }
     else {
         const modulePath = (0, devkit_1.joinPathFragments)(options.directory, options.module);
@@ -34,7 +32,7 @@ function findModuleFromOptions(tree, options, projectRoot) {
                 `${moduleBaseName}${moduleExt}`,
             ].map((x) => (0, devkit_1.joinPathFragments)(c, x));
             for (const sc of candidateFiles) {
-                if (tree.isFile(sc) && tree.read(sc, 'utf-8').includes('@NgModule')) {
+                if (tree.isFile(sc)) {
                     return (0, devkit_1.normalizePath)(sc);
                 }
             }
@@ -43,7 +41,7 @@ function findModuleFromOptions(tree, options, projectRoot) {
             `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`);
     }
 }
-function findModule(tree, generateDir, projectRoot, moduleExt = MODULE_EXT, routingModuleExt = ROUTING_MODULE_EXT) {
+function findModule(tree, generateDir, projectRoot) {
     let dir = generateDir;
     const projectRootParent = (0, path_1.dirname)(projectRoot);
     while (dir !== projectRootParent) {

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

@@ -5,16 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const selector_1 = require("../../utils/selector");
 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',
     });
@@ -22,7 +18,7 @@ async function normalizeOptions(tree, options) {
         throw new Error(`The component name '${name}' cannot contain a slash as it must be a valid JS symbol. Please use a different name.`);
     }
     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 { prefix, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, projectName);

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

@@ -17,7 +17,6 @@ export interface Schema {
   export?: boolean;
   exportDefault?: boolean;
   prefix?: string;
-  ngHtml?: boolean;
   skipFormat?: boolean;
 }
 

package/src/generators/component/schema.json

@@ -95,7 +95,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"
     },
     "export": {
       "type": "boolean",
@@ -108,11 +109,6 @@
       "default": false,
       "description": "Use default export for the component instead of a named export."
     },
-    "ngHtml": {
-      "type": "boolean",
-      "default": false,
-      "description": "Generate component template files with an '.ng.html' file extension instead of '.html'."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/convert-to-application-executor/convert-to-application-executor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToApplicationExecutor = convertToApplicationExecutor;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
+const semver_1 = require("semver");
 const targets_1 = require("../../utils/targets");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const validations_1 = require("../utils/validations");
@@ -25,16 +26,17 @@ const redundantExecutors = new Set([
     '@nx/angular:webpack-server',
 ]);
 async function convertToApplicationExecutor(tree, options) {
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let didAnySucceed = false;
     if (options.project) {
         (0, validations_1.validateProject)(tree, options.project);
-        didAnySucceed = await convertProjectTargets(tree, options.project, true);
+        didAnySucceed = await convertProjectTargets(tree, options.project, angularVersion, true);
     }
     else {
         const projects = (0, devkit_1.getProjects)(tree);
         for (const [projectName] of projects) {
             devkit_1.logger.info(`Converting project "${projectName}"...`);
-            const success = await convertProjectTargets(tree, projectName);
+            const success = await convertProjectTargets(tree, projectName, angularVersion);
             if (success) {
                 devkit_1.logger.info(`Project "${projectName}" converted successfully.`);
             }
@@ -50,7 +52,7 @@ async function convertToApplicationExecutor(tree, options) {
     }
     return didAnySucceed ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
 }
-async function convertProjectTargets(tree, projectName, isProvidedProject = false) {
+async function convertProjectTargets(tree, projectName, angularVersion, isProvidedProject = false) {
     function warnIfProvided(message) {
         if (isProvidedProject) {
             devkit_1.logger.warn(message);
@@ -61,7 +63,7 @@ async function convertProjectTargets(tree, projectName, isProvidedProject = fals
         warnIfProvided(`The provided project "${projectName}" is not an application. Skipping conversion.`);
         return false;
     }
-    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets);
+    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets, angularVersion);
     if (!buildTargetName) {
         warnIfProvided(`The provided project "${projectName}" does not have any targets using on of the ` +
             `'@angular-devkit/build-angular:browser', '@angular-devkit/build-angular:browser-esbuild', ` +
@@ -69,20 +71,12 @@ async function convertProjectTargets(tree, projectName, isProvidedProject = fals
         return false;
     }
     const useNxExecutor = project.targets[buildTargetName].executor.startsWith('@nx/angular:');
-    let newExecutor;
-    if (useNxExecutor) {
-        newExecutor = '@nx/angular:application';
-    }
-    else {
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        newExecutor =
-            angularMajorVersion >= 20
-                ? '@angular/build:application'
-                : '@angular-devkit/build-angular:application';
-    }
+    const newExecutor = useNxExecutor
+        ? '@nx/angular:application'
+        : '@angular-devkit/build-angular:application';
     const buildTarget = project.targets[buildTargetName];
     buildTarget.executor = newExecutor;
-    if (buildTarget.outputs) {
+    if ((0, semver_1.gte)(angularVersion, '17.1.0') && buildTarget.outputs) {
         buildTarget.outputs = buildTarget.outputs.map((output) => output === '{options.outputPath}' ? '{options.outputPath.base}' : output);
     }
     for (const [, options] of (0, targets_1.allTargetOptions)(buildTarget)) {
@@ -100,7 +94,10 @@ async function convertProjectTargets(tree, projectName, isProvidedProject = fals
             options['polyfills'] = [options['polyfills']];
         }
         let outputPath = options['outputPath'];
-        if (typeof outputPath === 'string') {
+        if ((0, semver_1.lt)(angularVersion, '17.1.0')) {
+            options['outputPath'] = outputPath?.replace(/\/browser\/?$/, '');
+        }
+        else if (typeof outputPath === 'string') {
             if (!/\/browser\/?$/.test(outputPath)) {
                 devkit_1.logger.warn(`The output location of the browser build has been updated from "${outputPath}" to ` +
                     `"${(0, posix_1.join)(outputPath, 'browser')}". ` +
@@ -124,6 +121,9 @@ async function convertProjectTargets(tree, projectName, isProvidedProject = fals
             }
         }
         // Delete removed options
+        if ((0, semver_1.lt)(angularVersion, '17.3.0')) {
+            delete options['deployUrl'];
+        }
         delete options['vendorChunk'];
         delete options['commonChunk'];
         delete options['resourcesOutputPath'];
@@ -189,12 +189,11 @@ async function convertProjectTargets(tree, projectName, isProvidedProject = fals
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     return true;
 }
-function getTargetsToConvert(targets) {
+function getTargetsToConvert(targets, angularVersion) {
     let buildTargetName;
     let serverTargetName;
     for (const target of Object.keys(targets)) {
         if (targets[target].executor === '@nx/angular:application' ||
-            targets[target].executor === '@angular/build:application' ||
             targets[target].executor === '@angular-devkit/build-angular:application') {
             devkit_1.logger.warn('The project is already using the application builder. Skipping conversion.');
             return {};
@@ -202,6 +201,10 @@ function getTargetsToConvert(targets) {
         // build target
         if (executorsToConvert.has(targets[target].executor)) {
             for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
+                if ((0, semver_1.lt)(angularVersion, '17.3.0') && options.deployUrl) {
+                    devkit_1.logger.warn(`The project is using the "deployUrl" option which is not available in the application builder. Skipping conversion.`);
+                    return {};
+                }
                 if (options.customWebpackConfig) {
                     devkit_1.logger.warn(`The project is using a custom webpack configuration which is not supported by the esbuild-based application executor. Skipping conversion.`);
                     return {};

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -27,12 +27,7 @@ const RENAMED_OPTIONS = {
     ngswConfigPath: 'serviceWorker',
 };
 const DEFAULT_PORT = 4200;
-const REMOVED_OPTIONS = [
-    'buildOptimizer',
-    'buildTarget',
-    'browserTarget',
-    'publicHost',
-];
+const REMOVED_OPTIONS = ['buildOptimizer', 'buildTarget', 'browserTarget'];
 function normalizeFromProjectRoot(tree, path, projectRoot) {
     if (projectRoot === '.') {
         if (!path.startsWith('./')) {
@@ -349,6 +344,7 @@ async function convertToRspack(tree, schema) {
     if (!schema.skipInstall) {
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/angular-rspack': versions_1.angularRspackVersion,
+            'webpack-merge': versions_1.webpackMergeVersion,
             'ts-node': versions_1.tsNodeVersion,
         });
         tasks.push(installTask);

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -30,7 +30,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
     const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
     if (withModuleFederationImportNodes.length > 0) {
         const withModuleFederationImportNode = withModuleFederationImportNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/angular';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
         ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
         const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
         if (exportedWithModuleFederationNodes.length > 0) {

package/src/generators/directive/directive.js

@@ -13,7 +13,7 @@ async function directiveGenerator(tree, schema) {
         symbolName: options.symbolName,
         fileName: options.fileName,
         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/directive/lib/normalize-options.js

@@ -5,21 +5,16 @@ const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const selector_1 = require("../../utils/selector");
 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 { prefix } = (0, devkit_1.readProjectConfiguration)(tree, projectName);

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

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

package/src/generators/directive/schema.json

@@ -12,15 +12,11 @@
       "command": "nx g @nx/angular: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: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: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:directive mylib/src/lib/foo --name=custom"
     }
   ],
@@ -82,10 +78,6 @@
       "default": false,
       "description": "The declaring NgModule exports this directive."
     },
-    "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": {
       "type": "boolean",
       "default": false,