@nx/angular 19.9.0-canary.20240921-a510b36 → 20.0.0-beta.0

package/generators.json

@@ -10,14 +10,14 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGeneratorInternal",
+      "factory": "./src/generators/application/application",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Creates an Angular application."
     },
     "component": {
-      "factory": "./src/generators/component/component#componentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "aliases": ["c"],
       "description": "Generate an Angular Component."
@@ -63,7 +63,7 @@
       "hidden": true
     },
     "library": {
-      "factory": "./src/generators/library/library#libraryGeneratorInternal",
+      "factory": "./src/generators/library/library",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",
@@ -76,13 +76,13 @@
       "description": "Creates a secondary entry point for an Angular publishable library."
     },
     "remote": {
-      "factory": "./src/generators/remote/remote#remoteInternal",
+      "factory": "./src/generators/remote/remote",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
       "description": "Generate a Remote Angular Module Federation Application."
     },
     "move": {
-      "factory": "./src/generators/move/move#angularMoveGeneratorInternal",
+      "factory": "./src/generators/move/move#angularMoveGenerator",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
@@ -94,7 +94,7 @@
       "description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}"
     },
     "host": {
-      "factory": "./src/generators/host/host#hostInternal",
+      "factory": "./src/generators/host/host",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
       "description": "Generate a Host Angular Module Federation Application."
@@ -173,7 +173,7 @@
       "description": "Adds Storybook configuration to a project."
     },
     "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigurationInternal",
+      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "Setup Cypress component testing for a project."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.9.0-canary.20240921-a510b36",
+  "version": "20.0.0-beta.0",
   "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": {
@@ -80,14 +80,14 @@
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
     "@module-federation/enhanced": "~0.6.0",
-    "@nx/devkit": "19.9.0-canary.20240921-a510b36",
-    "@nx/js": "19.9.0-canary.20240921-a510b36",
-    "@nx/eslint": "19.9.0-canary.20240921-a510b36",
-    "@nx/webpack": "19.9.0-canary.20240921-a510b36",
-    "@nx/web": "19.9.0-canary.20240921-a510b36",
-    "@nx/workspace": "19.9.0-canary.20240921-a510b36",
+    "@nx/devkit": "20.0.0-beta.0",
+    "@nx/js": "20.0.0-beta.0",
+    "@nx/eslint": "20.0.0-beta.0",
+    "@nx/webpack": "20.0.0-beta.0",
+    "@nx/web": "20.0.0-beta.0",
+    "@nx/workspace": "20.0.0-beta.0",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.9.0-canary.20240921-a510b36"
+    "@nrwl/angular": "20.0.0-beta.0"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

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

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

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
-exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
@@ -11,12 +10,6 @@ const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependenc
 const lib_1 = require("./lib");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
-    return await applicationGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function applicationGeneratorInternal(tree, schema) {
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {

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

@@ -13,7 +13,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/angular:application',
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;

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

@@ -1,5 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function componentGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function componentGeneratorInternal(tree: Tree, rawOptions: Schema): Promise<void>;
 export default componentGenerator;

package/src/generators/component/component.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function componentGenerator(tree, rawOptions) {
-    await componentGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function componentGeneratorInternal(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {

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

@@ -7,13 +7,9 @@ const selector_1 = require("../../utils/selector");
 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, {
-        artifactType: 'component',
-        callingGenerator: '@nx/angular:component',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -20,19 +20,6 @@ export interface Schema {
   export?: boolean;
   prefix?: string;
   skipFormat?: boolean;
-
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/component/schema.json

@@ -27,15 +27,6 @@
       "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."
-    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to the generated component selector.",
@@ -94,12 +85,6 @@
       "description": "Do not create `spec.ts` test files for the new component.",
       "default": false
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create the new files at the top level of the current project.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "skipImport": {
       "type": "boolean",
       "description": "Do not import this component into the owning NgModule.",

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,9 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { CypressComponentConfigSchema } from './schema';
-export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-export declare function cypressComponentConfigurationInternal(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default cypressComponentConfiguration;

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
-exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
@@ -10,16 +9,11 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
-function cypressComponentConfiguration(tree, options) {
-    return cypressComponentConfigurationInternal(tree, {
-        ...options,
-    });
-}
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-async function cypressComponentConfigurationInternal(tree, options) {
+async function cypressComponentConfiguration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const installTask = await baseCyCTConfig(tree, {

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

@@ -6,13 +6,9 @@ const selector_1 = require("../../utils/selector");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'directive',
-        callingGenerator: '@nx/angular:directive',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -12,18 +12,6 @@ export interface Schema {
   module?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/directive/schema.json

@@ -27,15 +27,6 @@
       "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."
-    },
     "prefix": {
       "type": "string",
       "description": "A prefix to apply to generated selectors.",
@@ -70,12 +61,6 @@
       "type": "boolean",
       "default": true
     },
-    "flat": {
-      "type": "boolean",
-      "description": "When true (the default), creates the new files at the top level of the current project.",
-      "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "module": {
       "type": "string",
       "description": "The filename of the declaring NgModule.",

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

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

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

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

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
-exports.hostInternal = hostInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
@@ -12,13 +11,7 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
-async function host(tree, options) {
-    return await hostInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function hostInternal(tree, schema) {
+async function host(tree, schema) {
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -44,12 +37,11 @@ async function hostInternal(tree, schema) {
             }
         });
     }
-    const { projectName: hostProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    const { projectName: hostProjectName, projectNameAndRootFormat, projectRoot: appRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:host',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
@@ -83,16 +75,11 @@ async function hostInternal(tree, schema) {
         installTasks.push(ssrInstallTask);
     }
     for (const remote of remotesToGenerate) {
-        let remoteDirectory = options.directory;
-        if (options.projectNameAndRootFormat === 'as-provided' &&
-            options.directory) {
-            /**
-             * With the `as-provided` format, the provided directory would be the root
-             * of the host application. Append the remote name to the host parent
-             * directory to get the remote directory.
-             */
-            remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
-        }
+        const remoteDirectory = options.directory
+            ? (0, devkit_1.joinPathFragments)(options.directory, '..', remote)
+            : appRoot === '.'
+                ? remote
+                : (0, devkit_1.joinPathFragments)(appRoot, '..', remote);
         await (0, remote_1.default)(tree, {
             ...options,
             name: remote,

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

@@ -28,7 +28,6 @@ async function normalizeOptions(host, schema) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:library',
     });
     const fileName = options.simpleName
         ? projectNames.projectSimpleName

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,7 +1,6 @@
 "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");
@@ -24,14 +23,6 @@ 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");
 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) {
     // Do some validation checks
     if (!schema.routing && schema.lazy) {
         throw new Error(`To use "--lazy" option, "--routing" must also be set.`);

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

@@ -1,4 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 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,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = angularMoveGenerator;
-exports.angularMoveGeneratorInternal = angularMoveGeneratorInternal;
 const move_1 = require("@nx/workspace/src/generators/move/move");
 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/pipe/lib/normalize-options.js

@@ -5,13 +5,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 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, {
-        artifactType: 'pipe',
-        callingGenerator: '@nx/angular:pipe',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -10,18 +10,6 @@ export interface Schema {
   module?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/pipe/schema.json

@@ -36,12 +36,6 @@
       "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."
     },
-    "flat": {
-      "type": "boolean",
-      "default": true,
-      "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "skipTests": {
       "type": "boolean",
       "description": "Do not create \"spec.ts\" test files for the new pipe.",

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

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

package/src/generators/remote/remote.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
-exports.remoteInternal = remoteInternal;
 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");
@@ -10,13 +9,7 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const versions_1 = require("@nx/js/src/utils/versions");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-async function remote(tree, options) {
-    return await remoteInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function remoteInternal(tree, schema) {
+async function remote(tree, schema) {
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -28,7 +21,6 @@ async function remoteInternal(tree, schema) {
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:remote',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);

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

@@ -6,13 +6,9 @@ const devkit_1 = require("@nx/devkit");
 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, {
-        artifactType: options.type,
-        callingGenerator: '@nx/angular:scam',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -18,18 +18,6 @@ export interface Schema {
   skipSelector?: boolean;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/scam/schema.json

@@ -90,12 +90,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create the new files at the top level of the current project.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "selector": {
       "type": "string",
       "format": "html-selector",

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

@@ -5,13 +5,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 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, {
-        artifactType: 'directive',
-        callingGenerator: '@nx/angular:scam-directive',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -10,18 +10,6 @@ export interface Schema {
   selector?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

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

@@ -5,13 +5,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 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, {
-        artifactType: 'pipe',
-        callingGenerator: '@nx/angular:scam-pipe',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -8,18 +8,6 @@ export interface Schema {
   inlineScam?: boolean;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/utils/testing.js

@@ -52,7 +52,7 @@ async function createStorybookTestWorkspaceForLib(libName) {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-button',
-        project: libName,
+        directory: `${libName}/src/lib/test-button`,
         standalone: false,
         skipFormat: true,
     });
@@ -82,8 +82,7 @@ export class TestButtonComponent {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'barrel-button',
-        project: libName,
-        path: `${libName}/src/lib/barrel`,
+        directory: `${libName}/src/lib/barrel/barrel-button`,
         module: 'barrel',
         standalone: false,
         skipFormat: true,
@@ -105,16 +104,14 @@ export class BarrelModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-button',
-        project: libName,
-        path: `${libName}/src/lib/variable-declare`,
+        directory: `${libName}/src/lib/variable-declare/variable-declare-button`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-view',
-        project: libName,
-        path: `${libName}/src/lib/variable-declare`,
+        directory: `${libName}/src/lib/variable-declare/variable-declare-view`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
@@ -142,24 +139,21 @@ export class VariableDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-button',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-view',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-anotherview',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
@@ -187,16 +181,14 @@ export class VariableSpreadDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp1',
-        project: libName,
-        path: `${libName}/src/lib/static-member-declarations`,
+        directory: `${libName}/src/lib/static-member-declarations/cmp1`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp2',
-        project: libName,
-        path: `${libName}/src/lib/static-member-declarations`,
+        directory: `${libName}/src/lib/static-member-declarations/cmp2`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
@@ -222,15 +214,14 @@ export class StaticMemberDeclarationsModule {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'nested-button',
-        project: libName,
         module: 'nested',
-        path: `${libName}/src/lib/nested`,
+        directory: `${libName}/src/lib/nested/nested-button`,
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-other',
-        project: libName,
+        directory: `${libName}/src/lib/test-other`,
         standalone: false,
         skipFormat: true,
     });