@nx/react 17.0.5 → 17.0.6

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

@@ -22,7 +22,7 @@ async function normalizeOptions(tree, options) {
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const { className } = (0, devkit_1.names)(name);
-    const { sourceRoot: projectSourceRoot, root: projectRoot, projectType, } = project;
+    const { sourceRoot: projectSourceRoot, projectType } = project;
     const styledModule = /^(css|scss|less|none)$/.test(options.style)
         ? null
         : options.style;
@@ -33,8 +33,6 @@ async function normalizeOptions(tree, options) {
     options.routing = options.routing ?? false;
     options.globalCss = options.globalCss ?? false;
     options.inSourceTests = options.inSourceTests ?? false;
-    //TODO (nicholas): Remove when Next page generator is removed
-    options.isNextPage = options.isNextPage ?? false;
     return {
         ...options,
         projectName,
@@ -44,7 +42,7 @@ async function normalizeOptions(tree, options) {
         className,
         fileName,
         filePath,
-        projectSourceRoot: projectSourceRoot ?? projectRoot,
+        projectSourceRoot,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -3,7 +3,7 @@ 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 v19.
+   * @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 v18.
    */
   project?: string;
   style: SupportedStyles;
@@ -11,18 +11,18 @@ export interface Schema {
   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.
+   * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
    */
   pascalCaseFiles?: boolean;
   /**
-   * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
+   * @deprecated Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
    */
   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.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
    */
   flat?: boolean;
   globalCss?: boolean;
@@ -33,8 +33,6 @@ export interface Schema {
   // 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 {

package/src/generators/component/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactComponent",
   "title": "Create a React Component",
@@ -13,7 +13,7 @@
       "$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 v19."
+      "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 v18."
     },
     "name": {
       "type": "string",
@@ -40,11 +40,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com          ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org            ]"
+            "label": "LESS              [ http://lesscss.org            ]"
           },
           {
             "value": "styled-components",
@@ -91,7 +91,7 @@
       "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."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "export": {
       "type": "boolean",
@@ -105,14 +105,14 @@
       "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."
+      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "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."
+      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "classComponent": {
       "type": "boolean",

package/src/generators/component-cypress-spec/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactComponentCypressSpec",
   "title": "Create component Cypress spec",

package/src/generators/component-story/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactComponentStory",
   "title": "Create component story",

package/src/generators/component-test/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactCypressComponentTest",
   "title": "Add Cypress component test",

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

@@ -1,10 +1,9 @@
 import { Tree } from '@nx/devkit';
 import { CypressComponentConfigurationSchema } from './schema.d';
-export declare function cypressComponentConfigGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 /**
  * This is for using cypresses own Component testing, if you want to use test
  * storybook components then use componentCypressGenerator instead.
  *
  */
-export declare function cypressComponentConfigGeneratorInternal(tree: Tree, options: CypressComponentConfigurationSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function cypressComponentConfigGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<() => void>;
 export default cypressComponentConfigGenerator;

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

@@ -1,39 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressComponentConfigGeneratorInternal = exports.cypressComponentConfigGenerator = void 0;
+exports.cypressComponentConfigGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const add_files_1 = require("./lib/add-files");
 const ct_utils_1 = require("../../utils/ct-utils");
-function cypressComponentConfigGenerator(tree, options) {
-    return cypressComponentConfigGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
-}
-exports.cypressComponentConfigGenerator = cypressComponentConfigGenerator;
 /**
  * This is for using cypresses own Component testing, if you want to use test
  * storybook components then use componentCypressGenerator instead.
  *
  */
-async function cypressComponentConfigGeneratorInternal(tree, options) {
+async function cypressComponentConfigGenerator(tree, options) {
     const { componentConfigurationGenerator: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const installTask = await baseCyCtConfig(tree, {
         project: options.project,
         skipFormat: true,
         jsx: true,
-        addPlugin: options.addPlugin,
     });
-    const found = await (0, ct_utils_1.configureCypressCT)(tree, {
+    const found = await (0, ct_utils_1.addCTTargetWithBuildTarget)(tree, {
         project: options.project,
         buildTarget: options.buildTarget,
-        bundler: options.bundler,
         validExecutorNames: new Set([
             '@nx/webpack:webpack',
             '@nx/vite:build',
@@ -45,7 +32,9 @@ async function cypressComponentConfigGeneratorInternal(tree, options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return installTask;
+    return () => {
+        installTask();
+    };
 }
-exports.cypressComponentConfigGeneratorInternal = cypressComponentConfigGeneratorInternal;
+exports.cypressComponentConfigGenerator = cypressComponentConfigGenerator;
 exports.default = cypressComponentConfigGenerator;

package/src/generators/cypress-component-configuration/lib/add-files.js

@@ -10,7 +10,9 @@ async function addFiles(tree, projectConfig, options, found) {
     // when importing react
     const { addMountDefinition, addDefaultCTConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
     // Specifically undefined to allow Remix workaround of passing an empty string
-    const actualBundler = await (0, ct_utils_1.getActualBundler)(tree, options, found);
+    const actualBundler = options.buildTarget !== undefined && options.bundler
+        ? options.bundler
+        : await (0, ct_utils_1.getBundlerFromTarget)(found, tree);
     if (options.bundler && options.bundler !== actualBundler) {
         devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
       This may cause errors. If you are seeing errors, try removing the --bundler option.`);
@@ -19,6 +21,9 @@ async function addFiles(tree, projectConfig, options, found) {
     const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const updatedCommandFile = await addMountDefinition(tree.read(commandFile, 'utf-8'));
     tree.write(commandFile, `import { mount } from 'cypress/react18';\n${updatedCommandFile}`);
+    const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cyFile, 'utf-8'), { bundler: bundlerToUse });
+    tree.write(cyFile, `import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';\n${updatedCyConfig}`);
     if (options.bundler === 'webpack' ||
         (!options.bundler && actualBundler === 'webpack')) {
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });

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

@@ -4,5 +4,4 @@ export interface CypressComponentConfigurationSchema {
   skipFormat?: boolean;
   buildTarget?: string;
   bundler?: 'webpack' | 'vite';
-  addPlugin?: boolean;
 }

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

@@ -59,10 +59,10 @@ async function federateModuleGenerator(tree, schema) {
     Now you can use the module from your host app like this:
 
     Static import:
-    import { MyComponent } from '${remoteName}/${schema.name}';
+    import { MyComponent } from '${schema.name}/${remoteName}';
     
     Dynamic import:
-    import('${remoteName}/${schema.name}').then((m) => m.${schema.name});
+    import('${schema.name}/${remoteName}').then((m) => m.${remoteName});
   `);
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -4,7 +4,7 @@ export interface Schema {
   remote: string;
   remoteDirectory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
+  e2eTestRunner?: 'cypress' | 'none';
   host?: string;
   linter?: Linter;
   skipFormat?: boolean;

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",
@@ -68,9 +68,8 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "playwright", "none"],
-      "description": "Test runner to use for end to end (E2E) tests.",
-      "x-prompt": "Which E2E test runner would you like to use?",
+      "enum": ["cypress", "none"],
+      "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress"
     },
     "host": {

package/src/generators/hook/files/__fileName__.ts__tmpl__

@@ -1,15 +1,15 @@
-import { useState, useCallback } from 'react'
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface <%= hookTypeName %> {
-  count: number;
-  increment: () => void;
-}
-
-export function <%= hookName %>(): <%= hookTypeName %> {
-  const [count, setCount] = useState(0)
-  const increment = useCallback(() => setCount((x) => x + 1), [])
-  return { count, increment }
-}
-
-export default <%= hookName %>;
+import { useState, useCallback } from 'react'
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface <%= hookTypeName %> {
+  count: number;
+  increment: () => void;
+}
+
+export function <%= hookName %>(): <%= hookTypeName %> {
+  const [count, setCount] = useState(0)
+  const increment = useCallback(() => setCount((x) => x + 1), [])
+  return { count, increment }
+};
+
+export default <%= hookName %>;

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

@@ -1,22 +1,22 @@
 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 v19.
+   * @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 v18.
    */
   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.
+   * @deprecated Provide the `name` option instead and use the `as-provided` format. This option will be removed in Nx v18.
    */
   pascalCaseFiles?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
    */
   pascalCaseDirectory?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
    */
   flat?: boolean;
   js?: boolean;

package/src/generators/hook/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactHook",
   "title": "Create a React Hook for Nx",
@@ -19,7 +19,7 @@
       "$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 v19."
+      "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 v18."
     },
     "name": {
       "type": "string",
@@ -56,7 +56,7 @@
       "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 v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
     },
     "export": {
       "type": "boolean",
@@ -70,14 +70,14 @@
       "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."
+      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "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."
+      "x-deprecated": "Provide the `directory` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     }
   },
   "required": ["name"]

package/src/generators/host/files/module-federation/module-federation.config.js__tmpl__

@@ -1,21 +1,6 @@
 module.exports = {
   name: '<%= projectName %>',
-  /**
-   * To use a remote that does not exist in your current Nx Workspace
-   * You can use the tuple-syntax to define your remote
-   *
-   * remotes: [['my-external-remote', 'https://nx-angular-remote.netlify.app']]
-   *
-   * You _may_ need to add a `remotes.d.ts` file to your `src/` folder declaring the external remote for tsc, with the
-   * following content:
-   *
-   * declare module 'my-external-remote';
-   *
-   */
   remotes: [
-    <% if (static) { 
-         remotes.forEach(function(r) { %> "<%= r.fileName %>", <% }); 
-       }
-    %>
+  <% remotes.forEach(function(r) {%> "<%= r.fileName %>", <% }); %>
   ],
-};
+};

package/src/generators/host/files/module-federation/src/main.ts__tmpl__

@@ -0,0 +1 @@
+import('./bootstrap');

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

@@ -6,11 +6,8 @@
 const moduleFederationConfig = {
     name: '<%= projectName %>',
     remotes: [
-       <% if (static) { 
-         remotes.forEach(function(r) { %> "<%= r.fileName %>", <% }); 
-       }
-    %>
-  ],
+    <% remotes.forEach(function(r) {%> "<%= r.fileName %>", <% }); %>
+    ],
 };
 
 module.exports = moduleFederationConfig;

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

@@ -3,11 +3,8 @@ import { ModuleFederationConfig } from '@nx/webpack';
 const config: ModuleFederationConfig = {
     name: '<%= projectName %>',
     remotes: [
-      <% if (static) { 
-         remotes.forEach(function(r) { %> "<%= r.fileName %>", <% }); 
-       }
-    %>
-  ],
+    <% remotes.forEach(function(r) {%> "<%= r.fileName %>", <% }); %>
+    ],
 };
 
 export default config;

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

@@ -2,24 +2,9 @@ import { ModuleFederationConfig } from '@nx/webpack';
 
 const config: ModuleFederationConfig = {
     name: '<%= projectName %>',
-    /**
-     * To use a remote that does not exist in your current Nx Workspace
-     * You can use the tuple-syntax to define your remote
-     *
-     * remotes: [['my-external-remote', 'https://nx-angular-remote.netlify.app']]
-     *
-     * You _may_ need to add a `remotes.d.ts` file to your `src/` folder declaring the external remote for tsc, with the
-     * following content:
-     *
-     * declare module 'my-external-remote';
-     *
-     */
     remotes: [
-            <% if (static) { 
-         remotes.forEach(function(r) { %> "<%= r.fileName %>", <% }); 
-       }
-    %>
-  ],
+        <% remotes.forEach(function(r) {%> "<%= r.fileName %>", <% }); %>
+],
 };
 
 export default config;

package/src/generators/host/files/module-federation-ts/src/main.ts__tmpl__

@@ -0,0 +1 @@
+import('./bootstrap');

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

@@ -1,11 +1,10 @@
 import { composePlugins, withNx } from '@nx/webpack';
 import { withReact } from '@nx/react';
 import { withModuleFederation } from '@nx/react/module-federation';
-import { ModuleFederationConfig } from '@nx/webpack';
 
 import baseConfig from './module-federation.config';
 
-const prodConfig: ModuleFederationConfig = {
+const prodConfig = {
     ...baseConfig,
     /*
      * Remote overrides for production.

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

@@ -1,10 +1,10 @@
-import {composePlugins, withNx, ModuleFederationConfig} from '@nx/webpack';
+import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
 import {withModuleFederation} from '@nx/react/module-federation';
 
 import baseConfig from './module-federation.config';
 
-const config: ModuleFederationConfig = {
+const config = {
     ...baseConfig,
 };
 

package/src/generators/host/host.js

@@ -11,7 +11,6 @@ const add_module_federation_files_1 = require("./lib/add-module-federation-files
 const normalize_remote_1 = require("./lib/normalize-remote");
 const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
-const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 async function hostGenerator(host, schema) {
     return hostGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -23,13 +22,7 @@ async function hostGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host')),
-        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,
+        typescriptConfiguration: schema.typescriptConfiguration ?? true,
     };
     const initTask = await (0, application_1.default)(host, {
         ...options,
@@ -58,9 +51,6 @@ async function hostGeneratorInternal(host, schema) {
                 skipFormat: true,
                 projectNameAndRootFormat: options.projectNameAndRootFormat,
                 typescriptConfiguration: options.typescriptConfiguration,
-                js: options.js,
-                dynamic: options.dynamic,
-                host: options.name,
             });
             tasks.push(remoteTask);
             remotePort++;
@@ -82,10 +72,6 @@ async function hostGeneratorInternal(host, schema) {
         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);
     }
-    if (!options.setParserOptionsProject) {
-        host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.lint.json'));
-    }
-    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -1,6 +1,5 @@
-import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function addModuleFederationFiles(host: Tree, options: NormalizedSchema, defaultRemoteManifest: {
+export declare function addModuleFederationFiles(host: any, options: NormalizedSchema, defaultRemoteManifest: {
     name: string;
     port: number;
 }[]): void;

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

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-const maybe_js_1 = require("../../../utils/maybe-js");
+const path_1 = require("path");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.name),
         ...options,
-        static: !options?.dynamic,
         tmpl: '',
         remotes: defaultRemoteManifest.map(({ name, port }) => {
             return {
@@ -16,36 +15,24 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             };
         }),
     };
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
-    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
     // new entry file.
-    host.rename((0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/main.tsx')), (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/bootstrap.tsx')));
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, `../files/${options.js ? 'common' : 'common-ts'}`), options.appProjectRoot, templateVariables);
+    host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/common`), options.appProjectRoot, templateVariables);
     const pathToModuleFederationFiles = options.typescriptConfiguration
         ? 'module-federation-ts'
         : 'module-federation';
     // New entry file is created here.
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationFiles}`), options.appProjectRoot, templateVariables);
-    function deleteFileIfExists(host, filePath) {
-        if (host.exists(filePath)) {
-            host.delete(filePath);
-        }
-    }
-    function processWebpackConfig(options, host, fileName) {
-        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, fileName);
-        deleteFileIfExists(host, pathToWebpackConfig);
-    }
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/${pathToModuleFederationFiles}`), options.appProjectRoot, templateVariables);
     if (options.typescriptConfiguration) {
-        processWebpackConfig(options, host, 'webpack.config.js');
-        processWebpackConfig(options, host, 'webpack.config.prod.js');
-    }
-    if (options.dynamic) {
-        processWebpackConfig(options, host, 'webpack.config.prod.js');
-        processWebpackConfig(options, host, 'webpack.config.prod.ts');
-        if (!host.exists(pathToMFManifest)) {
-            host.write(pathToMFManifest, '{}');
+        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js');
+        const pathToWebpackProdConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.prod.js');
+        if (host.exists(pathToWebpackConfig)) {
+            host.delete(pathToWebpackConfig);
+        }
+        if (host.exists(pathToWebpackProdConfig)) {
+            host.delete(pathToWebpackProdConfig);
         }
     }
 }

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

@@ -13,7 +13,6 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
         : 'module-federation-ssr';
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, {
         ...options,
-        static: !options?.dynamic,
         remotes: defaultRemoteManifest.map(({ name, port }) => {
             return {
                 ...(0, devkit_1.names)(name),