@nx/angular 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

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

@@ -6,14 +6,18 @@ const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common', angularMajorVersion >= 17 ? 'v17+' : 'pre-v17'), project.root, {
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19
+        ? project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src')
+        : project.root, 'server.ts');
+    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput: project.targets.build.options.outputPath,
         standalone: options.standalone,
+        commonEngineEntryPoint: angularMajorVersion >= 19 ? '@angular/ssr/node' : '@angular/ssr',
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'ts' : 'js';

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

@@ -1,10 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
+  bundler?: 'webpack' | 'rspack';
   remotes?: string[];
   dynamic?: boolean;
   setParserOptionsProject?: boolean;
@@ -14,20 +15,18 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';
   skipFormat?: boolean;
   standalone?: boolean;
   ssr?: boolean;
+  serverRouting?: boolean;
   typescriptConfiguration?: boolean;
 }

package/src/generators/host/schema.json

@@ -2,44 +2,52 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "NxMFHost",
   "cli": "nx",
-  "title": "Nx Module Federation Host Application",
-  "description": "Create an Angular Host Module Federation Application.",
+  "title": "Nx Module Federation Consumer (Host) Application",
+  "description": "Create an Angular Consumer (Host) Module Federation Application.",
   "type": "object",
   "examples": [
     {
       "command": "nx g @nx/angular:host appName --remotes=remote1",
-      "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the remote application to this application's configuration"
+      "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the Producer (remote) application to this application's configuration"
+    },
+    {
+      "command": "nx g @nx/angular:consumer appName --producers=remote1",
+      "description": "Create an Angular application with configuration in place for Module Federation. If the `producers` option is provided, attach the Producer (remote) application to this application's configuration"
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name to give to the host Angular application.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name to give to the Consumer (host) Angular application.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "remotes": {
       "type": "array",
-      "description": "The names of the remote applications to add to the host.",
-      "x-priority": "important"
+      "description": "The names of the Producers (remote) applications to add to the Consumer (host).",
+      "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?",
       "default": false
     },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -111,8 +119,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": ["jest", "vitest", "none"],
       "description": "Test runner to use for unit tests.",
+      "x-prompt": "Which unit test runner would you like to use?",
       "default": "jest"
     },
     "e2eTestRunner": {
@@ -141,12 +150,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
@@ -165,15 +168,19 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Whether to generate a host application that uses standalone components.",
+      "description": "Whether to generate a Consumer (host) application that uses standalone components.",
       "default": true
     },
     "ssr": {
-      "description": "Whether to configure SSR for the host application",
+      "description": "Whether to configure SSR for the Consumer (host) application",
       "type": "boolean",
       "default": false,
       "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_.",
+      "type": "boolean"
+    },
     "typescriptConfiguration": {
       "type": "boolean",
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
@@ -181,5 +188,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/init/init.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const version_utils_1 = require("../utils/version-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
+const version_utils_1 = require("../utils/version-utils");
 async function angularInitGenerator(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'init');
     ignoreAngularCacheDirectory(tree);
     const installTask = installAngularDevkitCoreIfMissing(tree, options);
     // For Angular inference plugin, we only want it during import since our

package/src/generators/library/files/base/README.md__tpl__

@@ -1,9 +1,9 @@
 # <%= libName %>
 
 This library was generated with [Nx](https://nx.dev).
-<% if (unitTesting) { %>
+<%_ if (unitTesting) { _%>
 
 ## Running unit tests
 
 Run `nx test <%= libName %>` to execute the unit tests.
-<% } %>
+<%_ } _%>

package/src/generators/library/lib/add-project.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { AngularProjectConfiguration } from '../../../utils/types';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): AngularProjectConfiguration;
+export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): Promise<AngularProjectConfiguration>;

package/src/generators/library/lib/add-project.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-function addProject(tree, libraryOptions) {
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
+async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -34,6 +36,10 @@ function addProject(tree, libraryOptions) {
             },
             defaultConfiguration: 'production',
         };
+        if (libraryOptions.publishable) {
+            const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), tree, libraryOptions.name, project);
+        }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;

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

@@ -8,9 +8,10 @@ const add_load_children_1 = require("./add-load-children");
 async function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
     await (0, component_1.componentGenerator)(tree, {
         ...componentOptions,
-        name: componentOptions.name,
-        directory: (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, 'src', 'lib', componentOptions.flat ? '' : componentOptions.name),
-        nameAndDirectoryFormat: 'as-provided',
+        name: (0, devkit_1.names)(libraryOptions.name).className,
+        path: (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, 'src', 'lib', componentOptions.flat
+            ? `${componentOptions.name}`
+            : `${componentOptions.name}/${componentOptions.name}`),
         standalone: true,
         export: true,
         skipFormat: true,

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

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
     const options = {
         buildable: false,
-        linter: eslint_1.Linter.EsLint,
+        linter: 'eslint',
         publishable: false,
         simpleName: false,
         skipFormat: false,
@@ -22,13 +21,12 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:library',
     });
     const fileName = options.simpleName
         ? projectNames.projectSimpleName
@@ -41,7 +39,7 @@ async function normalizeOptions(host, schema) {
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
-        linter: options.linter ?? eslint_1.Linter.EsLint,
+        linter: options.linter ?? 'eslint',
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
         prefix: options.prefix ?? 'lib',
         name: projectName,
@@ -53,6 +51,7 @@ async function normalizeOptions(host, schema) {
         fileName,
         importPath,
         ngCliSchematicLibRoot,
+        skipTests: options.unitTestRunner === 'none' ? true : options.skipTests,
         standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component`,
     };
     const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat, ...libraryOptions } = allNormalizedOptions;

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

@@ -2,17 +2,16 @@ import { UnitTestRunner } from '../../../utils/test-runners';
 import type { Linter, LinterType } from '@nx/eslint';
 export interface NormalizedSchema {
     libraryOptions: {
-        name: string;
+        directory: string;
+        name?: string;
         addTailwind?: boolean;
         skipFormat?: boolean;
         simpleName?: boolean;
         addModuleSpec?: boolean;
-        directory?: string;
         sourceDir?: string;
         buildable?: boolean;
         publishable?: boolean;
         importPath?: string;
-        standaloneConfig?: boolean;
         spec?: boolean;
         commonModule?: boolean;
         routing?: boolean;

package/src/generators/library/library.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function libraryGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
-exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
@@ -23,15 +21,12 @@ const add_jest_1 = require("../utils/add-jest");
 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");
 async function libraryGenerator(tree, schema) {
-    return await libraryGeneratorInternal(tree, {
-        // provide a default projectNameAndRootFormat to avoid breaking changes
-        // to external generators invoking this one
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function libraryGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
     // Do some validation checks
     if (!schema.routing && schema.lazy) {
         throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
@@ -54,7 +49,7 @@ async function libraryGeneratorInternal(tree, schema) {
     if (!libraryOptions.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     }
-    const project = (0, add_project_1.addProject)(tree, libraryOptions);
+    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);
@@ -81,6 +76,9 @@ async function libraryGeneratorInternal(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'),
@@ -94,13 +92,23 @@ async function libraryGeneratorInternal(tree, schema) {
     };
 }
 async function addUnitTestRunner(host, options) {
-    if (options.unitTestRunner === 'jest') {
-        await (0, add_jest_1.addJest)(host, {
-            name: options.name,
-            projectRoot: options.projectRoot,
-            skipPackageJson: options.skipPackageJson,
-            strict: options.strict,
-        });
+    switch (options.unitTestRunner) {
+        case test_runners_1.UnitTestRunner.Jest:
+            await (0, add_jest_1.addJest)(host, {
+                name: options.name,
+                projectRoot: options.projectRoot,
+                skipPackageJson: options.skipPackageJson,
+                strict: options.strict,
+            });
+            break;
+        case test_runners_1.UnitTestRunner.Vitest:
+            await (0, add_vitest_1.addVitest)(host, {
+                name: options.name,
+                projectRoot: options.projectRoot,
+                skipPackageJson: options.skipPackageJson,
+                strict: options.strict,
+            });
+            break;
     }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {
@@ -117,7 +125,7 @@ function setStrictMode(host, options) {
     }
 }
 async function addLinting(host, options) {
-    if (options.linter === eslint_1.Linter.None) {
+    if (options.linter === 'none') {
         return;
     }
     await (0, add_linting_1.default)(host, {

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

@@ -1,20 +1,17 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   addTailwind?: boolean;
   skipFormat?: boolean;
   simpleName?: boolean;
   addModuleSpec?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   sourceDir?: string;
   buildable?: boolean;
   publishable?: boolean;
   importPath?: string;
-  standaloneConfig?: boolean;
   spec?: boolean;
   flat?: boolean;
   commonModule?: boolean;

package/src/generators/library/schema.json

@@ -9,22 +9,16 @@
     "name": {
       "type": "string",
       "description": "The name of the library.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-priority": "important"
     },
     "directory": {
       "type": "string",
       "description": "A directory where the library is placed.",
-      "x-priority": "important"
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Which directory do you want to create the library in?"
     },
     "publishable": {
       "type": "boolean",
@@ -94,8 +88,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": ["jest", "vitest", "none"],
       "description": "Test runner to use for unit tests.",
+      "x-prompt": "Which unit test runner would you like to use?",
       "default": "jest"
     },
     "importPath": {
@@ -113,12 +108,6 @@
       "enum": ["eslint", "none"],
       "default": "eslint"
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "compilationMode": {
       "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
       "type": "string",
@@ -203,6 +192,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/library-examples.md"
 }

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const libraryExecutors = [
     '@angular-devkit/build-angular:ng-packagr',
+    '@angular/build:ng-packagr',
     '@nx/angular:ng-packagr-lite',
     '@nx/angular:package',
     // TODO(v17): remove when @nrwl/* scope is removed

package/src/generators/move/move.d.ts

@@ -1,4 +1,6 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
+/**
+ * @deprecated Use the `@nx/workspace:move` generator instead. It will be removed in Nx v22.
+ */
 export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;
-export declare function angularMoveGeneratorInternal(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/move.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = angularMoveGenerator;
-exports.angularMoveGeneratorInternal = angularMoveGeneratorInternal;
 const move_1 = require("@nx/workspace/src/generators/move/move");
+/**
+ * @deprecated Use the `@nx/workspace:move` generator instead. It will be removed in Nx v22.
+ */
 async function angularMoveGenerator(tree, schema) {
-    await angularMoveGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function angularMoveGeneratorInternal(tree, schema) {
     process.env.NX_ANGULAR_MOVE_INVOKED = 'true';
-    await (0, move_1.moveGeneratorInternal)(tree, schema);
+    await (0, move_1.moveGenerator)(tree, schema);
 }

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

@@ -1,5 +1,3 @@
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-
 export interface Schema {
   projectName: string;
   destination: string;
@@ -7,5 +5,4 @@ export interface Schema {
   importPath?: string;
   skipFormat?: boolean;
   newProjectName?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }

package/src/generators/move/schema.json

@@ -35,11 +35,6 @@
       },
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the new project name and destination as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "importPath": {
       "type": "string",
       "description": "The new import path to use in the `tsconfig.base.json`."

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-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {

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

@@ -8,15 +8,16 @@ const dependencies_1 = require("../../../utils/dependencies");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator {
     constructor(tree, project, projectConfig, logger) {
-        super(tree, '@angular-devkit/build-angular:ng-packagr', undefined, project, projectConfig, logger);
+        super(tree, ['@angular-devkit/build-angular:ng-packagr', '@angular/build:ng-packagr'], undefined, project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {
             return;
         }
         if (!this.targets.size) {
-            this.logger.warn(`There is no target in the project configuration using the ${this.builderName} builder. This might not be an issue. ` +
-                `Skipping updating the build configuration.`);
+            this.logger.warn(`There is no target in the project configuration using the ${this.possibleBuilderNames
+                .map((b) => `"${b}"`)
+                .join(', ')} builder${this.possibleBuilderNames.length > 1 ? 's' : ''}. This might not be an issue. Skipping updating the build configuration.`);
             return;
         }
         for (const [name, target] of this.targets) {

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

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

package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts

@@ -2,11 +2,11 @@ import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit
 import type { Logger, ProjectMigrationInfo, ValidationResult, WorkspaceRootFileType } from '../../utilities';
 import { Migrator } from '../migrator';
 export declare abstract class BuilderMigrator extends Migrator {
-    readonly builderName: string;
+    readonly possibleBuilderNames: string[];
     readonly rootFileType: WorkspaceRootFileType | undefined;
     targets: Map<string, TargetConfiguration>;
     protected skipMigration: boolean;
-    constructor(tree: Tree, builderName: string, rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    constructor(tree: Tree, possibleBuilderNames: string[], rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
     validate(): ValidationResult;
     isBuilderUsed(): boolean;
     protected collectBuilderTargets(): void;