@nx/react 20.3.0-canary.20241219-2eb5243 → 20.3.0-rc.0

package/migrations.json

@@ -41,6 +41,12 @@
       "version": "20.2.0-beta.2",
       "description": "Update the withModuleFederation import use @nx/module-federation/webpack.",
       "factory": "./src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package"
+    },
+    "ensure-nx-module-federation-package": {
+      "cli": "nx",
+      "version": "20.3.0-beta.2",
+      "description": "If workspace includes Module Federation projects, ensure the new @nx/module-federation package is installed.",
+      "factory": "./src/migrations/update-20-3-0/ensure-nx-module-federation-package"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.3.0-canary.20241219-2eb5243",
+  "version": "20.3.0-rc.0",
   "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": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.3.0-canary.20241219-2eb5243",
-    "@nx/js": "20.3.0-canary.20241219-2eb5243",
-    "@nx/eslint": "20.3.0-canary.20241219-2eb5243",
-    "@nx/web": "20.3.0-canary.20241219-2eb5243",
-    "@nx/module-federation": "20.3.0-canary.20241219-2eb5243",
+    "@nx/devkit": "20.3.0-rc.0",
+    "@nx/js": "20.3.0-rc.0",
+    "@nx/eslint": "20.3.0-rc.0",
+    "@nx/web": "20.3.0-rc.0",
+    "@nx/module-federation": "20.3.0-rc.0",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

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

@@ -13,7 +13,8 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 async function addE2e(tree, options) {
     const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
         (options.bundler === 'rspack' && (0, has_rspack_plugin_1.hasRspackPlugin)(tree)) ||
-        (options.bundler === 'rsbuild' && (0, has_rsbuild_plugin_1.hasRsbuildPlugin)(tree)) ||
+        (options.bundler === 'rsbuild' &&
+            (await (0, has_rsbuild_plugin_1.hasRsbuildPlugin)(tree, options.appProjectRoot))) ||
         (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
     let e2eWebServerInfo = {
         e2eWebServerAddress: `http://localhost:${options.devServerPort ?? 4200}`,

package/src/generators/host/host.js

@@ -107,6 +107,7 @@ async function hostGenerator(host, schema) {
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion }, {
         '@nx/web': versions_1.nxVersion,
+        '@nx/module-federation': versions_1.nxVersion,
     });
     tasks.push(installTask);
     if (!options.skipFormat) {

package/src/generators/remote/remote.js

@@ -126,6 +126,7 @@ async function remoteGenerator(host, schema) {
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
         '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
         '@nx/web': versions_1.nxVersion,
+        '@nx/module-federation': versions_1.nxVersion,
     });
     tasks.push(installTask);
     if (!options.skipFormat) {

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

@@ -4,6 +4,7 @@ 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 versions_1 = require("../../utils/versions");
 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) {
@@ -31,5 +32,10 @@ async function migrateWithMfImport(tree) {
             tree.write(filePath, contents);
         });
     }
+    if (projects.size !== 0) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/module-federation': versions_1.nxVersion,
+        });
+    }
     await (0, devkit_1.formatFiles)(tree);
 }

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts

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

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = ensureMfPackage;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const versions_1 = require("../../utils/versions");
+async function ensureMfPackage(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);
+    });
+    if (projects.size !== 0) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/module-federation': versions_1.nxVersion,
+        });
+    }
+}

package/src/utils/has-rsbuild-plugin.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '@nx/devkit';
-export declare function hasRsbuildPlugin(tree: Tree): boolean;
+export declare function hasRsbuildPlugin(tree: Tree, projectPath?: string): Promise<boolean>;

package/src/utils/has-rsbuild-plugin.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasRsbuildPlugin = hasRsbuildPlugin;
 const devkit_1 = require("@nx/devkit");
-function hasRsbuildPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    return !!nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/rsbuild/plugin'
-        : p.plugin === '@nx/rsbuild/plugin');
+const versions_1 = require("./versions");
+async function hasRsbuildPlugin(tree, projectPath) {
+    (0, devkit_1.ensurePackage)('@nx/rsbuild', versions_1.nxVersion);
+    const { hasRsbuildPlugin } = await Promise.resolve().then(() => require('@nx/rsbuild/config-utils'));
+    return hasRsbuildPlugin(tree, projectPath);
 }