@nx/angular 21.1.2 → 21.2.0-beta.2

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,98 @@
+"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',
+        moduleResolution: 'bundler',
+        ...(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.module = 'es2022';
+    }
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
+    (0, devkit_1.updateJson)(tree, tsconfigPath, (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;
+    });
+    if (options.unitTestRunner === 'jest') {
+        const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.spec.json');
+        (0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                module: 'commonjs',
+                moduleResolution: 'node10',
+            };
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            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;
+        });
+    }
+}

package/src/generators/library/library.js

@@ -3,28 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
+const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
 const setup_tailwind_1 = tslib_1.__importDefault(require("../setup-tailwind/setup-tailwind"));
-const version_utils_1 = require("../utils/version-utils");
+const add_jest_1 = require("../utils/add-jest");
+const add_vitest_1 = require("../utils/add-vitest");
 const dependencies_1 = require("../utils/dependencies");
+const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
+const version_utils_1 = require("../utils/version-utils");
 const add_module_1 = require("./lib/add-module");
+const add_project_1 = require("./lib/add-project");
 const add_standalone_component_1 = require("./lib/add-standalone-component");
-const enable_strict_type_checking_1 = require("./lib/enable-strict-type-checking");
-const normalize_options_1 = require("./lib/normalize-options");
-const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
-const update_tsconfig_1 = require("./lib/update-tsconfig");
 const create_files_1 = require("./lib/create-files");
-const add_project_1 = require("./lib/add-project");
-const add_jest_1 = require("../utils/add-jest");
+const normalize_options_1 = require("./lib/normalize-options");
 const set_generator_defaults_1 = require("./lib/set-generator-defaults");
-const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const test_runners_1 = require("../../utils/test-runners");
-const add_vitest_1 = require("../utils/add-vitest");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
+const update_tsconfig_files_1 = require("./lib/update-tsconfig-files");
 async function libraryGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
     // Do some validation checks
@@ -51,8 +50,8 @@ async function libraryGenerator(tree, schema) {
     }
     const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
-    (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
+    (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
     (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
     if (!libraryOptions.standalone) {
@@ -61,7 +60,6 @@ async function libraryGenerator(tree, schema) {
     else {
         await (0, add_standalone_component_1.addStandaloneComponent)(tree, options);
     }
-    setStrictMode(tree, libraryOptions);
     await addLinting(tree, libraryOptions);
     if (libraryOptions.addTailwind) {
         await (0, setup_tailwind_1.default)(tree, {
@@ -76,20 +74,16 @@ async function libraryGenerator(tree, schema) {
             'ng-packagr': pkgVersions.ngPackagrVersion,
         }, undefined, true);
         (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
-        if (libraryOptions.publishable) {
-            await (0, add_release_config_1.releaseTasks)(tree);
-        }
     }
-    (0, js_1.addTsConfigPath)(tree, libraryOptions.importPath, [
-        (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, './src', 'index.ts'),
-    ]);
     if (!libraryOptions.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-        (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name);
-    };
+    const tasks = [() => (0, devkit_1.installPackagesTask)(tree)];
+    if (libraryOptions.publishable) {
+        tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
+    }
+    tasks.push(() => (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function addUnitTestRunner(host, options) {
     switch (options.unitTestRunner) {
@@ -116,14 +110,6 @@ function updateNpmScopeIfBuildableOrPublishable(host, options) {
         (0, update_lib_package_npm_scope_1.updateLibPackageNpmScope)(host, options);
     }
 }
-function setStrictMode(host, options) {
-    if (options.strict) {
-        (0, enable_strict_type_checking_1.enableStrictTypeChecking)(host, options);
-    }
-    else {
-        (0, enable_strict_type_checking_1.setLibraryStrictDefault)(host, options.strict);
-    }
-}
 async function addLinting(host, options) {
     if (options.linter === 'none') {
         return;

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

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

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

@@ -7,9 +7,10 @@ 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}.module.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.entryPointDestination, `src/lib/${nameVariants.fileName}${options.moduleTypeSeparator}module.ts`));
     }
 }

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

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
-import { GeneratorOptions, NormalizedGeneratorOptions } from '../schema';
+import { type Tree } from '@nx/devkit';
+import type { 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,6 +2,7 @@
 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);
@@ -18,6 +19,7 @@ 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,
@@ -26,5 +28,6 @@ function normalizeOptions(tree, options) {
         libraryProject,
         secondaryEntryPoint,
         skipModule: options.skipModule ?? false,
+        moduleTypeSeparator,
     };
 }

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

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

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

@@ -28,12 +28,19 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
         to: `${(0, devkit_1.names)(unscopedNewProjectName).className}Module`,
     };
     const findModuleName = new RegExp(`\\b${moduleName.from}`, 'g');
-    const moduleFile = {
-        from: `${oldProjectName}.module`,
-        to: `${unscopedNewProjectName}.module`,
-    };
-    const findFileName = new RegExp(`\\b${moduleFile.from}`, 'g');
-    const filesToRename = [
+    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) => [
         {
             from: `${project.sourceRoot}/lib/${moduleFile.from}.ts`,
             to: `${project.sourceRoot}/lib/${moduleFile.to}.ts`,
@@ -42,15 +49,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 = [
-        {
-            regex: findFileName,
+        ...moduleFiles.map((moduleFile) => ({
+            regex: moduleFile.fromRegex,
             replaceWith: moduleFile.to,
-        },
+        })),
         {
             regex: findModuleName,
             replaceWith: moduleName.to,

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

@@ -8,9 +8,6 @@ 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-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
+        super(tree, ['@angular/build:karma', '@angular-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {