@nx/react 19.5.1 → 19.6.0-canary.20240719-83b88a1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "19.5.1",
+  "version": "19.6.0-canary.20240719-83b88a1",
   "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,11 +39,11 @@
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "19.5.1",
-    "@nx/js": "19.5.1",
-    "@nx/eslint": "19.5.1",
-    "@nx/web": "19.5.1",
-    "@nrwl/react": "19.5.1"
+    "@nx/devkit": "19.6.0-canary.20240719-83b88a1",
+    "@nx/js": "19.6.0-canary.20240719-83b88a1",
+    "@nx/eslint": "19.6.0-canary.20240719-83b88a1",
+    "@nx/web": "19.6.0-canary.20240719-83b88a1",
+    "@nrwl/react": "19.6.0-canary.20240719-83b88a1"
   },
   "publishConfig": {
     "access": "public"

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

@@ -12,16 +12,6 @@ type ModuleFederationDevServerOptions = WebDevServerOptions & {
     staticRemotesPort?: number;
     pathToManifestFile?: string;
 };
-type StaticRemoteConfig = {
-    basePath: string;
-    outputPath: string;
-    urlSegment: string;
-};
-type StaticRemotesConfig = {
-    remotes: string[];
-    config: Record<string, StaticRemoteConfig> | undefined;
-};
-export declare function parseStaticRemotesConfig(staticRemotes: string[] | undefined, context: ExecutorContext): StaticRemotesConfig;
 export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncIterableIterator<{
     success: boolean;
     baseUrl?: string;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseStaticRemotesConfig = parseStaticRemotesConfig;
 exports.default = moduleFederationDevServer;
 const devkit_1 = require("@nx/devkit");
 const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
@@ -14,6 +13,8 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 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");
 function getBuildOptions(buildTarget, context) {
     const target = (0, devkit_1.parseTargetString)(buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
@@ -22,6 +23,10 @@ function getBuildOptions(buildTarget, context) {
     };
 }
 function startStaticRemotesFileServer(staticRemotesConfig, context, options) {
+    if (!staticRemotesConfig.remotes ||
+        staticRemotesConfig.remotes.length === 0) {
+        return;
+    }
     let shouldMoveToCommonLocation = false;
     let commonOutputDirectory;
     for (const app of staticRemotesConfig.remotes) {
@@ -137,23 +142,9 @@ async function buildStaticRemotes(staticRemotesConfig, nxBin, context, options)
         process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
         process.on('exit', () => staticProcess.kill('SIGTERM'));
     });
-}
-function parseStaticRemotesConfig(staticRemotes, context) {
-    if (!staticRemotes?.length) {
-        return { remotes: [], config: undefined };
-    }
-    const config = {};
-    for (const app of staticRemotes) {
-        const outputPath = context.projectGraph.nodes[app].data.targets['build'].options.outputPath;
-        const basePath = (0, node_path_1.dirname)(outputPath);
-        const urlSegment = (0, node_path_1.basename)(outputPath);
-        config[app] = { basePath, outputPath, urlSegment };
-    }
-    return { remotes: staticRemotes, config };
+    return mappedLocationOfRemotes;
 }
 async function* moduleFederationDevServer(options, context) {
-    const initialStaticRemotesPorts = options.staticRemotesPort;
-    options.staticRemotesPort ??= options.port + 1;
     // Force Node to resolve to look for the nx binary that is inside node_modules
     const nxBin = require.resolve('nx/bin/nx');
     const currIter = options.static
@@ -188,29 +179,15 @@ async function* moduleFederationDevServer(options, context) {
         projectGraph: context.projectGraph,
         root: context.root,
     }, pathToManifestFile);
+    options.staticRemotesPort ??= remotes.staticRemotePort;
     // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
     process.env.NX_MF_DEV_REMOTES = JSON.stringify(remotes.devRemotes.map((r) => (typeof r === 'string' ? r : r.remoteName)));
-    if (remotes.devRemotes.length > 0 && !initialStaticRemotesPorts) {
-        options.staticRemotesPort = options.devRemotes.reduce((portToUse, r) => {
-            const remoteName = typeof r === 'string' ? r : r.remoteName;
-            const remotePort = context.projectGraph.nodes[remoteName].data.targets['serve'].options
-                .port;
-            if (remotePort >= portToUse) {
-                return remotePort + 1;
-            }
-            else {
-                return portToUse;
-            }
-        }, options.staticRemotesPort);
-    }
-    const staticRemotesConfig = parseStaticRemotesConfig(remotes.staticRemotes, context);
-    await buildStaticRemotes(staticRemotesConfig, nxBin, context, options);
+    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const mappedLocationsOfStaticRemotes = await buildStaticRemotes(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await startRemotes(remotes.devRemotes, context, options, 'serve');
-    const dynamicRemotesIters = await startRemotes(remotes.dynamicRemotes, context, options, 'serve-static');
-    const staticRemotesIter = remotes.staticRemotes.length > 0
-        ? startStaticRemotesFileServer(staticRemotesConfig, context, options)
-        : undefined;
-    return yield* (0, async_iterable_1.combineAsyncIterables)(currIter, ...devRemoteIters, ...dynamicRemotesIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const staticRemotesIter = startStaticRemotesFileServer(staticRemotesConfig, context, options);
+    (0, start_remote_proxies_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes);
+    return yield* (0, async_iterable_1.combineAsyncIterables)(currIter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

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

@@ -45,7 +45,11 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
         processWebpackConfig(options, host, 'webpack.config.prod.js');
         processWebpackConfig(options, host, 'webpack.config.prod.ts');
         if (!host.exists(pathToMFManifest)) {
-            host.write(pathToMFManifest, '{}');
+            host.write(pathToMFManifest, `{
+        ${defaultRemoteManifest
+                .map(({ name, port }) => `"${name}": "http://localhost:${port}"`)
+                .join(',\n')}
+          }`);
         }
     }
 }

package/src/generators/remote/lib/add-remote-to-dynamic-host.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemoteToDynamicHost = addRemoteToDynamicHost;
 function addRemoteToDynamicHost(tree, remoteName, remotePort, pathToMfManifest) {
-    const current = tree.read(pathToMfManifest, 'utf8');
-    tree.write(pathToMfManifest, JSON.stringify({
-        ...JSON.parse(current),
-        [remoteName]: `http://localhost:${remotePort}`,
-    }));
+    if (tree.exists(pathToMfManifest)) {
+        const current = tree.read(pathToMfManifest, 'utf8');
+        tree.write(pathToMfManifest, JSON.stringify({
+            ...JSON.parse(current),
+            [remoteName]: `http://localhost:${remotePort}`,
+        }));
+    }
 }