@nx/react 0.0.0-pr-28808-f5b5ede → 0.0.0-pr-28808-41aa4e0

package/migrations.json

@@ -29,6 +29,12 @@
       "version": "19.6.1-beta.0",
       "description": "Ensure Target Defaults are set correctly for Module Federation.",
       "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf"
+    },
+    "update-20-2-0-update-module-federation-config-import": {
+      "cli": "nx",
+      "version": "20.2.0-beta.2",
+      "description": "Update the ModuleFederationConfig import use @nx/module-federation.",
+      "factory": "./src/migrations/update-20-2-0/migrate-mf-imports-to-new-package"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-28808-f5b5ede",
+  "version": "0.0.0-pr-28808-41aa4e0",
   "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": {
@@ -39,10 +39,11 @@
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "0.0.0-pr-28808-f5b5ede",
-    "@nx/js": "0.0.0-pr-28808-f5b5ede",
-    "@nx/eslint": "0.0.0-pr-28808-f5b5ede",
-    "@nx/web": "0.0.0-pr-28808-f5b5ede",
+    "@nx/devkit": "0.0.0-pr-28808-41aa4e0",
+    "@nx/js": "0.0.0-pr-28808-41aa4e0",
+    "@nx/eslint": "0.0.0-pr-28808-41aa4e0",
+    "@nx/web": "0.0.0-pr-28808-41aa4e0",
+    "@nx/module-federation": "0.0.0-pr-28808-41aa4e0",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -4,13 +4,11 @@ exports.default = moduleFederationDevServer;
 const devkit_1 = require("@nx/devkit");
 const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
 const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const start_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-remote-proxies");
-const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
 const build_static_remotes_1 = require("../../utils/build-static.remotes");
 function getBuildOptions(buildTarget, context) {
     const target = (0, devkit_1.parseTargetString)(buildTarget, context);
@@ -120,9 +118,9 @@ async function* moduleFederationDevServer(options, context) {
     if (!options.isInitialHost) {
         return yield* currIter;
     }
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
     const remoteNames = options.devRemotes?.map((r) => typeof r === 'string' ? r : r.remoteName);
-    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
+    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
@@ -133,11 +131,11 @@ async function* moduleFederationDevServer(options, context) {
         ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
         p.name.replace(/-/g, '_'),
     ]);
-    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await startRemotes(remotes.devRemotes, context, options, 'serve');
     const staticRemotesIter = startStaticRemotesFileServer(staticRemotesConfig, context, options);
-    (0, start_remote_proxies_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
+    (0, utils_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
         ? {
             pathToCert: (0, path_1.join)(devkit_1.workspaceRoot, options.sslCert),
             pathToKey: (0, path_1.join)(devkit_1.workspaceRoot, options.sslKey),

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -4,14 +4,12 @@ exports.default = moduleFederationSsrDevServer;
 const devkit_1 = require("@nx/devkit");
 const ssr_dev_server_impl_1 = require("@nx/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl");
 const path_1 = require("path");
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
 const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
-const start_ssr_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-ssr-remote-proxies");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 function normalizeOptions(options) {
     return {
@@ -155,9 +153,9 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     if (!options.isInitialHost) {
         return yield* iter;
     }
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
     const remoteNames = options.devRemotes?.map((remote) => typeof remote === 'string' ? remote : remote.remoteName);
-    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
+    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
@@ -167,11 +165,11 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
         ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
         projectConfig.name.replace(/-/g, '_'),
     ]);
-    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await buildSsrStaticRemotes(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await startRemotes(remotes.devRemotes, context, options);
     const staticRemotesIter = startSsrStaticRemotesFileServer(staticRemotesConfig, context, options);
-    (0, start_ssr_remote_proxies_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
+    (0, utils_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
         ? {
             pathToCert: options.sslCert,
             pathToKey: options.sslKey,

package/src/executors/module-federation-static-server/module-federation-static-server.impl.d.ts

@@ -1,7 +1,7 @@
 import { ModuleFederationStaticServerSchema } from './schema';
 import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
 import { ExecutorContext } from 'nx/src/config/misc-interfaces';
-import { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
+import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {
     pathToCert: string;
     pathToKey: string;

package/src/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -5,8 +5,7 @@ exports.default = moduleFederationStaticServer;
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
-const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
+const utils_1 = require("@nx/module-federation/src/utils");
 const build_static_remotes_1 = require("../../utils/build-static.remotes");
 const child_process_1 = require("child_process");
 const process = require("node:process");
@@ -164,13 +163,13 @@ async function* moduleFederationStaticServer(schema, context) {
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, module_federation_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = (0, utils_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
     const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host

package/src/generators/application/files/base-rspack/tsconfig.app.json__tmpl__

@@ -1,4 +1,4 @@
-<% if (isUsingTsSolutionSetup) { %>{
+<%_ if (isUsingTsSolutionSetup) { _%>{
   "extends": "<%= offsetFromRoot%>tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",

package/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__

@@ -1,4 +1,4 @@
-<% if (isUsingTsSolutionSetup) { %>{
+<%_ if (isUsingTsSolutionSetup) { _%>{
   "extends": "<%= offsetFromRoot%>tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",

package/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__

@@ -1,4 +1,4 @@
-<% if (isUsingTsSolutionSetup) { %>{
+<%_ if (isUsingTsSolutionSetup) { _%>{
   "extends": "<%= offsetFromRoot%>tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",

package/src/generators/application/lib/add-e2e.js

@@ -36,14 +36,27 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-                tags: [],
-            });
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                    tags: [],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -88,13 +101,26 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
-                projectType: 'application',
-                root: options.e2eProjectRoot,
-                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-                targets: {},
-                implicitDependencies: [options.projectName],
-            });
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        name: options.e2eProjectName,
+                        implicitDependencies: [options.projectName],
+                    },
+                });
+            }
+            else {
+                (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                    projectType: 'application',
+                    root: options.e2eProjectRoot,
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    targets: {},
+                    implicitDependencies: [options.projectName],
+                });
+            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

package/src/generators/application/schema.json

@@ -98,6 +98,14 @@
       "default": false,
       "x-priority": "internal"
     },
+    "bundler": {
+      "description": "The bundler to use.",
+      "type": "string",
+      "enum": ["vite", "webpack", "rspack"],
+      "x-prompt": "Which bundler do you want to use to build the application?",
+      "default": "vite",
+      "x-priority": "important"
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -111,6 +119,7 @@
       "enum": ["vitest", "jest", "none"],
       "description": "Test runner to use for unit tests.",
       "default": "vitest",
+      "x-prompt": "What unit test runner should be used?",
       "x-priority": "important"
     },
     "inSourceTests": {
@@ -174,14 +183,6 @@
       "default": false,
       "hidden": true
     },
-    "bundler": {
-      "description": "The bundler to use.",
-      "type": "string",
-      "enum": ["vite", "webpack", "rspack"],
-      "x-prompt": "Which bundler do you want to use to build the application?",
-      "default": "vite",
-      "x-priority": "important"
-    },
     "minimal": {
       "description": "Generate a React app with a minimal setup, no separate test files.",
       "type": "boolean",

package/src/generators/component/component.js

@@ -67,7 +67,9 @@ function addExportsToBarrel(host, options) {
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
-        const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
+        const indexFilePath = options.projectSourceRoot
+            ? (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts')
+            : (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
             const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);

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

@@ -36,6 +36,7 @@ async function normalizeOptions(tree, options) {
         className,
         fileName,
         filePath,
-        projectSourceRoot: projectSourceRoot ?? projectRoot,
+        projectRoot,
+        projectSourceRoot: projectSourceRoot,
     };
 }

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

@@ -20,6 +20,7 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   directory: string;
+  projectRoot: string;
   projectSourceRoot: string;
   projectName: string;
   fileName: string;

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

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @type {import('@nx/rspack/module-federation').ModuleFederationConfig}
+ * @type {import('@nx/module-federation').ModuleFederationConfig}
  **/
 const moduleFederationConfig = {
     name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/rspack/module-federation';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/rspack/module-federation';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,5 +1,6 @@
 import { composePlugins, withNx, withReact } from '@nx/rspack';
-import { withModuleFederation, ModuleFederationConfig } from '@nx/rspack/module-federation';
+import { withModuleFederation } from '@nx/rspack/module-federation';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';
 

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

@@ -1,5 +1,6 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederation, ModuleFederationConfig} from '@nx/rspack/module-federation';
+import { withModuleFederation } from '@nx/rspack/module-federation';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';
 

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

@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @type {import('@nx/webpack').ModuleFederationConfig}
+ * @type {import('@nx/module-federation').ModuleFederationConfig}
  **/
 const moduleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/webpack';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/webpack';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

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

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

@@ -1,6 +1,7 @@
-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 { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/library/lib/create-files.js

@@ -2,24 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const create_ts_config_1 = require("../../../utils/create-ts-config");
 function createFiles(host, options) {
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot);
     const substitutions = {
         ...options,
-        ...(0, devkit_2.names)(options.name),
+        ...(0, devkit_1.names)(options.name),
         tmpl: '',
-        offsetFromRoot: (0, devkit_2.offsetFromRoot)(options.projectRoot),
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
         fileName: options.fileName,
     };
-    (0, devkit_2.generateFiles)(host, (0, devkit_2.joinPathFragments)(__dirname, '../files/common'), options.projectRoot, substitutions);
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/common'), options.projectRoot, substitutions);
     if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
-        (0, devkit_2.generateFiles)(host, (0, devkit_2.joinPathFragments)(__dirname, '../files/vite'), options.projectRoot, substitutions);
+        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/vite'), options.projectRoot, substitutions);
     }
     if (options.compiler === 'babel') {
-        (0, devkit_2.writeJson)(host, (0, devkit_2.joinPathFragments)(options.projectRoot, '.babelrc'), {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'), {
             presets: [
                 [
                     '@nx/react/babel',
@@ -43,22 +42,31 @@ function createFiles(host, options) {
             ].filter(Boolean),
         });
     }
-    if (!options.publishable &&
-        !options.buildable &&
+    if ((options.publishable || options.buildable) &&
         !options.isUsingTsSolutionConfig) {
-        host.delete(`${options.projectRoot}/package.json`);
-    }
-    if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
-            json.name = options.importPath;
-            json.nx = {
-                name: options.name,
-            };
-            return json;
-        });
+        if (options.bundler === 'vite') {
+            (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+                name: options.importPath,
+                version: '0.0.1',
+                main: './index.js',
+                types: './index.d.ts',
+                exports: {
+                    '.': {
+                        import: './index.mjs',
+                        require: './index.js',
+                    },
+                },
+            });
+        }
+        else {
+            (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+                name: options.importPath,
+                version: '0.0.1',
+            });
+        }
     }
     if (options.js) {
-        (0, devkit_2.toJS)(host);
+        (0, devkit_1.toJS)(host);
     }
     (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, relativePathToRootTsConfig);
 }

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

@@ -5,7 +5,27 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function normalizeOptions(host, options) {
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    if (isUsingTsSolutionConfig) {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'vite' }, { name: 'rollup' }, { name: 'none' }],
+            initial: 0,
+        }, { bundler: 'none' }).then(({ bundler }) => bundler);
+    }
+    else {
+        options.bundler ??= await (0, prompt_1.promptWhenInteractive)({
+            type: 'autocomplete',
+            name: 'bundler',
+            message: `Which bundler would you like to use to build the library? Choose 'none' to skip build setup.`,
+            choices: [{ name: 'none' }, { name: 'vite' }, { name: 'rollup' }],
+            initial: 0,
+        }, { bundler: undefined }).then(({ bundler }) => bundler);
+    }
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -63,7 +83,7 @@ async function normalizeOptions(host, options) {
         }
     }
     (0, assertion_1.assertValidStyle)(normalized.style);
-    normalized.isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    normalized.isUsingTsSolutionConfig = isUsingTsSolutionConfig;
     return normalized;
 }
 function findMainEntry(tree, projectRoot) {

package/src/generators/library/library.js

@@ -46,7 +46,17 @@ async function libraryGeneratorInternal(host, schema) {
         skipFormat: true,
     });
     tasks.push(initTask);
-    if (!options.isUsingTsSolutionConfig) {
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+            name: options.importPath,
+            nx: {
+                name: options.importPath === options.name ? undefined : options.name,
+                projectType: 'library',
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, {
             root: options.projectRoot,
             sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),

package/src/generators/library/schema.json

@@ -160,10 +160,7 @@
     "bundler": {
       "type": "string",
       "description": "The bundler to use. Choosing 'none' means this library is not buildable.",
-      "enum": ["none", "vite", "rollup"],
-      "default": "none",
-      "x-prompt": "Which bundler would you like to use to build the library? Choose 'none' to skip build setup.",
-      "x-priority": "important"
+      "enum": ["none", "vite", "rollup"]
     },
     "compiler": {
       "type": "string",

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

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/rspack/module-federation';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/rspack/module-federation';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/webpack';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/webpack';
+import {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function migrateMfImportsToNewPackage(tree: Tree): Promise<void>;

package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateMfImportsToNewPackage;
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const MF_IMPORT_TO_UPDATE = 'ModuleFederationConfig';
+const MF_CONFIG_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=@nx/webpack]):has(Identifier[name=ModuleFederationConfig]),ImportDeclaration:has(StringLiteral[value=@nx/rspack/module-federation]):has(Identifier[name=ModuleFederationConfig])`;
+const IMPORT_TOKENS_SELECTOR = `ImportClause ImportSpecifier`;
+const MF_CONFIG_IMPORT_SPECIFIER_SELECTOR = `ImportClause ImportSpecifier > Identifier[name=ModuleFederationConfig]`;
+const WEBPACK_IMPORT_SELECTOR = `ImportDeclaration > StringLiteral[value=@nx/webpack]`;
+const RSPACK_IMPORT_SELECTOR = `ImportDeclaration > StringLiteral[value=@nx/rspack/module-federation]`;
+async function migrateMfImportsToNewPackage(tree) {
+    const rootsToCheck = new Set();
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const [project, dependencies] of Object.entries(graph.dependencies)) {
+        const usesNxWebpackOrRspack = dependencies.some((dep) => dep.target === 'npm:@nx/webpack' || dep.target === 'npm:@nx/rspack');
+        if (usesNxWebpackOrRspack) {
+            const root = graph.nodes[project].data.root;
+            rootsToCheck.add(root);
+        }
+    }
+    for (const root of rootsToCheck) {
+        (0, devkit_2.visitNotIgnoredFiles)(tree, root, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes(MF_IMPORT_TO_UPDATE)) {
+                return;
+            }
+            const ast = tsquery_1.tsquery.ast(contents);
+            const importNodes = (0, tsquery_1.tsquery)(ast, MF_CONFIG_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            const importNode = importNodes[0];
+            const importSpecifiers = (0, tsquery_1.tsquery)(importNode, IMPORT_TOKENS_SELECTOR);
+            if (importSpecifiers.length > 1) {
+                const mfConfigImportSpecifierNode = (0, tsquery_1.tsquery)(importNode, MF_CONFIG_IMPORT_SPECIFIER_SELECTOR)[0];
+                const end = contents.charAt(mfConfigImportSpecifierNode.getEnd()) === ','
+                    ? mfConfigImportSpecifierNode.getEnd() + 1
+                    : mfConfigImportSpecifierNode.getEnd();
+                contents = `import { ${MF_IMPORT_TO_UPDATE} } from '@nx/module-federation';
+      ${contents.slice(0, mfConfigImportSpecifierNode.getStart())}${contents.slice(end)}`;
+            }
+            else {
+                const nxWebpackImportStringNodes = (0, tsquery_1.tsquery)(importNode, WEBPACK_IMPORT_SELECTOR);
+                const nxRspackImportStringNodes = (0, tsquery_1.tsquery)(importNode, RSPACK_IMPORT_SELECTOR);
+                if (nxWebpackImportStringNodes.length === 0 &&
+                    nxRspackImportStringNodes.length === 0) {
+                    return;
+                }
+                const bundlerImportStringNode = nxWebpackImportStringNodes.length
+                    ? nxWebpackImportStringNodes[0]
+                    : nxRspackImportStringNodes[0];
+                contents = `${contents.slice(0, bundlerImportStringNode.getStart())}'@nx/module-federation'${contents.slice(bundlerImportStringNode.getEnd())}`;
+            }
+            tree.write(filePath, contents);
+        });
+    }
+    await (0, devkit_2.formatFiles)(tree);
+}

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

@@ -1,12 +1,12 @@
-import { ModuleFederationConfig } from '@nx/webpack/src/utils/module-federation';
+import { ModuleFederationConfig } from '@nx/module-federation';
 export declare function getFunctionDeterminateRemoteUrl(isServer?: boolean): (remote: string) => string;
 export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, options?: {
     isServer: boolean;
     determineRemoteUrl?: (remote: string) => string;
 }): Promise<{
-    sharedLibraries: import("@nx/webpack/src/utils/module-federation").SharedWorkspaceLibraryConfig;
+    sharedLibraries: import("@nx/module-federation").SharedWorkspaceLibraryConfig;
     sharedDependencies: {
-        [x: string]: import("@nx/webpack/src/utils/module-federation").SharedLibraryConfig;
+        [x: string]: import("@nx/module-federation").SharedLibraryConfig;
     };
     mappedRemotes: {};
 }>;

package/src/module-federation/utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
 exports.getModuleFederationConfig = getModuleFederationConfig;
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+const module_federation_1 = require("@nx/module-federation");
 const devkit_1 = require("@nx/devkit");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 function getFunctionDeterminateRemoteUrl(isServer = false) {

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

@@ -1,2 +1,2 @@
-import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/module-federation';
 export declare function withModuleFederationForSSR(options: ModuleFederationConfig, configOverride?: NxModuleFederationConfigOverride): Promise<(config: any) => any>;

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

@@ -32,7 +32,7 @@ async function withModuleFederationForSSR(options, configOverride) {
                 !options.disableNxRuntimeLibraryControlPlugin
                 ? [
                     ...(configOverride?.runtimePlugins ?? []),
-                    require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
+                    require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
                 ]
                 : [
                     ...(configOverride?.runtimePlugins ?? []),

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/module-federation';
 import type { AsyncNxComposableWebpackPlugin } from '@nx/webpack';
 /**
  * @param {ModuleFederationConfig} options

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

@@ -48,7 +48,7 @@ async function withModuleFederation(options, configOverride) {
                 !options.disableNxRuntimeLibraryControlPlugin
                 ? [
                     ...(configOverride?.runtimePlugins ?? []),
-                    require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
+                    require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
                 ]
                 : configOverride?.runtimePlugins,
             virtualRuntimeEntry: true,

package/src/generators/library/files/common/package.json__tmpl__

@@ -1,4 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1"
-}

package/src/generators/library/files/vite/package.json__tmpl__

@@ -1,12 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1",
-  "main": "./index.js",
-  "types": "./index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./index.mjs",
-      "require": "./index.js"
-    }
-  }
-}

package/src/module-federation/load-config.d.ts

@@ -1,3 +0,0 @@
-import { ExecutorContext } from '@nx/devkit';
-import { ModuleFederationConfig } from './models';
-export declare function loadModuleFederationConfigFromContext(context: ExecutorContext): ModuleFederationConfig;

package/src/module-federation/load-config.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadModuleFederationConfigFromContext = loadModuleFederationConfigFromContext;
-const path_1 = require("path");
-function loadModuleFederationConfigFromContext(context) {
-    const p = context.projectsConfigurations.projects[context.projectName];
-    const moduleFederationConfigPath = (0, path_1.join)(context.root, p.root, 'module-federation.config.js');
-    try {
-        return require(moduleFederationConfigPath);
-    }
-    catch {
-        // TODO(jack): Add a link to guide
-        throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`);
-    }
-}

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

@@ -1,24 +0,0 @@
-export type ModuleFederationLibrary = {
-    type: string;
-    name: string;
-};
-export type Remotes = string[] | [remoteName: string, remoteUrl: string][];
-export interface SharedLibraryConfig {
-    singleton?: boolean;
-    strictVersion?: boolean;
-    requiredVersion?: false | string;
-    eager?: boolean;
-}
-export type SharedFunction = (libraryName: string, sharedConfig: SharedLibraryConfig) => undefined | false | SharedLibraryConfig;
-export type AdditionalSharedConfig = Array<string | [libraryName: string, sharedConfig: SharedLibraryConfig] | {
-    libraryName: string;
-    sharedConfig: SharedLibraryConfig;
-}>;
-export interface ModuleFederationConfig {
-    name: string;
-    remotes?: Remotes;
-    library?: ModuleFederationLibrary;
-    exposes?: Record<string, string>;
-    shared?: SharedFunction;
-    additionalShared?: AdditionalSharedConfig;
-}

package/src/module-federation/models.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,8 +0,0 @@
-export declare function readRootPackageJson(): {
-    dependencies?: {
-        [key: string]: string;
-    };
-    devDependencies?: {
-        [key: string]: string;
-    };
-};

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

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readRootPackageJson = readRootPackageJson;
-const devkit_1 = require("@nx/devkit");
-const fs_1 = require("fs");
-function readRootPackageJson() {
-    const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
-    if (!(0, fs_1.existsSync)(pkgJsonPath)) {
-        throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
-    }
-    return (0, devkit_1.readJsonFile)(pkgJsonPath);
-}