@nx/angular 21.1.2 → 21.2.0-beta.1

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

@@ -3,7 +3,6 @@ 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");
@@ -26,17 +25,16 @@ 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, angularVersion, true);
+        didAnySucceed = await convertProjectTargets(tree, options.project, 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, angularVersion);
+            const success = await convertProjectTargets(tree, projectName);
             if (success) {
                 devkit_1.logger.info(`Project "${projectName}" converted successfully.`);
             }
@@ -52,7 +50,7 @@ async function convertToApplicationExecutor(tree, options) {
     }
     return didAnySucceed ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
 }
-async function convertProjectTargets(tree, projectName, angularVersion, isProvidedProject = false) {
+async function convertProjectTargets(tree, projectName, isProvidedProject = false) {
     function warnIfProvided(message) {
         if (isProvidedProject) {
             devkit_1.logger.warn(message);
@@ -63,7 +61,7 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
         warnIfProvided(`The provided project "${projectName}" is not an application. Skipping conversion.`);
         return false;
     }
-    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets, angularVersion);
+    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets);
     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', ` +
@@ -71,12 +69,20 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
         return false;
     }
     const useNxExecutor = project.targets[buildTargetName].executor.startsWith('@nx/angular:');
-    const newExecutor = useNxExecutor
-        ? '@nx/angular:application'
-        : '@angular-devkit/build-angular:application';
+    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 buildTarget = project.targets[buildTargetName];
     buildTarget.executor = newExecutor;
-    if ((0, semver_1.gte)(angularVersion, '17.1.0') && buildTarget.outputs) {
+    if (buildTarget.outputs) {
         buildTarget.outputs = buildTarget.outputs.map((output) => output === '{options.outputPath}' ? '{options.outputPath.base}' : output);
     }
     for (const [, options] of (0, targets_1.allTargetOptions)(buildTarget)) {
@@ -94,10 +100,7 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
             options['polyfills'] = [options['polyfills']];
         }
         let outputPath = options['outputPath'];
-        if ((0, semver_1.lt)(angularVersion, '17.1.0')) {
-            options['outputPath'] = outputPath?.replace(/\/browser\/?$/, '');
-        }
-        else if (typeof outputPath === 'string') {
+        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')}". ` +
@@ -121,9 +124,6 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
             }
         }
         // Delete removed options
-        if ((0, semver_1.lt)(angularVersion, '17.3.0')) {
-            delete options['deployUrl'];
-        }
         delete options['vendorChunk'];
         delete options['commonChunk'];
         delete options['resourcesOutputPath'];
@@ -145,18 +145,34 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
         }
         const browserTsConfigJson = (0, devkit_1.readJson)(tree, browserTsConfigPath);
         const serverTsConfigJson = (0, devkit_1.readJson)(tree, serverTsConfigPath);
+        const serverFiles = ['src/main.server.ts', 'src/server.ts'];
+        if (tree.exists((0, posix_1.join)(project.root, 'src/app/app.config.server.ts'))) {
+            serverFiles.push('src/app/app.config.server.ts');
+        }
         const files = new Set([
             ...(browserTsConfigJson.files ?? []),
             ...(serverTsConfigJson.files ?? []),
         ]);
-        // Server file will be added later by the setup-ssr generator
+        // Server files will be added later if needed by the setup-ssr generator
         files.delete('server.ts');
-        browserTsConfigJson.files = Array.from(files);
+        files.delete('src/server.ts');
+        files.delete('src/main.server.ts');
+        if (files.size) {
+            browserTsConfigJson.files = Array.from(files);
+        }
+        else if (browserTsConfigJson.files) {
+            delete browserTsConfigJson.files;
+        }
         browserTsConfigJson.compilerOptions ?? {};
         browserTsConfigJson.compilerOptions.types = Array.from(new Set([
             ...(browserTsConfigJson.compilerOptions.types ?? []),
             ...(serverTsConfigJson.compilerOptions?.types ?? []),
         ]));
+        if (browserTsConfigJson.exclude?.length) {
+            const normalizeExclude = (exclude) => exclude.startsWith('./') ? exclude.slice(2) : exclude;
+            browserTsConfigJson.exclude = browserTsConfigJson.exclude.filter((exclude) => !serverFiles.includes(normalizeExclude(exclude)));
+        }
+        (0, devkit_1.writeJson)(tree, browserTsConfigPath, browserTsConfigJson);
         // Delete server tsconfig
         tree.delete(serverTsConfigPath);
     }
@@ -189,11 +205,12 @@ async function convertProjectTargets(tree, projectName, angularVersion, isProvid
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     return true;
 }
-function getTargetsToConvert(targets, angularVersion) {
+function getTargetsToConvert(targets) {
     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 {};
@@ -201,10 +218,6 @@ function getTargetsToConvert(targets, angularVersion) {
         // 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 v18 or lower defaults to false
+        // Angular v19 or higher defaults to true, while lower versions default to false
         setStandalone: (angularMajorVersion >= 19 && !options.standalone) ||
             (angularMajorVersion < 19 && options.standalone),
         tpl: '',

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

@@ -5,16 +5,21 @@ 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: 'directive',
+        suffix: options.type,
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
     const { className } = (0, devkit_1.names)(name);
-    const { className: suffixClassName } = (0, devkit_1.names)('directive');
+    const suffixClassName = options.type ? (0, devkit_1.names)(options.type).className : '';
     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,6 +8,7 @@ export interface Schema {
   standalone?: boolean;
   module?: string;
   export?: boolean;
+  type?: string;
   skipFormat?: boolean;
 }
 

package/src/generators/directive/schema.json

@@ -12,11 +12,15 @@
       "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 `FooDirective` at `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`",
       "command": "nx g @nx/angular:directive mylib/src/lib/foo"
     },
     {
-      "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`",
+      "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`",
       "command": "nx g @nx/angular:directive mylib/src/lib/foo --name=custom"
     }
   ],
@@ -78,6 +82,10 @@
       "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,

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 (Developer Preview). _Note: this is only supported in Angular versions >= 19.0.0_.",
+      "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.",
       "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.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+        const devkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
             pkgVersions.angularDevkitVersion;
         try {
             (0, devkit_1.ensurePackage)('@angular-devkit/core', devkitVersion);

package/src/generators/library/files/base/tsconfig.json__tpl__

@@ -1,7 +1,8 @@
 {
-  "compilerOptions": {
-    "target": "es2022"<% if (disableModernClassFieldsBehavior) { %>,
-    "useDefineForClassFields": false<% } %>
+  "extends": "<%= rootTsConfig %>",
+  "compilerOptions": {},
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false
   },
   "files": [],
   "include": [],
@@ -9,6 +10,5 @@
     {
       "path": "./tsconfig.lib.json"
     }
-  ],
-  "extends": "<%= rootTsConfig %>"
+  ]
 }

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

@@ -1,2 +1,2 @@
-<% if (!skipModule) { %>export * from './lib/<%= libFileName %>.module';<% } %><% if(routing) { %>
+<% if (!skipModule) { %>export * from './lib/<%= libFileName %><%= moduleTypeSeparator %>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 %>Component } from './<%= pathToComponent %>.component';
+import { <%= libClassName %><%= componentType %> } from './<%= pathToComponent %><%= componentFileSuffix %>';
 
 export const <%= libPropertyName %>Routes: Route[] = [
-  { path: '', component: <%= libClassName %>Component }
+  { path: '', component: <%= libClassName %><%= componentType %> }
 ];

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

@@ -14,6 +14,7 @@ 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

@@ -14,7 +14,12 @@ function createFiles(tree, options, project) {
         : (0, devkit_1.joinPathFragments)(options.libraryOptions.fileName, options.libraryOptions.fileName);
     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,
@@ -29,7 +34,9 @@ function createFiles(tree, options, project) {
         importPath: options.libraryOptions.importPath,
         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);
@@ -39,7 +46,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((0, devkit_1.joinPathFragments)(project.sourceRoot, `lib/${options.libraryOptions.fileName}.module.ts`));
+            tree.delete(options.libraryOptions.modulePath);
         }
     }
     if (!options.libraryOptions.routing) {

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

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

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

@@ -4,6 +4,7 @@ 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
@@ -35,7 +36,8 @@ async function normalizeOptions(host, schema) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
+    const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(host);
+    const modulePath = `${projectRoot}/src/lib/${fileName}${moduleTypeSeparator}module.ts`;
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
@@ -53,8 +55,10 @@ 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: {
@@ -70,6 +74,7 @@ async function normalizeOptions(host, schema) {
             selector,
             skipSelector,
             flat,
+            type: componentType,
         },
     };
 }

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

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

package/src/generators/library/lib/set-generator-defaults.js

@@ -8,6 +8,7 @@ function setGeneratorDefaults(tree, options) {
     nxJson.generators['@nx/angular:library'] = {
         linter: options.libraryOptions.linter,
         unitTestRunner: options.libraryOptions.unitTestRunner,
+        strict: !options.libraryOptions.strict ? false : undefined,
         ...(nxJson.generators['@nx/angular:library'] || {}),
     };
     (0, devkit_1.updateNxJson)(tree, nxJson);

package/src/generators/library/lib/update-tsconfig-files.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function updateTsConfigFiles(tree: Tree, options: NormalizedSchema['libraryOptions']): void;

package/src/generators/library/lib/update-tsconfig-files.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsConfigFiles = updateTsConfigFiles;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
+const semver_1 = require("semver");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
+const version_utils_1 = require("../../utils/version-utils");
+function updateTsConfigFiles(tree, options) {
+    (0, js_1.extractTsConfigBase)(tree);
+    updateProjectConfig(tree, options);
+    updateProjectIvyConfig(tree, options);
+    (0, js_1.addTsConfigPath)(tree, options.importPath, [
+        (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.ts'),
+    ]);
+    const compilerOptions = {
+        skipLibCheck: true,
+        experimentalDecorators: true,
+        importHelpers: true,
+        target: 'es2022',
+        ...(options.strict
+            ? {
+                strict: true,
+                noImplicitOverride: true,
+                noPropertyAccessFromIndexSignature: true,
+                noImplicitReturns: true,
+                noFallthroughCasesInSwitch: true,
+            }
+            : {}),
+    };
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(angularVersion, '18.1.0')) {
+        compilerOptions.useDefineForClassFields = false;
+    }
+    if (angularMajorVersion >= 20) {
+        compilerOptions.module = 'preserve';
+    }
+    else {
+        compilerOptions.moduleResolution = 'bundler';
+        compilerOptions.module = 'es2022';
+    }
+    (0, devkit_1.updateJson)(tree, `${options.projectRoot}/tsconfig.json`, (json) => {
+        json.compilerOptions = {
+            ...json.compilerOptions,
+            ...compilerOptions,
+        };
+        json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, (0, js_1.getRootTsConfigFileName)(tree));
+        if (options.strict) {
+            json.angularCompilerOptions = {
+                ...json.angularCompilerOptions,
+                strictInjectionParameters: true,
+                strictInputAccessModifiers: true,
+                typeCheckHostBindings: angularMajorVersion >= 20 ? true : undefined,
+                strictTemplates: true,
+            };
+        }
+        return json;
+    });
+}
+function updateProjectConfig(host, options) {
+    (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
+        json.include = ['src/**/*.ts'];
+        json.exclude = [
+            ...new Set([
+                ...(json.exclude || []),
+                'jest.config.ts',
+                'src/**/*.test.ts',
+                'src/**/*.spec.ts',
+            ]),
+        ];
+        return json;
+    });
+    // tsconfig.json
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(host, options.projectRoot, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
+}
+function updateProjectIvyConfig(host, options) {
+    if (options.buildable || options.publishable) {
+        return (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.prod.json`, (json) => {
+            json.angularCompilerOptions['compilationMode'] =
+                options.compilationMode === 'full' ? undefined : 'partial';
+            return json;
+        });
+    }
+}