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

package/src/generators/remote/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,16 +1,43 @@
-import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederation} from '@nx/rspack/module-federation';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
+import { join } from 'path';
 
-import baseConfig from './module-federation.config';
+import config from './module-federation.config';
 
-const config = {
-    ...baseConfig,
+export default {
+  output: {
+    path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
+    publicPath: 'auto'
+  },
+  devServer: {
+    port: <%= devServerPort %>,
+    headers: {
+      "Access-Control-Allow-Origin": "*"
+    },
+    historyApiFallback: {
+      index: '/index.html',
+      disableDotRule: true,
+      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+    },
+  },
+  plugins: [
+    new NxAppRspackPlugin({
+      tsConfig: '<%= rspackPluginOptions.tsConfig %>',
+      main: '<%= rspackPluginOptions.main %>',
+      index: '<%= rspackPluginOptions.index %>',
+      baseHref: '<%= rspackPluginOptions.baseHref %>',
+      assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
+      styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactRspackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+    new NxModuleFederationPlugin({ config }, { dts: false }),
+    new NxModuleFederationDevServerPlugin({ config }),
+  ],
 };
-
-// Nx plugins for rspack to build config object from Nx options and context.
-/**
- * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support Module Federation
- * The DTS Plugin can be enabled by setting dts: true
- * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
- */
-export default composePlugins(withNx(), withReact(), withModuleFederation(config, { dts: false }));

package/src/generators/remote/files/webpack-module-federation/module-federation.config.js__tmpl__

@@ -1,9 +1,12 @@
+/**
+* Nx requires a default export of the config to allow correct resolution of the module federation graph.
+**/
 module.exports = {
-   name: '<%= projectName %>',
-   <% if (dynamic) { %>
-   library: { type: 'var', name: '<%= projectName %>'},
-   <% } %>
-   exposes: {
-     './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
-   },
+  name: '<%= projectName %>',
+  <%_ if (dynamic) { _%>
+  library: { type: 'var', name: '<%= projectName %>'},
+  <%_ } _%>
+  exposes: {
+    './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
+  },
 };

package/src/generators/remote/files/webpack-module-federation/webpack.config.js__tmpl__

@@ -1,6 +1,6 @@
 const { composePlugins, withNx } = require('@nx/webpack');
 const { withReact } = require('@nx/react');
-const { withModuleFederation } = require('@nx/react/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/webpack');
 
 const baseConfig = require('./module-federation.config');
 

package/src/generators/remote/files/webpack-module-federation-ssr/module-federation.server.config.js__tmpl__

@@ -1,6 +1,9 @@
+/**
+* Nx requires a default export of the config to allow correct resolution of the module federation graph.
+**/
 module.exports = {
-    name: '<%= projectName %>',
-   exposes: {
-     './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
-   },
+  name: '<%= projectName %>',
+  exposes: {
+    './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
+  },
 };

package/src/generators/remote/files/webpack-module-federation-ssr/webpack.server.config.js__tmpl__

@@ -1,11 +1,11 @@
 const {composePlugins, withNx} = require('@nx/webpack');
 const {withReact} = require('@nx/react');
-const {withModuleFederationForSSR} = require('@nx/react/module-federation');
+const {withModuleFederationForSSR} = require('@nx/module-federation/webpack');
 
 const baseConfig = require("./module-federation.server.config");
 
 const defaultConfig = {
-    ...baseConfig,
+  ...baseConfig,
 };
 
 // Nx plugins for webpack to build config object from Nx options and context.

package/src/generators/remote/files/webpack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -1,10 +1,13 @@
-import {ModuleFederationConfig} from '@nx/webpack';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
-    name: '<%= projectName %>',
-    exposes: {
-        './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
-    },
+  name: '<%= projectName %>',
+  exposes: {
+    './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
+  },
 };
 
+/**
+* Nx requires a default export of the config to allow correct resolution of the module federation graph.
+**/
 export default config;

package/src/generators/remote/files/webpack-module-federation-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,11 +1,11 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/react/module-federation';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from "./module-federation.server.config";
 
 const defaultConfig = {
-    ...baseConfig,
+  ...baseConfig,
 };
 
 // Nx plugins for webpack to build config object from Nx options and context.

package/src/generators/remote/files/webpack-module-federation-ts/module-federation.config.ts__tmpl__

@@ -1,13 +1,16 @@
-import {ModuleFederationConfig} from '@nx/webpack';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
-    name: '<%= projectName %>',
-    <% if (dynamic) { %>
-   library: { type: 'var', name: '<%= projectName %>'},
-   <% } %>
-    exposes: {
-        './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
-    },
+  name: '<%= projectName %>',
+  <%_ if (dynamic) { _%>
+  library: { type: 'var', name: '<%= projectName %>'},
+  <%_ } _%>
+  exposes: {
+    './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
+  },
 };
 
+/**
+* Nx requires a default export of the config to allow correct resolution of the module federation graph.
+**/
 export default config;

package/src/generators/remote/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

@@ -1,11 +1,11 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederation} from '@nx/react/module-federation';
+import {withModuleFederation} from '@nx/module-federation/webpack';
 
 import baseConfig from './module-federation.config';
 
 const config = {
-    ...baseConfig,
+  ...baseConfig,
 };
 
 // Nx plugins for webpack to build config object from Nx options and context.

package/src/generators/remote/lib/setup-ssr-for-remote.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../../application/schema';
 import type { Schema } from '../schema';
 export declare function setupSsrForRemote(tree: Tree, options: NormalizedSchema<Schema>, appName: string): Promise<GeneratorCallback>;

package/src/generators/remote/lib/setup-ssr-for-remote.js

@@ -2,39 +2,61 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForRemote = setupSsrForRemote;
 const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
+const create_application_files_1 = require("../../application/lib/create-application-files");
 async function setupSsrForRemote(tree, options, appName) {
     const tasks = [];
-    const project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    const project = (0, devkit_2.readProjectConfiguration)(tree, appName);
     const pathToModuleFederationSsrFiles = options.typescriptConfiguration
         ? `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr-ts`
         : `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr`;
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, {
-        ...options,
-        port: Number(options?.devServerPort) || 4200,
-        appName,
-        tmpl: '',
-        browserBuildOutputPath: project.targets.build.options.outputPath,
-        serverBuildOutputPath: project.targets.server.options.outputPath,
-    });
+    const templateVariables = options.bundler === 'rspack'
+        ? {
+            ...(0, create_application_files_1.getDefaultTemplateVariables)(tree, options),
+            rspackPluginOptions: {
+                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
+                mainServer: `./server.ts`,
+            },
+            port: Number(options?.devServerPort) || 4200,
+            appName,
+        }
+        : {
+            ...options,
+            port: Number(options?.devServerPort) || 4200,
+            appName,
+            tmpl: '',
+            browserBuildOutputPath: project.targets.build?.options?.outputPath,
+            serverBuildOutputPath: project.targets.server?.options?.outputPath,
+        };
+    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
     // For hosts to use when running remotes in static mode.
-    const originalOutputPath = project.targets.build?.options?.outputPath;
+    const originalOutputPath = project.targets.build?.options?.outputPath ??
+        options.isUsingTsSolutionConfig
+        ? 'dist'
+        : (0, devkit_2.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.appProjectRoot != '.'
+            ? options.appProjectRoot
+            : options.projectName);
     const serverOptions = project.targets.server?.options;
     const serverOutputPath = serverOptions?.outputPath ??
-        (0, devkit_1.joinPathFragments)(originalOutputPath, 'server');
+        (0, devkit_2.joinPathFragments)(originalOutputPath, 'server');
     const serverOutputName = serverOptions?.outputFileName ?? 'main.js';
     project.targets['serve-static'] = {
         dependsOn: ['build', 'server'],
         executor: 'nx:run-commands',
         defaultConfiguration: 'development',
         options: {
-            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(serverOutputPath, serverOutputName)}`,
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_2.joinPathFragments)(serverOutputPath, serverOutputName)}`,
         },
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
+    (0, devkit_2.updateProjectConfiguration)(tree, appName, project);
+    const installTask = (0, devkit_2.addDependenciesToPackageJson)(tree, {
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
+        cors: versions_1.corsVersion,
+        isbot: versions_1.isbotVersion,
+        express: versions_1.expressVersion,
+        '@types/express': versions_1.typesExpressVersion,
     }, {});
     tasks.push(installTask);
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return (0, devkit_2.runTasksInSerial)(...tasks);
 }

package/src/generators/remote/lib/setup-tspath-for-remote.js

@@ -8,7 +8,5 @@ function setupTspathForRemote(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     const exportPath = (0, maybe_js_1.maybeJs)(options, './src/remote-entry.ts');
     const exportName = 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${options.projectName}/${exportName}`, [
-        (0, devkit_1.joinPathFragments)(project.root, exportPath),
-    ]);
+    (0, js_1.addTsConfigPath)(tree, `${options.projectName.replace(/-/g, '_')}/${exportName}`, [(0, devkit_1.joinPathFragments)(project.root, exportPath)]);
 }

package/src/generators/remote/lib/update-host-with-remote.js

@@ -24,7 +24,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
     }
     else {
         // TODO(jack): Point to the nx.dev guide when ready.
-        devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nx/react:host"?`);
+        devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nx/react:host" or "@nx/react:consumer"?`);
     }
     if (host.exists(appComponentPath)) {
         let sourceCode = host.read(appComponentPath).toString();
@@ -32,7 +32,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
         host.write(appComponentPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteRoute)(source, (0, devkit_1.names)(remoteName))));
     }
     else {
-        devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host"?`);
+        devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host" or "@nx/react:consumer"?`);
     }
 }
 function findAppComponentPath(host, sourceRoot) {

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

@@ -3,5 +3,4 @@ import { NormalizedSchema } from '../application/schema';
 import { Schema } from './schema';
 export declare function addModuleFederationFiles(host: Tree, options: NormalizedSchema<Schema>): void;
 export declare function remoteGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function remoteGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default remoteGenerator;

package/src/generators/remote/remote.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 exports.remoteGenerator = remoteGenerator;
-exports.remoteGeneratorInternal = remoteGeneratorInternal;
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../application/lib/normalize-options");
@@ -17,12 +16,22 @@ const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const maybe_js_1 = require("../../utils/maybe-js");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const create_application_files_1 = require("../application/lib/create-application-files");
 function addModuleFederationFiles(host, options) {
-    const templateVariables = {
-        ...(0, devkit_1.names)(options.projectName),
-        ...options,
-        tmpl: '',
-    };
+    const templateVariables = options.bundler === 'rspack'
+        ? {
+            ...(0, create_application_files_1.getDefaultTemplateVariables)(host, options),
+            rspackPluginOptions: {
+                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
+                mainServer: `./server.ts`,
+            },
+        }
+        : {
+            ...(0, devkit_1.names)(options.projectName),
+            ...options,
+            tmpl: '',
+        };
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/${options.js
         ? options.bundler === 'rspack'
             ? 'rspack-common'
@@ -46,23 +55,20 @@ function addModuleFederationFiles(host, options) {
     }
 }
 async function remoteGenerator(host, schema) {
-    return await remoteGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function remoteGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote')),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, {
+            ...schema,
+            useProjectJson: true,
+        })),
         // when js is set to true, we want to use the js configuration
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
             ? false
             : schema.typescriptConfiguration ?? true,
         dynamic: schema.dynamic ?? false,
-        // TODO(colum): remove when MF works with Crystal
-        addPlugin: false,
+        // TODO(colum): remove when Webpack MF works with Crystal
+        addPlugin: !schema.bundler || schema.bundler === 'rspack' ? true : false,
         bundler: schema.bundler ?? 'rspack',
     };
     if (options.dynamic) {
@@ -73,14 +79,24 @@ async function remoteGeneratorInternal(host, schema) {
             throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
         }
     }
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
+    const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
+    if (!remoteNameRegex.test(options.projectName)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.projectName}. Remote project names must:
+      - Start with a letter, dollar sign ($) or underscore (_)
+      - Followed by any valid character (letters, digits, underscores, or dollar signs)
+      The regular expression used is ${REMOTE_NAME_REGEX}.`);
+    }
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
         name: options.projectName,
         skipFormat: true,
+        useProjectJson: true,
     });
     tasks.push(initAppTask);
-    if (schema.host) {
-        (0, update_host_with_remote_1.updateHostWithRemote)(host, schema.host, options.projectName);
+    if (options.host) {
+        (0, update_host_with_remote_1.updateHostWithRemote)(host, options.host, options.projectName);
     }
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
@@ -90,36 +106,44 @@ async function remoteGeneratorInternal(host, schema) {
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, setup_tspath_for_remote_1.setupTspathForRemote)(host, options);
     if (options.ssr) {
-        const setupSsrTask = await (0, setup_ssr_1.default)(host, {
-            project: options.projectName,
-            serverPort: options.devServerPort,
-            skipFormat: true,
-            bundler: options.bundler,
-        });
-        tasks.push(setupSsrTask);
+        if (options.bundler !== 'rspack') {
+            const setupSsrTask = await (0, setup_ssr_1.default)(host, {
+                project: options.projectName,
+                serverPort: options.devServerPort,
+                skipFormat: true,
+                bundler: options.bundler,
+            });
+            tasks.push(setupSsrTask);
+        }
         const setupSsrForRemoteTask = await (0, setup_ssr_for_remote_1.setupSsrForRemote)(host, options, options.projectName);
         tasks.push(setupSsrForRemoteTask);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        if (options.bundler === 'rspack') {
-            projectConfig.targets.server.executor = '@nx/rspack:rspack';
-            projectConfig.targets.server.options.rspackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `rspack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
-            delete projectConfig.targets.server.options.webpackConfig;
-        }
-        else {
+        if (options.bundler !== 'rspack') {
             projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
+            (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
         }
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
     }
     if (!options.setParserOptionsProject) {
         host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.lint.json'));
     }
+    if (options.host && options.bundler === 'rspack') {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+        projectConfig.targets.serve ??= {};
+        projectConfig.targets.serve.dependsOn ??= [];
+        projectConfig.targets.serve.dependsOn.push(`${options.host}:serve`);
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
+    }
     if (options.host && options.dynamic) {
         const hostConfig = (0, devkit_1.readProjectConfiguration)(host, schema.host);
         const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'assets/module-federation.manifest.json');
         (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.projectName, options.devServerPort, pathToMFManifest);
     }
-    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
-    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion });
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host, options.bundler);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
+        '@nx/web': versions_1.nxVersion,
+        '@nx/module-federation': versions_1.nxVersion,
+    });
     tasks.push(installTask);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -1,4 +1,3 @@
-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';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
@@ -7,15 +6,13 @@ export interface Schema {
   classComponent?: boolean;
   compiler?: 'babel' | 'swc';
   devServerPort?: number;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   host?: string;
   js?: boolean;
   linter: Linter | LinterType;
-  name: string;
-  pascalCaseFiles?: boolean;
+  name?: string;
   routing?: boolean;
   setParserOptionsProject?: boolean;
   skipFormat: boolean;

package/src/generators/remote/schema.json

@@ -2,35 +2,29 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactRemote",
   "cli": "nx",
-  "title": "Generate Module Federation Setup for React Remote App",
-  "description": "Create Module Federation configuration files for given React Remote Application.",
+  "title": "Generate Module Federation Setup for React Producer (Remote) App",
+  "description": "Create Module Federation configuration files for given React Producer (Remote) Application.",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name of the remote application to generate the Module Federation configuration",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use as the remote application?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
       "type": "string",
-      "alias": "dir",
+      "description": "The name of the Producer (remote) application to generate the Module Federation configuration",
+      "pattern": "^[a-zA-Z_$][a-zA-Z_$0-9]*$",
       "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"]
-    },
     "dynamic": {
       "type": "boolean",
-      "description": "Should the host application use dynamic federation?",
+      "description": "Should the Consumer (host) application use dynamic federation?",
       "default": false,
       "x-priority": "internal"
     },
@@ -119,12 +113,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.",
@@ -159,16 +147,17 @@
     },
     "host": {
       "type": "string",
-      "description": "The host / shell application for this remote.",
-      "x-priority": "important"
+      "description": "The Consumer (host) application for this Producer (remote).",
+      "x-priority": "important",
+      "alias": "consumer"
     },
     "devServerPort": {
       "type": "number",
-      "description": "The port for the dev server of the remote app.",
+      "description": "The port for the dev server of the Producer (remote) app.",
       "x-priority": "important"
     },
     "ssr": {
-      "description": "Whether to configure SSR for the host application",
+      "description": "Whether to configure SSR for the Consumer (host) application",
       "type": "boolean",
       "default": false
     },
@@ -192,6 +181,6 @@
       "x-priority": "important"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "additionalProperties": false
 }

package/src/generators/setup-tailwind/lib/update-project.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProject = updateProject;
 const devkit_1 = require("@nx/devkit");
 function updateProject(tree, config, options) {
-    if (config?.targets?.build?.executor === '@nx/webpack:webpack' ||
-        config?.targets?.build?.executor === '@nrwl/webpack:webpack') {
+    if (config?.targets?.build?.executor === '@nx/webpack:webpack') {
         config.targets.build.options ??= {};
         config.targets.build.options.postcssConfig = (0, devkit_1.joinPathFragments)(config.root, 'postcss.config.js');
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, config);

package/src/generators/stories/schema.json

@@ -17,16 +17,6 @@
       "x-prompt": "For which project do you want to generate stories?",
       "x-priority": "important"
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Automatically generate `*.spec.ts` files in the cypress e2e app generated by the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
-    "cypressProject": {
-      "type": "string",
-      "description": "The Cypress project to generate the stories under. This is inferred from `project` by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "interactionTests": {
       "type": "boolean",
       "description": "Set up Storybook interaction tests.",

package/src/generators/stories/stories.d.ts

@@ -5,11 +5,9 @@ export interface StorybookStoriesSchema {
     js?: boolean;
     ignorePaths?: string[];
     skipFormat?: boolean;
-    cypressProject?: string;
-    generateCypressSpecs?: boolean;
 }
 export declare function projectRootPath(tree: Tree, config: ProjectConfiguration): Promise<string>;
 export declare function containsComponentDeclaration(tree: Tree, componentPath: string): boolean;
-export declare function createAllStories(tree: Tree, projectName: string, interactionTests: boolean, js: boolean, projects: Map<string, ProjectConfiguration>, projectConfiguration: ProjectConfiguration, generateCypressSpecs?: boolean, cypressProject?: string, ignorePaths?: string[]): Promise<void>;
+export declare function createAllStories(tree: Tree, projectName: string, interactionTests: boolean, js: boolean, projects: Map<string, ProjectConfiguration>, projectConfiguration: ProjectConfiguration, ignorePaths?: string[]): Promise<void>;
 export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<GeneratorCallback>;
 export default storiesGenerator;