@nx/react 20.2.0-beta.2 → 20.2.0-beta.4

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateModuleFederationTsconfig = updateModuleFederationTsconfig;
+const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+function updateModuleFederationTsconfig(host, options) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
+    const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
+    if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
+        return;
+    // Not setting `baseUrl` does not work with MF.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
+            json.compilerOptions.baseUrl = '.';
+            return json;
+        });
+        // Update references to match what `nx sync` does.
+        if (options.remotes?.length) {
+            (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+            (0, devkit_1.updateJson)(host, tsconfigRuntimePath, (json) => {
+                json.references ??= [];
+                for (const remote of options.remotes) {
+                    const remotePath = `../${remote}/tsconfig.app.json`;
+                    if (!json.references.some((ref) => ref.path === remotePath))
+                        json.references.push({ path: remotePath });
+                }
+                return json;
+            });
+        }
+    }
+}

package/src/generators/init/init.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitGenerator = reactInitGenerator;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 async function reactInitGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'init');
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []));

package/src/generators/library/lib/create-files.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function createFiles(host: Tree, options: NormalizedSchema): void;

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

@@ -42,8 +42,28 @@ function createFiles(host, options) {
             ].filter(Boolean),
         });
     }
-    if (!options.publishable && !options.buildable) {
-        host.delete(`${options.projectRoot}/package.json`);
+    if ((options.publishable || options.buildable) &&
+        !options.isUsingTsSolutionConfig) {
+        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_1.toJS)(host);

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

@@ -4,7 +4,9 @@ exports.normalizeOptions = normalizeOptions;
 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");
 async function normalizeOptions(host, options) {
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     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,
@@ -62,6 +64,7 @@ async function normalizeOptions(host, options) {
         }
     }
     (0, assertion_1.assertValidStyle)(normalized.style);
+    normalized.isUsingTsSolutionConfig = isUsingTsSolutionConfig;
     return normalized;
 }
 function findMainEntry(tree, projectRoot) {

package/src/generators/library/library.js

@@ -7,7 +7,6 @@ const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const maybe_js_1 = require("../../utils/maybe-js");
 const component_1 = require("../component/component");
@@ -21,6 +20,7 @@ const create_files_1 = require("./lib/create-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const set_defaults_1 = require("./lib/set-defaults");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
@@ -28,8 +28,12 @@ async function libraryGenerator(host, schema) {
     });
 }
 async function libraryGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'library');
     const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
@@ -37,26 +41,41 @@ async function libraryGeneratorInternal(host, schema) {
     if (!options.component) {
         options.style = 'none';
     }
-    const jsInitTask = await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    });
-    tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, {
         ...options,
         skipFormat: true,
     });
     tasks.push(initTask);
-    (0, devkit_1.addProjectConfiguration)(host, options.name, {
-        root: options.projectRoot,
-        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-        projectType: 'library',
-        tags: options.parsedTags,
-        targets: {},
-    });
+    if (options.isUsingTsSolutionConfig) {
+        const sourceEntry = options.bundler === 'none'
+            ? options.js
+                ? './src/index.js'
+                : './src/index.ts'
+            : undefined;
+        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+            name: options.importPath,
+            main: sourceEntry,
+            types: sourceEntry,
+            nx: {
+                name: options.importPath === options.name ? undefined : options.name,
+                projectType: 'library',
+                sourceRoot: `${options.projectRoot}/src`,
+                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'),
+            projectType: 'library',
+            tags: options.parsedTags,
+            targets: {},
+        });
+    }
+    (0, create_files_1.createFiles)(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
-    (0, create_files_1.createFiles)(host, options);
     // Set up build target
     if (options.buildable && options.bundler === 'vite') {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
@@ -178,14 +197,25 @@ async function libraryGeneratorInternal(host, schema) {
     tasks.push(routeTask);
     (0, set_defaults_1.setDefaults)(host, options);
     (0, create_ts_config_1.extractTsConfigBase)(host);
-    if (!options.skipTsConfig) {
+    if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
             (0, maybe_js_1.maybeJs)(options, (0, devkit_1.joinPathFragments)(options.projectRoot, './src/index.ts')),
         ]);
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    // Always run install to link packages.
+    if (options.isUsingTsSolutionConfig) {
+        tasks.push(() => (0, devkit_1.installPackagesTask)(host));
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });

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

@@ -39,4 +39,5 @@ export interface NormalizedSchema extends Schema {
   appMain?: string;
   appSourceRoot?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';
+  isUsingTsSolutionConfig?: boolean;
 }

package/src/generators/library/schema.json

@@ -71,18 +71,29 @@
         ]
       }
     },
+    "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"
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "jest", "none"],
-      "default": "vitest",
+      "default": "none",
       "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?"
+      "x-prompt": "What unit test runner should be used?",
+      "x-priority": "important"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -154,14 +165,6 @@
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
     },
-    "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"
-    },
     "compiler": {
       "type": "string",
       "enum": ["babel", "swc"],

package/src/generators/redux/schema.json

@@ -5,21 +5,30 @@
   "title": "Create Redux state",
   "description": "Create a Redux state slice for a React project.",
   "type": "object",
+  "examples": [
+    {
+      "description": "Generate a Redux state slice with the exported symbol matching the file name. It results in the slice `fooSlice` at `mylib/src/lib/foo.slice.ts`",
+      "command": "nx g @nx/react:redux mylib/src/lib/foo"
+    },
+    {
+      "description": "Generate a Redux state slice with the exported symbol different from the file name. It results in the slice `customSlice` at `mylib/src/lib/foo.slice.ts`",
+      "command": "nx g @nx/react:redux mylib/src/lib/foo --name=custom"
+    }
+  ],
   "properties": {
     "path": {
       "type": "string",
-      "description": "Path where the Redux slice will be generated.",
+      "description": "The file path to the Redux state slice without the file extension. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Where should the Redux slice be generated?",
+      "x-prompt": "What is the Redux stateslice file path?",
       "x-priority": "important"
     },
     "name": {
       "type": "string",
-      "description": "Redux slice name.",
-      "x-priority": "important"
+      "description": "The Redux state slice symbol name. Defaults to the last segment of the file path."
     },
     "appProject": {
       "type": "string",

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

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

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

@@ -1,5 +1,5 @@
 const {composePlugins, withNx, withReact} = require('@nx/rspack');
-const {withModuleFederationForSSR} = require('@nx/rspack/module-federation');
+const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
 
 const baseConfig = require("./module-federation.server.config");
 

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-ssr-ts/rspack.server.config.ts__tmpl__

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederationForSSR} from '@nx/rspack/module-federation';
+import {withModuleFederationForSSR} from '@nx/module-federation/rspack';
 
 import baseConfig from "./module-federation.server.config";
 

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/rspack-module-federation-ts/rspack.config.ts__tmpl__

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

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

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

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

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

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-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/react/module-federation';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from "./module-federation.server.config";
 

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/generators/remote/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

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

package/src/generators/remote/remote.js

@@ -17,7 +17,6 @@ const maybe_js_1 = require("../../utils/maybe-js");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.projectName),
@@ -47,7 +46,6 @@ function addModuleFederationFiles(host, options) {
     }
 }
 async function remoteGenerator(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react', 'remote');
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
@@ -82,6 +80,7 @@ async function remoteGenerator(host, schema) {
         ...options,
         name: options.projectName,
         skipFormat: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (schema.host) {

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,66 @@
+"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)) {
+        if (!graph.nodes[project]) {
+            continue;
+        }
+        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/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts

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

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateWithMfImport;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
+const NEW_IMPORT_PATH = `'@nx/module-federation/webpack'`;
+async function migrateWithMfImport(tree) {
+    const projects = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        projects.add(projectConfig.root);
+    });
+    for (const projectRoot of projects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectRoot, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes('@nx/react/module-federation')) {
+                return;
+            }
+            const ast = tsquery_1.tsquery.ast(contents);
+            const importNodes = (0, tsquery_1.tsquery)(ast, NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            const importPathNode = importNodes[0];
+            contents = `${contents.slice(0, importPathNode.getStart())}${NEW_IMPORT_PATH}${contents.slice(importPathNode.getEnd())}`;
+            tree.write(filePath, contents);
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

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

@@ -3,29 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = updateModuleFederationProject;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../utils/maybe-js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (options.bundler === 'rspack') {
         projectConfig.targets.build.executor = '@nx/rspack:rspack';
         projectConfig.targets.build.options = {
-            ...projectConfig.targets.build.options,
+            ...(projectConfig.targets.build.options ?? {}),
             main: (0, maybe_js_1.maybeJs)({ js: options.js, useJsx: true }, `${options.appProjectRoot}/src/main.ts`),
             rspackConfig: `${options.appProjectRoot}/rspack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
             target: 'web',
         };
+        projectConfig.targets.build.configurations ??= {};
         projectConfig.targets.build.configurations.production = {
-            ...projectConfig.targets.build.configurations.production,
+            ...(projectConfig.targets.build.configurations?.production ?? {}),
             rspackConfig: `${options.appProjectRoot}/rspack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
         };
     }
     else {
         projectConfig.targets.build.options = {
-            ...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'}`,
         };
+        projectConfig.targets.build.configurations ??= {};
         projectConfig.targets.build.configurations.production = {
-            ...projectConfig.targets.build.configurations.production,
+            ...(projectConfig.targets.build.configurations?.production ?? {}),
             webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
         };
     }
@@ -76,5 +79,10 @@ function updateModuleFederationProject(host, options) {
             },
         },
     };
+    // Typechecks must be performed first before build and serve to generate remote d.ts files.
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        projectConfig.targets.build.dependsOn = ['^build', 'typecheck'];
+        projectConfig.targets.serve.dependsOn = ['typecheck'];
+    }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
 }

package/src/utils/build-static.remotes.d.ts

@@ -1,4 +1,4 @@
-import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
+import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 import { ExecutorContext } from '@nx/devkit';
 import { ModuleFederationDevServerOptions } from '../executors/module-federation-dev-server/schema';
 export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: ModuleFederationDevServerOptions): Promise<Record<string, string>>;