@nx/react 17.0.5 → 17.0.6

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

@@ -46,16 +46,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
 }
 exports.updateHostWithRemote = updateHostWithRemote;
 function findAppComponentPath(host, sourceRoot) {
-    const locations = [
-        'app/app.tsx',
-        'app/App.tsx',
-        'app/app.js',
-        'app/App.js',
-        'app.tsx',
-        'App.tsx',
-        'app.js',
-        'App.js',
-    ];
+    const locations = ['app/app.tsx', 'app/App.tsx', 'app.tsx', 'App.tsx'];
     for (const loc of locations) {
         if (host.exists((0, devkit_1.joinPathFragments)(sourceRoot, loc))) {
             return (0, devkit_1.joinPathFragments)(sourceRoot, loc);

package/src/generators/remote/remote.js

@@ -10,16 +10,12 @@ const update_module_federation_project_1 = require("../../rules/update-module-fe
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
 const setup_tspath_for_remote_1 = require("./lib/setup-tspath-for-remote");
-const add_remote_to_dynamic_host_1 = require("./lib/add-remote-to-dynamic-host");
-const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
-const maybe_js_1 = require("../../utils/maybe-js");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.name),
         ...options,
         tmpl: '',
     };
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/${options.js ? 'common' : 'common-ts'}`), options.appProjectRoot, templateVariables);
     const pathToModuleFederationFiles = options.typescriptConfiguration
         ? 'module-federation-ts'
         : 'module-federation';
@@ -47,14 +43,7 @@ async function remoteGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote')),
-        // 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,
+        typescriptConfiguration: schema.typescriptConfiguration ?? false,
     };
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
@@ -69,7 +58,7 @@ async function remoteGeneratorInternal(host, schema) {
     // 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, path_1.join)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/main.tsx')), (0, path_1.join)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/bootstrap.tsx')));
+    host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
     addModuleFederationFiles(host, options);
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, setup_tspath_for_remote_1.setupTspathForRemote)(host, options);
@@ -86,15 +75,6 @@ async function remoteGeneratorInternal(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'));
-    }
-    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.name, options.devServerPort, pathToMFManifest);
-    }
-    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -1,6 +1,6 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter } from '@nx/eslint';
-import type { SupportedStyles } from '../../../typings/style';
+import type { SupportedStyles } from '../../../typings';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
 
 export interface Schema {
@@ -9,7 +9,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'playwright' | 'none';
+  e2eTestRunner: 'cypress' | 'none';
   globalCss?: boolean;
   host?: string;
   js?: boolean;
@@ -26,7 +26,6 @@ export interface Schema {
   tags?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';
   typescriptConfiguration?: boolean;
-  dynamic?: boolean;
 }
 
 export interface NormalizedSchema extends ApplicationNormalizedSchema {

package/src/generators/remote/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorReactRemote",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Remote App",
@@ -28,12 +28,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "dynamic": {
-      "type": "boolean",
-      "description": "Should the host application use dynamic federation?",
-      "default": false,
-      "x-priority": "internal"
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -49,15 +43,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org                       ]"
-          },
-          {
-            "value": "tailwind",
-            "label": "tailwind [ https://tailwindcss.com/            ]"
+            "label": "LESS              [ http://lesscss.org                       ]"
           },
           {
             "value": "styled-components",
@@ -109,9 +99,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"
     },
     "tags": {
@@ -174,7 +163,7 @@
     },
     "typescriptConfiguration": {
       "type": "boolean",
-      "description": "Whether the module federation configuration and webpack configuration files should use TS. When --js is used, this flag is ignored.",
+      "description": "Whether the module federation configuration and webpack configuration files should use TS.",
       "default": true
     }
   },

package/src/generators/setup-ssr/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorReactSSRSetup",
   "cli": "nx",
   "title": "Generate SSR setup for a React app",

package/src/generators/setup-ssr/setup-ssr.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const init_1 = require("../init/init");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("../../utils/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -17,22 +18,9 @@ function readEntryFile(host, path) {
         source: tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true),
     };
 }
-async function getProjectConfig(tree, projectName) {
-    let maybeProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    if (!maybeProjectConfig.targets?.build) {
-        let projectGraph;
-        try {
-            projectGraph = (0, devkit_1.readCachedProjectGraph)();
-        }
-        catch {
-            projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-        }
-        maybeProjectConfig = projectGraph.nodes[projectName].data;
-    }
-    return maybeProjectConfig;
-}
 async function setupSsrGenerator(tree, options) {
-    const projectConfig = await getProjectConfig(tree, options.project);
+    await (0, init_1.default)(tree, { skipFormat: true });
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const projectRoot = projectConfig.root;
     const appImportCandidates = [
         options.appComponentImportPath ?? 'app/app',
@@ -56,15 +44,11 @@ async function setupSsrGenerator(tree, options) {
     if (projectConfig.targets.server) {
         throw new Error(`Project ${options.project} already has a server target.`);
     }
-    const originalOutputPath = projectConfig.targets.build?.options?.outputPath ??
-        projectConfig.targets.build?.outputs[0];
+    const originalOutputPath = projectConfig.targets.build?.options?.outputPath;
     if (!originalOutputPath) {
         throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
     }
-    // TODO(colum): We need to figure out how to handle this for Crystal
-    if (projectConfig.targets.build.options?.outputPath) {
-        projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
-    }
+    projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
     projectConfig.targets = {
         ...projectConfig.targets,
         server: {
@@ -81,6 +65,7 @@ async function setupSsrGenerator(tree, options) {
                 compiler: 'babel',
                 externalDependencies: 'all',
                 outputHashing: 'none',
+                isolatedConfig: true,
                 webpackConfig: (0, devkit_1.joinPathFragments)(projectRoot, 'webpack.config.js'),
             },
             configurations: {
@@ -154,8 +139,7 @@ async function setupSsrGenerator(tree, options) {
             ? `"${options.extraInclude.join('", "')}",`
             : '',
         appComponentImport: appComponentInfo.importPath,
-        browserBuildOutputPath: projectConfig.targets.build?.options?.outputPath ??
-            projectConfig.targets.build?.outputs[0],
+        browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
     });
     // Add <StaticRouter> to server main if needed.
     // TODO: need to read main.server.tsx not main.tsx.

package/src/generators/setup-tailwind/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactTailwindSetupGenerator",
   "title": "Configures Tailwind CSS for an application or a buildable/publishable library.",

package/src/generators/stories/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookStories",
   "title": "Generate React Storybook stories",

package/src/generators/stories/stories.js

@@ -6,15 +6,16 @@ const component_cypress_spec_1 = require("../component-cypress-spec/component-cy
 const ast_utils_1 = require("../../utils/ast-utils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const minimatch_1 = require("minimatch");
+const minimatch = require("minimatch");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const versions_1 = require("../../utils/versions");
 let tsModule;
 async function projectRootPath(tree, config) {
+    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
     let projectDir;
     if (config.projectType === 'application') {
-        const isNextJs = await isNextJsProject(tree, config);
-        if (isNextJs) {
+        const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
+        if (!!nextBuildTarget) {
             // Next.js apps
             projectDir = 'components';
         }
@@ -52,7 +53,7 @@ async function createAllStories(tree, projectName, interactionTests, js, project
         // Ignore private files starting with "_".
         if ((0, path_1.basename)(path).startsWith('_'))
             return;
-        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
+        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
             return;
         if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
             (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
@@ -114,17 +115,4 @@ async function storiesGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.storiesGenerator = storiesGenerator;
-async function isNextJsProject(tree, config) {
-    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
-    const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
-    if (nextBuildTarget) {
-        return true;
-    }
-    for (const configFile of ['next.config.js', 'next.config.ts']) {
-        if (tree.exists((0, path_1.join)(config.root, configFile))) {
-            return true;
-        }
-    }
-    return false;
-}
 exports.default = storiesGenerator;

package/src/generators/storybook-configuration/configuration.d.ts

@@ -1,6 +1,4 @@
 import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;
-export declare function findWebpackConfig(tree: Tree, projectRoot: string): string | undefined;

package/src/generators/storybook-configuration/configuration.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findWebpackConfig = exports.storybookConfigurationGeneratorInternal = exports.storybookConfigurationGenerator = void 0;
+exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function generateStories(host, schema) {
-    // TODO(katerina): Nx 19 -> remove Cypress
+    // TODO(katerina): Nx 18 -> remove Cypress
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-    const cypressProject = getE2eProjectName(schema.project, projectConfig.root, schema.cypressDirectory);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+    const cypressProject = getE2eProjectName(schema.name, projectConfig.root, schema.cypressDirectory);
     await (0, stories_1.default)(host, {
-        project: schema.project,
+        project: schema.name,
         generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
         js: schema.js,
         cypressProject,
@@ -20,39 +20,27 @@ async function generateStories(host, schema) {
         interactionTests: schema.interactionTests ?? true,
     });
 }
-function storybookConfigurationGenerator(host, schema) {
-    return storybookConfigurationGeneratorInternal(host, {
-        addPlugin: false,
-        ...schema,
-    });
-}
-exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
-async function storybookConfigurationGeneratorInternal(host, schema) {
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    schema.addPlugin ??= addPluginDefault;
+async function storybookConfigurationGenerator(host, schema) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     let uiFramework = '@storybook/react-vite';
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-    if (findWebpackConfig(host, projectConfig.root) ||
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+    if (projectConfig.targets['build']?.executor === '@nx/webpack:webpack' ||
+        projectConfig.targets['build']?.executor === '@nrwl/webpack:webpack' ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
-        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup' ||
-        projectConfig.targets['build']?.executor === '@nx/expo:build') {
+        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup') {
         uiFramework = '@storybook/react-webpack5';
     }
     const installTask = await configurationGenerator(host, {
-        project: schema.project,
+        name: schema.name,
         configureCypress: schema.configureCypress,
         js: schema.js,
         linter: schema.linter,
         cypressDirectory: schema.cypressDirectory,
-        tsConfiguration: schema.tsConfiguration ?? true, // default is true
-        interactionTests: schema.interactionTests ?? true, // default is true
+        tsConfiguration: schema.tsConfiguration ?? true,
+        interactionTests: schema.interactionTests ?? true,
         configureStaticServe: schema.configureStaticServe,
-        uiFramework: uiFramework, // cannot import UiFramework type dynamically
+        uiFramework: uiFramework,
         skipFormat: true,
-        addPlugin: schema.addPlugin,
     });
     if (schema.generateStories) {
         await generateStories(host, schema);
@@ -60,15 +48,5 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
     await (0, devkit_1.formatFiles)(host);
     return installTask;
 }
-exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
+exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 exports.default = storybookConfigurationGenerator;
-function findWebpackConfig(tree, projectRoot) {
-    const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
-    for (const ext of allowsExt) {
-        const webpackConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, `webpack.config.${ext}`);
-        if (tree.exists(webpackConfigPath)) {
-            return webpackConfigPath;
-        }
-    }
-}
-exports.findWebpackConfig = findWebpackConfig;

package/src/generators/storybook-configuration/schema.d.ts

@@ -1,7 +1,7 @@
 import { Linter } from '@nx/eslint';
 
 export interface StorybookConfigureSchema {
-  project: string;
+  name: string;
   interactionTests?: boolean;
   generateStories?: boolean;
   js?: boolean;
@@ -12,5 +12,4 @@ export interface StorybookConfigureSchema {
   configureCypress?: boolean;
   generateCypressSpecs?: boolean;
   cypressDirectory?: string;
-  addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -1,14 +1,14 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookConfigure",
   "title": "React Storybook Configure",
   "description": "Set up Storybook for a React app or library.",
   "type": "object",
   "properties": {
-    "project": {
+    "name": {
       "type": "string",
-      "aliases": ["name", "projectName"],
+      "aliases": ["project", "projectName"],
       "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Run the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "generateStories": {
       "type": "boolean",
@@ -41,7 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Automatically generate test files in the Cypress E2E app generated by the `cypress-configure` generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -53,7 +53,7 @@
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "js": {
       "type": "boolean",
@@ -90,6 +90,6 @@
       ]
     }
   },
-  "required": ["project"],
+  "required": ["name"],
   "examplesFile": "../../../docs/storybook-configuration-examples.md"
 }

package/src/module-federation/ast-utils.js

@@ -18,7 +18,7 @@ function addRemoteToConfig(source, app) {
             return [];
         const lastElement = arrayExpression.elements[arrayExpression.elements.length - 1];
         return [
-            lastElement && !arrayExpression.elements.hasTrailingComma
+            lastElement
                 ? {
                     type: devkit_1.ChangeType.Insert,
                     index: lastElement.end,

package/src/module-federation/utils.js

@@ -5,16 +5,9 @@ const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
 const devkit_1 = require("@nx/devkit");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 function getFunctionDeterminateRemoteUrl(isServer = false) {
-    const target = 'serve';
+    const target = isServer ? 'serve-server' : 'serve';
     const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
     return function (remote) {
-        const mappedStaticRemotesFromEnv = process.env
-            .NX_MF_DEV_SERVER_STATIC_REMOTES
-            ? JSON.parse(process.env.NX_MF_DEV_SERVER_STATIC_REMOTES)
-            : undefined;
-        if (mappedStaticRemotesFromEnv && mappedStaticRemotesFromEnv[remote]) {
-            return `${mappedStaticRemotesFromEnv[remote]}/${remoteEntry}`;
-        }
         let remoteConfiguration = null;
         try {
             remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);

package/src/module-federation/with-module-federation-ssr.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
 const utils_1 = require("./utils");
 async function withModuleFederationForSSR(options) {
-    if (global.NX_GRAPH_CREATION) {
-        return (config) => config;
-    }
     const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
         isServer: true,
     });

package/src/module-federation/with-module-federation.d.ts

@@ -1,7 +1,7 @@
 import { ModuleFederationConfig } from '@nx/webpack/src/utils/module-federation';
-import type { AsyncNxComposableWebpackPlugin } from '@nx/webpack';
+import type { AsyncNxWebpackPlugin } from '@nx/webpack';
 /**
  * @param {ModuleFederationConfig} options
- * @return {Promise<AsyncNxComposableWebpackPlugin>}
+ * @return {Promise<AsyncNxWebpackPlugin>}
  */
-export declare function withModuleFederation(options: ModuleFederationConfig): Promise<AsyncNxComposableWebpackPlugin>;
+export declare function withModuleFederation(options: ModuleFederationConfig): Promise<AsyncNxWebpackPlugin>;

package/src/module-federation/with-module-federation.js

@@ -3,34 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederation = void 0;
 const utils_1 = require("./utils");
 const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
-const isVarOrWindow = (libType) => libType === 'var' || libType === 'window';
 /**
  * @param {ModuleFederationConfig} options
- * @return {Promise<AsyncNxComposableWebpackPlugin>}
+ * @return {Promise<AsyncNxWebpackPlugin>}
  */
 async function withModuleFederation(options) {
-    if (global.NX_GRAPH_CREATION) {
-        return (config) => config;
-    }
     const { sharedDependencies, sharedLibraries, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
-    const isGlobal = isVarOrWindow(options.library?.type);
     return (config, ctx) => {
         config.output.uniqueName = options.name;
         config.output.publicPath = 'auto';
-        if (isGlobal) {
+        if (options.library?.type === 'var') {
             config.output.scriptType = 'text/javascript';
         }
         config.optimization = {
             runtimeChunk: false,
         };
-        if (config.mode === 'development' &&
-            Object.keys(mappedRemotes).length > 1 &&
-            !options.exposes) {
-            config.optimization.runtimeChunk = 'single';
-        }
         config.experiments = {
             ...config.experiments,
-            outputModule: !isGlobal,
+            outputModule: !(options.library?.type === 'var'),
         };
         config.plugins.push(new ModuleFederationPlugin({
             name: options.name,
@@ -47,7 +37,7 @@ async function withModuleFederation(options) {
              *  { appX: 'appX@http://localhost:3001/remoteEntry.js' }
              *  { appY: 'appY@http://localhost:3002/remoteEntry.js' }
              */
-            ...(isGlobal ? { remoteType: 'script' } : {}),
+            ...(options.library?.type === 'var' ? { remoteType: 'script' } : {}),
         }), sharedLibraries.getReplacementPlugin());
         return config;
     };

package/src/rules/update-module-federation-project.d.ts

@@ -1,9 +1,7 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 export declare function updateModuleFederationProject(host: Tree, options: {
-    js?: boolean;
     projectName: string;
     appProjectRoot: string;
     devServerPort?: number;
     typescriptConfiguration?: boolean;
-    dynamic?: boolean;
 }): GeneratorCallback;

package/src/rules/update-module-federation-project.js

@@ -3,26 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../utils/versions");
-const maybe_js_1 = require("../utils/maybe-js");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     projectConfig.targets.build.options = {
         ...projectConfig.targets.build.options,
-        main: (0, maybe_js_1.maybeJs)(options, `${options.appProjectRoot}/src/main.ts`),
-        webpackConfig: `${options.appProjectRoot}/webpack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+        main: `${options.appProjectRoot}/src/main.ts`,
+        webpackConfig: `${options.appProjectRoot}/webpack.config.${options.typescriptConfiguration ? 'ts' : 'js'}`,
     };
     projectConfig.targets.build.configurations.production = {
         ...projectConfig.targets.build.configurations.production,
-        webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+        webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration ? 'ts' : 'js'}`,
     };
-    // If host should be configured to use dynamic federation
-    if (options.dynamic) {
-        const pathToProdWebpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.prod.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`);
-        if (host.exists(pathToProdWebpackConfig)) {
-            host.delete(pathToProdWebpackConfig);
-        }
-        delete projectConfig.targets.build.configurations.production?.webpackConfig;
-    }
     projectConfig.targets.serve.executor =
         '@nx/react:module-federation-dev-server';
     projectConfig.targets.serve.options.port = options.devServerPort;

package/src/utils/assertion.js

@@ -5,7 +5,6 @@ const VALID_STYLES = [
     'css',
     'scss',
     'less',
-    'tailwind',
     'styled-components',
     '@emotion/styled',
     'styled-jsx',

package/src/utils/ct-utils.d.ts

@@ -1,14 +1,9 @@
 import { Tree } from '@nx/devkit';
 import { type FoundTarget } from '@nx/cypress/src/utils/find-target-options';
-export declare function configureCypressCT(tree: Tree, options: {
+export declare function addCTTargetWithBuildTarget(tree: Tree, options: {
     project: string;
     buildTarget: string;
-    bundler: 'vite' | 'webpack';
     validExecutorNames: Set<string>;
 }): Promise<FoundTarget>;
 export declare function getBundlerFromTarget(found: FoundTarget, tree: Tree): Promise<'vite' | 'webpack'>;
-export declare function getActualBundler(tree: Tree, options: {
-    buildTarget?: string;
-    bundler?: 'vite' | 'webpack';
-}, found: FoundTarget): Promise<"vite" | "webpack">;
 export declare function isComponent(tree: Tree, filePath: string): boolean;