@nx/react 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28229-afe192c

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-a99d5ea",
+  "version": "0.0.0-pr-28229-afe192c",
   "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": {
@@ -34,22 +34,21 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@svgr/webpack": "^8.0.1",
-    "chalk": "^4.1.0",
     "file-loader": "^6.2.0",
     "minimatch": "9.0.3",
+    "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@module-federation/enhanced": "~0.6.0",
-    "@nx/devkit": "0.0.0-pr-27957-a99d5ea",
-    "@nx/js": "0.0.0-pr-27957-a99d5ea",
-    "@nx/eslint": "0.0.0-pr-27957-a99d5ea",
-    "@nx/web": "0.0.0-pr-27957-a99d5ea",
+    "@module-federation/enhanced": "0.6.6",
+    "@nx/devkit": "0.0.0-pr-28229-afe192c",
+    "@nx/js": "0.0.0-pr-28229-afe192c",
+    "@nx/eslint": "0.0.0-pr-28229-afe192c",
+    "@nx/web": "0.0.0-pr-28229-afe192c",
     "express": "^4.19.2",
-    "http-proxy-middleware": "^3.0.0",
-    "@nrwl/react": "0.0.0-pr-27957-a99d5ea"
+    "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

@@ -19,7 +19,7 @@ const maybe_js_1 = require("../../utils/maybe-js");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const show_possible_warnings_1 = require("./lib/show-possible-warnings");
 const add_e2e_1 = require("./lib/add-e2e");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
@@ -68,7 +68,6 @@ async function addLinting(host, options) {
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -227,7 +226,7 @@ async function applicationGeneratorInternal(host, schema) {
     tasks.push(routingTask);
     (0, set_defaults_1.setDefaults)(host, options);
     if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
-        devkit_1.logger.warn(`${chalk.bold('styled-jsx')} is not supported by ${chalk.bold('Rspack')}. We've added ${chalk.bold('babel-loader')} to your project, but using babel will slow down your build.`);
+        devkit_1.logger.warn(`${pc.bold('styled-jsx')} is not supported by ${pc.bold('Rspack')}. We've added ${pc.bold('babel-loader')} to your project, but using babel will slow down your build.`);
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'babel-loader': versions_1.babelLoaderVersion }));
         host.write((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'rspack.config.js'), (0, devkit_1.stripIndents) `
         const { composePlugins, withNx, withReact } = require('@nx/rspack');

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,27 +17,25 @@ function normalizeDirectory(options) {
 function normalizeProjectName(options) {
     return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
 }
-async function normalizeOptions(host, options, callingGenerator = '@nx/react:application') {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+async function normalizeOptions(host, options) {
+    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,
-        callingGenerator,
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     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/lib/show-possible-warnings.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.showPossibleWarnings = showPossibleWarnings;
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 function showPossibleWarnings(tree, options) {
     if (options.style === 'styled-jsx' && options.compiler === 'swc') {
-        devkit_1.logger.warn(`styled-jsx may not work with SWC. Try using ${chalk.bold('nx g @nx/react:app --compiler=babel')} instead.`);
+        devkit_1.logger.warn(`styled-jsx may not work with SWC. Try using ${pc.bold('nx g @nx/react:app --compiler=babel')} instead.`);
     }
 }

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

@@ -1,19 +1,16 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   style: SupportedStyles;
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   linter: Linter | LinterType;
-  pascalCaseFiles?: boolean;
   classComponent?: boolean;
   routing?: boolean;
   skipNxJson?: boolean;

package/src/generators/application/schema.json

@@ -6,41 +6,36 @@
   "description": "Create a React application for Nx.",
   "examples": [
     {
-      "command": "nx g app myapp --directory=myorg",
+      "command": "nx g app apps/myorg/myapp",
       "description": "Generate `apps/myorg/myapp` and `apps/myorg/myapp-e2e`"
     },
     {
-      "command": "nx g app myapp --classComponent",
+      "command": "nx g app apps/myapp --classComponent",
       "description": "Use class components instead of functional components"
     },
     {
-      "command": "nx g app myapp --routing",
+      "command": "nx g app apps/myapp --routing",
       "description": "Set up React Router"
     }
   ],
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
+      "alias": "dir",
       "$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",
-      "alias": "dir",
+      "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",
@@ -111,9 +106,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 +127,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 +176,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": {
@@ -196,6 +185,6 @@
       "default": false
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

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,10 @@ 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',
+        path: options.path,
         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);
@@ -37,8 +29,8 @@ async function normalizeOptions(tree, options) {
     options.isNextPage = options.isNextPage ?? false;
     return {
         ...options,
-        projectName,
         directory,
+        projectName,
         styledModule,
         hasStyles: options.style !== 'none',
         className,

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

@@ -1,43 +1,25 @@
+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;
+  path: string;
+  name?: 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;
   // Used by Next.js to determine how React should generate the page
   isNextPage?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
+  directory: string;
   projectSourceRoot: string;
   projectName: string;
   fileName: string;

package/src/generators/component/schema.json

@@ -6,22 +6,19 @@
   "description": "Create a React Component for Nx.",
   "type": "object",
   "properties": {
-    "project": {
+    "path": {
       "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
+      "description": "Path where the component will be generated.",
       "$default": {
-        "$source": "projectName"
+        "$source": "argv",
+        "index": 0
       },
-      "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."
+      "x-prompt": "Where should the component be generated?",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
       "description": "The name of the component.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
       "x-prompt": "What name would you like to use for the component?",
       "x-priority": "important"
     },
@@ -76,23 +73,6 @@
       "default": false,
       "x-priority": "internal"
     },
-    "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 project root.",
-      "alias": "dir",
-      "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"]
-    },
-    "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 +80,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",
@@ -145,6 +111,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "examplesFile": "../../../docs/component-examples.md"
 }

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

@@ -14,43 +14,33 @@ async function federateModuleGenerator(tree, schema) {
     Path: ${schema.path}`);
     }
     const tasks = [];
+    const { projectName: remoteName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: schema.remote,
+        directory: schema.remoteDirectory,
+        projectType: 'application',
+    });
     // Check remote exists
-    const remote = (0, utils_1.checkRemoteExists)(tree, schema.remote);
-    let projectRoot, remoteName;
+    const remote = (0, utils_1.checkRemoteExists)(tree, remoteName);
     if (!remote) {
         // create remote
-        const remoteGenerator = await (0, remote_1.remoteGeneratorInternal)(tree, {
-            name: schema.remote,
-            directory: schema.remoteDirectory,
+        const remoteGeneratorTask = await (0, remote_1.remoteGenerator)(tree, {
+            name: remoteName,
+            directory: remoteRoot,
             e2eTestRunner: schema.e2eTestRunner,
             skipFormat: schema.skipFormat,
             linter: schema.linter,
             style: schema.style,
             unitTestRunner: schema.unitTestRunner,
             host: schema.host,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
             bundler: schema.bundler ?? 'rspack',
         });
-        tasks.push(remoteGenerator);
-        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',
-        });
-        projectRoot = remoteRoot;
-        remoteName = projectName;
-    }
-    else {
-        projectRoot = remote.root;
-        remoteName = remote.name;
+        tasks.push(remoteGeneratorTask);
     }
     // add path to exposes property
     const normalizedModulePath = schema.bundler === 'rspack'
-        ? (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(projectRoot), schema.path)
+        ? (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(remoteRoot), schema.path)
         : schema.path;
-    (0, utils_1.addPathToExposes)(tree, projectRoot, schema.name, normalizedModulePath);
+    (0, utils_1.addPathToExposes)(tree, remoteRoot, schema.name, normalizedModulePath);
     // Add new path to tsconfig
     const rootJSON = (0, devkit_1.readJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree));
     if (!rootJSON?.compilerOptions?.paths[`${remoteName}/${schema.name}`]) {

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

@@ -5,7 +5,6 @@ export interface Schema {
   path: string;
   remote: string;
   remoteDirectory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   host?: string;
   linter?: Linter | LinterType;

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.",
       "type": "string",

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;