@nx/angular 20.0.0-canary.20240928-f221a41 → 20.0.0-canary.20241002-1d10a19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.0.0-canary.20240928-f221a41",
+  "version": "20.0.0-canary.20241002-1d10a19",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,13 +79,13 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "~0.6.0",
-    "@nx/devkit": "20.0.0-canary.20240928-f221a41",
-    "@nx/js": "20.0.0-canary.20240928-f221a41",
-    "@nx/eslint": "20.0.0-canary.20240928-f221a41",
-    "@nx/webpack": "20.0.0-canary.20240928-f221a41",
-    "@nx/web": "20.0.0-canary.20240928-f221a41",
-    "@nx/workspace": "20.0.0-canary.20240928-f221a41",
+    "@module-federation/enhanced": "0.6.6",
+    "@nx/devkit": "20.0.0-canary.20241002-1d10a19",
+    "@nx/js": "20.0.0-canary.20241002-1d10a19",
+    "@nx/eslint": "20.0.0-canary.20241002-1d10a19",
+    "@nx/webpack": "20.0.0-canary.20241002-1d10a19",
+    "@nx/web": "20.0.0-canary.20241002-1d10a19",
+    "@nx/workspace": "20.0.0-canary.20241002-1d10a19",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/utilities/webpack.js

@@ -16,11 +16,11 @@ async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig,
     // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
     // then await will just resolve that object.
     const config = await customWebpackConfiguration;
-    // The extra Webpack configuration file can export a synchronous or asynchronous function,
-    // for instance: `module.exports = async config => { ... }`.
     let newConfig;
     if (typeof config === 'function') {
-        newConfig = config(baseWebpackConfig, options, target);
+        // The extra Webpack configuration file can export a synchronous or asynchronous function,
+        // for instance: `module.exports = async config => { ... }`.
+        newConfig = await config(baseWebpackConfig, options, target);
     }
     else {
         newConfig = (0, webpack_merge_1.merge)(baseWebpackConfig, config);

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

@@ -7,16 +7,14 @@ const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -40,6 +38,7 @@ async function normalizeOptions(host, options) {
         linter: eslint_1.Linter.EsLint,
         strict: true,
         standalone: true,
+        directory: appProjectRoot,
         ...options,
         prefix: options.prefix || 'app',
         name: appProjectName,

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

@@ -1,10 +1,10 @@
-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;
   addTailwind?: boolean;
   skipFormat?: boolean;
   inlineStyle?: boolean;
@@ -14,8 +14,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/application/schema.json

@@ -6,26 +6,21 @@
   "type": "object",
   "cli": "nx",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
+      "pattern": "^[a-zA-Z][^:]*$",
       "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"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -187,6 +182,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

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

@@ -8,8 +8,7 @@ async function normalizeOptions(tree, options) {
     options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,9 +1,6 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;

package/src/generators/component/schema.json

@@ -7,25 +7,19 @@
   "description": "Creates a new Angular component.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "The path at which to create the component file, relative to the workspace root. By default, it is set to the root of the project.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?"
+      "x-prompt": "Where to create the component?"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?"
     },
     "prefix": {
       "type": "string",
@@ -118,6 +112,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "examplesFile": "../../../docs/component-examples.md"
 }

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

@@ -7,8 +7,7 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   prefix?: string;
   skipTests?: boolean;
   skipImport?: boolean;

package/src/generators/directive/schema.json

@@ -7,25 +7,19 @@
   "description": "Creates a new Angular directive.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the new directive.",
+      "description": "The path at which to create the directive file.",
+      "x-prompt": "Where to put the directive?",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
-      "x-prompt": "What name would you like to use for the directive?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the directive file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
+      }
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the directive in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "The name of the new directive.",
+      "x-prompt": "What name would you like to use for the directive?"
     },
     "prefix": {
       "type": "string",
@@ -77,5 +71,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/federate-module/lib/add-remote.js

@@ -16,7 +16,6 @@ async function addRemote(tree, schema) {
             directory: schema.remoteDirectory,
             host: schema.host,
             standalone: schema.standalone,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat,
             unitTestRunner: schema.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
             e2eTestRunner: schema.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
             skipFormat: true,
@@ -26,7 +25,6 @@ async function addRemote(tree, schema) {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',
-            projectNameAndRootFormat: schema.projectNameAndRootFormat,
         });
         projectRoot = remoteRoot;
         remoteName = projectName;

package/src/generators/federate-module/schema.d.ts

@@ -1,4 +1,3 @@
-import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import { UnitTestRunner, E2eTestRunner } from '../utils/testing';
 
 export interface Schema {
@@ -7,7 +6,6 @@ export interface Schema {
   remote: string;
   remoteDirectory?: string;
   host?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   standalone?: boolean;

package/src/generators/federate-module/schema.json

@@ -37,11 +37,6 @@
       "description": "The directory of the new remote application if one needs to be created.",
       "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 for the remote if one needs to be created.",
       "type": "string",

package/src/generators/host/host.js

@@ -37,13 +37,12 @@ async function host(tree, schema) {
             }
         });
     }
-    const { projectName: hostProjectName, projectNameAndRootFormat, projectRoot: appRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
         standalone: options.standalone,

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

@@ -1,10 +1,10 @@
-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;
   remotes?: string[];
   dynamic?: boolean;
   setParserOptionsProject?: boolean;
@@ -14,8 +14,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/host/schema.json

@@ -12,14 +12,20 @@
     }
   ],
   "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 host Angular application.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "remotes": {
       "type": "array",
@@ -31,15 +37,6 @@
       "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",
@@ -181,5 +178,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

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

@@ -9,8 +9,9 @@ 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',
+        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

@@ -22,12 +22,12 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, 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,
     });
     const fileName = options.simpleName
         ? projectNames.projectSimpleName

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

@@ -2,12 +2,12 @@ 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;

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

@@ -1,15 +1,13 @@
-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;

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",
@@ -203,6 +197,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/library-examples.md"
 }

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/pipe/lib/normalize-options.js

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   skipImport?: boolean;
   standalone?: boolean;

package/src/generators/pipe/schema.json

@@ -7,34 +7,19 @@
   "additionalProperties": false,
   "description": "Creates an Angular pipe.",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The path at which to create the pipe file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the pipe file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the pipe in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?"
     },
     "skipTests": {
       "type": "boolean",
@@ -67,5 +52,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/remote/remote.js

@@ -16,13 +16,12 @@ async function remote(tree, schema) {
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    const { projectName: remoteProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,

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

@@ -1,10 +1,10 @@
-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;
   host?: string;
   port?: number;
   setParserOptionsProject?: boolean;
@@ -13,8 +13,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/remote/schema.json

@@ -12,14 +12,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name to give to the remote Angular app.",
       "$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 remote Angular app.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "host": {
       "type": "string",
@@ -31,15 +37,6 @@
       "type": "number",
       "description": "The port on which this app should be served."
     },
-    "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",
@@ -174,5 +171,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

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

@@ -7,8 +7,7 @@ async function normalizeOptions(tree, options) {
     options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam/scam.js

@@ -13,8 +13,6 @@ async function scamGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertComponentToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -21,6 +20,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   projectName: string;
   fileName: string;

package/src/generators/scam/schema.json

@@ -6,41 +6,26 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam my-sample --directory=my-lib/src/lib/my-sample",
+      "command": "nx g @nx/angular:scam my-lib/src/lib/my-sample/my-sample",
       "description": "Generate a `MySampleComponent` component in the `my-lib` library."
     }
   ],
   "description": "Creates a new Angular SCAM.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "The path at which to create the SCAM file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?"
+      "x-prompt": "What is the path of the new SCAM?"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the SCAM files. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the SCAM in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?"
     },
     "displayBlock": {
       "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -132,5 +117,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam-directive/scam-directive.js

@@ -13,8 +13,6 @@ async function scamDirectiveGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertDirectiveToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   prefix?: string;
@@ -13,6 +12,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   export: boolean;
   fileName: string;

package/src/generators/scam-directive/schema.json

@@ -13,13 +13,18 @@
   "description": "Creates a new, generic Angular directive definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the directive.",
+      "description": "The path at which to create the SCAM Directive files, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "What is the path of the new directive?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the directive.",
       "x-prompt": "What name would you like to use for the directive?",
       "x-priority": "important"
     },
@@ -92,5 +97,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam-pipe/scam-pipe.js

@@ -13,8 +13,6 @@ async function scamPipeGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertPipeToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   export?: boolean;
@@ -11,6 +10,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   export: boolean;
   fileName: string;

package/src/generators/scam-pipe/schema.json

@@ -6,43 +6,28 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam-pipe --project=my-lib --flat=false my-transformation",
+      "command": "nx g @nx/angular:scam-pipe mylib/src/lib/my-transformation/my-transformation",
       "description": "Generates a `MyTransformationPipe` in a `my-transformation` folder in the `my-lib` project"
     }
   ],
   "description": "Creates a new, generic Angular pipe definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The path at which to create the pipe file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?",
-      "x-priority": "important"
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "skipTests": {
       "type": "boolean",
       "description": "Do not create `spec.ts` test files for the new pipe.",
@@ -73,5 +58,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/utils/testing.js

@@ -17,22 +17,20 @@ const remote_1 = require("../remote/remote");
 async function generateTestApplication(tree, options) {
     tree.write('.gitignore', '');
     await (0, application_1.applicationGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
 async function generateTestHostApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, host_1.host)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, host_1.host)(tree, { ...options });
 }
 async function generateTestRemoteApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, remote_1.remote)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, remote_1.remote)(tree, { ...options });
 }
 async function generateTestLibrary(tree, options) {
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
@@ -40,19 +38,18 @@ async function createStorybookTestWorkspaceForLib(libName) {
     let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        name: libName,
+        directory: libName,
         buildable: false,
         linter: eslint_1.Linter.EsLint,
         publishable: false,
         simpleName: false,
         skipFormat: true,
         unitTestRunner: test_runners_1.UnitTestRunner.Jest,
-        projectNameAndRootFormat: 'as-provided',
         standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-button',
-        directory: `${libName}/src/lib/test-button`,
+        path: `${libName}/src/lib/test-button/test-button`,
         standalone: false,
         skipFormat: true,
     });
@@ -82,7 +79,7 @@ export class TestButtonComponent {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'barrel-button',
-        directory: `${libName}/src/lib/barrel/barrel-button`,
+        path: `${libName}/src/lib/barrel/barrel-button/barrel-button`,
         module: 'barrel',
         standalone: false,
         skipFormat: true,
@@ -104,14 +101,14 @@ export class BarrelModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-button',
-        directory: `${libName}/src/lib/variable-declare/variable-declare-button`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-button/variable-declare-button`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-view',
-        directory: `${libName}/src/lib/variable-declare/variable-declare-view`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-view/variable-declare-view`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
@@ -139,21 +136,21 @@ export class VariableDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-button',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button/variable-spread-declare-button`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-view',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view/variable-spread-declare-view`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-anotherview',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview/variable-spread-declare-anotherview`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
@@ -181,14 +178,14 @@ export class VariableSpreadDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp1',
-        directory: `${libName}/src/lib/static-member-declarations/cmp1`,
+        path: `${libName}/src/lib/static-member-declarations/cmp1/cmp1`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp2',
-        directory: `${libName}/src/lib/static-member-declarations/cmp2`,
+        path: `${libName}/src/lib/static-member-declarations/cmp2/cmp2`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
@@ -215,13 +212,13 @@ export class StaticMemberDeclarationsModule {
     await (0, component_1.componentGenerator)(tree, {
         name: 'nested-button',
         module: 'nested',
-        directory: `${libName}/src/lib/nested/nested-button`,
+        path: `${libName}/src/lib/nested/nested-button/nested-button`,
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-other',
-        directory: `${libName}/src/lib/test-other`,
+        path: `${libName}/src/lib/test-other/test-other`,
         standalone: false,
         skipFormat: true,
     });

package/src/utils/versions.d.ts

@@ -13,7 +13,7 @@ export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "~2.5.0";
-export declare const moduleFederationEnhancedVersion = "~0.6.0";
+export declare const moduleFederationEnhancedVersion = "0.6.6";
 export declare const angularEslintVersion = "^18.3.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -16,7 +16,7 @@ exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '~2.5.0';
-exports.moduleFederationEnhancedVersion = '~0.6.0';
+exports.moduleFederationEnhancedVersion = '0.6.6';
 exports.angularEslintVersion = '^18.3.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';