@nx/react 0.0.0-pr-27957-7e3588c → 0.0.0-pr-28218-5048fd1

package/generators.json

@@ -25,13 +25,13 @@
       "description": "Create a React library."
     },
     "component": {
-      "factory": "./src/generators/component/component#componentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a React component.",
       "aliases": ["c"]
     },
     "redux": {
-      "factory": "./src/generators/redux/redux#reduxGeneratorInternal",
+      "factory": "./src/generators/redux/redux",
       "schema": "./src/generators/redux/schema.json",
       "description": "Create a Redux slice for a project.",
       "aliases": ["slice"]
@@ -54,26 +54,20 @@
       "description": "Create stories/specs for all components declared in an app or library.",
       "hidden": false
     },
-    "component-cypress-spec": {
-      "factory": "./src/generators/component-cypress-spec/component-cypress-spec#componentCypressGenerator",
-      "schema": "./src/generators/component-cypress-spec/schema.json",
-      "description": "Create a Cypress spec for a UI component that has a story.",
-      "hidden": false
-    },
     "hook": {
-      "factory": "./src/generators/hook/hook#hookGeneratorInternal",
+      "factory": "./src/generators/hook/hook",
       "schema": "./src/generators/hook/schema.json",
       "description": "Create a hook.",
       "aliases": ["c"]
     },
     "host": {
-      "factory": "./src/generators/host/host#hostGeneratorInternal",
+      "factory": "./src/generators/host/host",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
       "description": "Generate a host react application"
     },
     "remote": {
-      "factory": "./src/generators/remote/remote#remoteGeneratorInternal",
+      "factory": "./src/generators/remote/remote",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
       "description": "Generate a remote react application"

package/index.d.ts

@@ -8,7 +8,6 @@ export { reactDomVersion, reactVersion } from './src/utils/versions';
 export { applicationGenerator } from './src/generators/application/application';
 export { componentGenerator } from './src/generators/component/component';
 export { hookGenerator } from './src/generators/hook/hook';
-export { componentCypressGenerator } from './src/generators/component-cypress-spec/component-cypress-spec';
 export { componentStoryGenerator } from './src/generators/component-story/component-story';
 export { libraryGenerator } from './src/generators/library/library';
 export { reactInitGenerator } from './src/generators/init/init';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupTailwindGenerator = exports.componentTestGenerator = exports.cypressComponentConfigGenerator = exports.remoteGenerator = exports.hostGenerator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.componentCypressGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.cssInJsDependenciesBabel = exports.extendReactEslintJson = exports.extraEslintDependencies = exports.NxReactWebpackPlugin = void 0;
+exports.setupTailwindGenerator = exports.componentTestGenerator = exports.cypressComponentConfigGenerator = exports.remoteGenerator = exports.hostGenerator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.cssInJsDependenciesBabel = exports.extendReactEslintJson = exports.extraEslintDependencies = exports.NxReactWebpackPlugin = void 0;
 const tslib_1 = require("tslib");
 const nx_react_webpack_plugin_1 = require("./plugins/nx-react-webpack-plugin/nx-react-webpack-plugin");
 // TODO(v20): Remove this in favor of deep imports in order to load configs faster (150-200ms faster).
@@ -22,8 +22,6 @@ var component_1 = require("./src/generators/component/component");
 Object.defineProperty(exports, "componentGenerator", { enumerable: true, get: function () { return component_1.componentGenerator; } });
 var hook_1 = require("./src/generators/hook/hook");
 Object.defineProperty(exports, "hookGenerator", { enumerable: true, get: function () { return hook_1.hookGenerator; } });
-var component_cypress_spec_1 = require("./src/generators/component-cypress-spec/component-cypress-spec");
-Object.defineProperty(exports, "componentCypressGenerator", { enumerable: true, get: function () { return component_cypress_spec_1.componentCypressGenerator; } });
 var component_story_1 = require("./src/generators/component-story/component-story");
 Object.defineProperty(exports, "componentStoryGenerator", { enumerable: true, get: function () { return component_story_1.componentStoryGenerator; } });
 var library_1 = require("./src/generators/library/library");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-27957-7e3588c",
+  "version": "0.0.0-pr-28218-5048fd1",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -38,18 +38,17 @@
     "file-loader": "^6.2.0",
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
-    "@module-federation/enhanced": "~0.6.0",
-    "@nx/devkit": "0.0.0-pr-27957-7e3588c",
-    "@nx/js": "0.0.0-pr-27957-7e3588c",
-    "@nx/eslint": "0.0.0-pr-27957-7e3588c",
-    "@nx/web": "0.0.0-pr-27957-7e3588c",
+    "@module-federation/enhanced": "0.6.6",
+    "@nx/devkit": "0.0.0-pr-28218-5048fd1",
+    "@nx/js": "0.0.0-pr-28218-5048fd1",
+    "@nx/eslint": "0.0.0-pr-28218-5048fd1",
+    "@nx/web": "0.0.0-pr-28218-5048fd1",
     "express": "^4.19.2",
-    "http-proxy-middleware": "^3.0.0",
-    "@nrwl/react": "0.0.0-pr-27957-7e3588c"
+    "http-proxy-middleware": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs",
   "types": "./index.d.ts"
-}
+}

package/plugins/storybook/index.js

@@ -73,8 +73,7 @@ const fixBabelConfigurationIfNeeded = (webpackConfig, projectData) => {
         return;
     const isUsingBabelUpwardRootMode = Object.keys(projectData.projectNode.data.targets).find((k) => {
         const targetConfig = projectData.projectNode.data.targets[k];
-        return ((targetConfig.executor === '@nx/webpack:webpack' ||
-            targetConfig.executor === '@nrwl/webpack:webpack') &&
+        return (targetConfig.executor === '@nx/webpack:webpack' &&
             targetConfig.options?.babelUpwardRootMode);
     });
     if (isUsingBabelUpwardRootMode)

package/src/generators/application/application.js

@@ -68,7 +68,6 @@ async function addLinting(host, options) {
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

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

@@ -2,4 +2,4 @@ import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
 export declare function normalizeDirectory(options: Schema): string;
 export declare function normalizeProjectName(options: Schema): string;
-export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema, callingGenerator?: string): Promise<NormalizedSchema<T>>;
+export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema): Promise<NormalizedSchema<T>>;

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

@@ -17,14 +17,13 @@ function normalizeDirectory(options) {
 function normalizeProjectName(options) {
     return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
 }
-async function normalizeOptions(host, options, callingGenerator = '@nx/react:application') {
+async function normalizeOptions(host, options) {
     const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator,
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -37,7 +36,7 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const fileName = options.pascalCaseFiles ? 'App' : 'app';
+    const fileName = 'app';
     const styledModule = /^(css|scss|less|tailwind|none)$/.test(options.style)
         ? null
         : options.style;

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

@@ -13,7 +13,6 @@ export interface Schema {
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   linter: Linter | LinterType;
-  pascalCaseFiles?: boolean;
   classComponent?: boolean;
   routing?: boolean;
   skipNxJson?: boolean;

package/src/generators/application/schema.json

@@ -111,9 +111,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "vitest"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -132,12 +132,6 @@
       "description": "Add tags to the application (used for linting).",
       "alias": "t"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false
-    },
     "classComponent": {
       "type": "boolean",
       "description": "Use class components instead of functional component.",
@@ -187,7 +181,7 @@
       "type": "string",
       "enum": ["vite", "webpack", "rspack"],
       "x-prompt": "Which bundler do you want to use to build the application?",
-      "default": "webpack",
+      "default": "vite",
       "x-priority": "important"
     },
     "minimal": {

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

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

package/src/generators/component/component.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
@@ -12,12 +11,6 @@ const versions_1 = require("../../utils/versions");
 const get_component_tests_1 = require("./lib/get-component-tests");
 const normalize_options_1 = require("./lib/normalize-options");
 async function componentGenerator(host, schema) {
-    return componentGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function componentGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     const tasks = [];

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

@@ -7,18 +7,11 @@ const assertion_1 = require("../../../utils/assertion");
 async function normalizeOptions(tree, options) {
     (0, assertion_1.assertValidStyle)(options.style);
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'component',
-        callingGenerator: '@nx/react:component',
         name: options.name,
         directory: options.directory,
-        derivedDirectory: options.derivedDirectory ?? options.directory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
         fileName: options.fileName,
-        pascalCaseFile: options.pascalCaseFiles,
-        pascalCaseDirectory: options.pascalCaseDirectory,
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,38 +1,20 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 import { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
   name: string;
-  /**
-   * @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.
-   */
-  project?: string;
   style: SupportedStyles;
   skipTests?: boolean;
   directory?: string;
   export?: boolean;
-  /**
-   * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseFiles?: boolean;
-  /**
-   * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseDirectory?: boolean;
   classComponent?: boolean;
   routing?: boolean;
   js?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat?: boolean;
   globalCss?: boolean;
   fileName?: string;
   inSourceTests?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
-  // Used by other wrapping generators to preserve previous behavior
-  // e.g. @nx/next:component
-  derivedDirectory?: string;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   // Used by Next.js to determine how React should generate the page
   isNextPage?: boolean;
 }

package/src/generators/component/schema.json

@@ -6,15 +6,6 @@
   "description": "Create a React Component for Nx.",
   "type": "object",
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "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."
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -87,12 +78,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create component at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project `index.ts` (if it exists).",
@@ -100,20 +85,6 @@
       "default": false,
       "x-prompt": "Should this component be exported in the project?"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
-    "pascalCaseDirectory": {
-      "type": "boolean",
-      "description": "Use pascal case directory name (e.g. `App/App.tsx`).",
-      "alias": "R",
-      "default": false,
-      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "classComponent": {
       "type": "boolean",
       "alias": "C",

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

@@ -37,8 +37,6 @@ async function cypressComponentConfigGeneratorInternal(tree, options) {
         validExecutorNames: new Set([
             '@nx/webpack:webpack',
             '@nx/vite:build',
-            '@nrwl/webpack:webpack',
-            '@nrwl/vite:build',
         ]),
     });
     await (0, add_files_1.addFiles)(tree, projectConfig, options, found);

package/src/generators/federate-module/federate-module.js

@@ -19,7 +19,7 @@ async function federateModuleGenerator(tree, schema) {
     let projectRoot, remoteName;
     if (!remote) {
         // create remote
-        const remoteGenerator = await (0, remote_1.remoteGeneratorInternal)(tree, {
+        const remoteGeneratorTask = await (0, remote_1.remoteGenerator)(tree, {
             name: schema.remote,
             directory: schema.remoteDirectory,
             e2eTestRunner: schema.e2eTestRunner,
@@ -28,16 +28,15 @@ async function federateModuleGenerator(tree, schema) {
             style: schema.style,
             unitTestRunner: schema.unitTestRunner,
             host: schema.host,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
             bundler: schema.bundler ?? 'rspack',
+            projectNameAndRootFormat: schema.projectNameAndRootFormat,
         });
-        tasks.push(remoteGenerator);
+        tasks.push(remoteGeneratorTask);
         const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
-            callingGenerator: '@nx/react:federate-module',
+            projectNameAndRootFormat: schema.projectNameAndRootFormat,
         });
         projectRoot = remoteRoot;
         remoteName = projectName;

package/src/generators/hook/hook.d.ts

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function hookGenerator(host: Tree, schema: Schema): Promise<void>;
-export declare function hookGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default hookGenerator;

package/src/generators/hook/hook.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hookGenerator = hookGenerator;
-exports.hookGeneratorInternal = hookGeneratorInternal;
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -9,12 +8,6 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
 const path_1 = require("path");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function hookGenerator(host, schema) {
-    return hookGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function hookGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     createFiles(host, options);
     addExportsToBarrel(host, options);
@@ -57,53 +50,27 @@ function addExportsToBarrel(host, options) {
 }
 async function normalizeOptions(host, options) {
     assertValidOptions(options);
-    const { artifactName: name, directory: _directory, fileName: _fileName, nameAndDirectoryFormat, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'hook',
-        callingGenerator: '@nx/react:hook',
+    const { directory, fileName: _fileName, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
         directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
-        pascalCaseFile: options.pascalCaseFiles,
-        pascalCaseDirectory: options.pascalCaseDirectory,
     });
-    let base = _fileName;
-    if (base.startsWith('use-')) {
-        base = base.substring(4);
-    }
-    else if (base.startsWith('use')) {
-        base = base.substring(3);
-    }
-    const { className, fileName } = (0, devkit_1.names)(base);
+    const { className, fileName } = (0, devkit_1.names)(_fileName);
     // If using `as-provided` file and directory, then don't normalize.
     // Otherwise, support legacy behavior of prefixing filename with `use-`.
-    const hookFilename = nameAndDirectoryFormat === 'as-provided'
-        ? fileName
-        : options.pascalCaseFiles
-            ? 'use'.concat(className)
-            : 'use-'.concat(fileName);
-    const hookName = 'use'.concat(className);
-    const hookTypeName = 'Use'.concat(className);
+    const hookFilename = fileName;
+    const hookName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'use'.concat(className);
+    const hookTypeName = className.toLocaleLowerCase().startsWith('use')
+        ? className
+        : 'Use'.concat(className);
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export && projectType === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
-    // Support legacy behavior of derived directory to prefix with `use-`.
-    let directory = _directory;
-    if (nameAndDirectoryFormat === 'derived') {
-        const parts = directory.split('/');
-        parts.pop();
-        if (!options.flat) {
-            parts.push(options.pascalCaseDirectory
-                ? 'use'.concat(className)
-                : 'use-'.concat(fileName));
-        }
-        directory = parts.join('/');
-    }
     return {
         ...options,
         directory,

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

@@ -1,24 +1,10 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface Schema {
   name: string;
-  /**
-   * @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.
-   */
-  project: string;
   skipTests?: boolean;
   directory?: string;
   export?: boolean;
-  /**
-   * @deprecated Provide the `name` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseFiles?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseDirectory?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat?: boolean;
   js?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/hook/schema.json

@@ -12,15 +12,6 @@
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "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."
-    },
     "name": {
       "type": "string",
       "description": "The name of the hook.",
@@ -52,32 +43,12 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create hook at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the hook is exported from the project `index.ts` (if it exists).",
       "alias": "e",
       "default": false,
       "x-prompt": "Should this hook be exported in the project?"
-    },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case hook file name (e.g. `useHook.ts`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
-    "pascalCaseDirectory": {
-      "type": "boolean",
-      "description": "Use pascal case directory name (e.g. `useHook/useHook.ts`).",
-      "alias": "R",
-      "default": false,
-      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
     }
   },
   "required": ["name"]

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

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

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostGenerator = hostGenerator;
-exports.hostGeneratorInternal = hostGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const application_1 = require("../application/application");
@@ -16,15 +15,9 @@ const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 async function hostGenerator(host, schema) {
-    return hostGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function hostGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host')),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
             ? false
@@ -46,6 +39,7 @@ async function hostGeneratorInternal(host, schema) {
     }
     const initTask = await (0, application_1.default)(host, {
         ...options,
+        name: options.projectName,
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,

package/src/generators/host/lib/add-module-federation-files.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../../../utils/maybe-js");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
     const templateVariables = {
-        ...(0, devkit_1.names)(options.name),
+        ...(0, devkit_1.names)(options.projectName),
         ...options,
         static: !options?.dynamic,
         tmpl: '',
@@ -16,7 +16,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             };
         }),
     };
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const pathToMFManifest = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in

package/src/generators/host/lib/normalize-remote.js

@@ -10,18 +10,23 @@ async function normalizeRemoteName(tree, remote, options) {
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/react:host',
     });
     return remoteName;
 }
 function normalizeRemoteDirectory(remote, options) {
-    if (options.projectNameAndRootFormat === 'derived' || !options.directory) {
-        return 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.
+     *
+     * If no directory is provided, the remote directory will use the grandparent of the hostRoot 'acme/host/src' -> 'acme'
      */
-    return (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+    if (options.directory) {
+        return (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
+    }
+    else {
+        return options.appProjectRoot === '.'
+            ? remote
+            : (0, devkit_1.joinPathFragments)(options.appProjectRoot, '..', remote);
+    }
 }