@nx/module-federation 0.0.0-pr-11-e92ae29 → 0.0.0-pr-29464-ce29f31

package/migrations.json

@@ -20,6 +20,25 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.5.0": {
+      "version": "20.5.0-beta.5",
+      "@module-federation/enhanced": {
+        "version": "^0.9.0",
+        "alwaysAddToPackageJson": false
+      },
+      "@module-federation/runtime": {
+        "version": "^0.9.0",
+        "alwaysAddToPackageJson": false
+      },
+      "@module-federation/sdk": {
+        "version": "^0.9.0",
+        "alwaysAddToPackageJson": false
+      },
+      "@module-federation/node": {
+        "version": "^2.6.26",
+        "alwaysAddToPackageJson": false
+      }
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/module-federation",
   "description": "The Nx Plugin for Module Federation contains executors and utilities that support building applications using Module Federation.",
-  "version": "0.0.0-pr-11-e92ae29",
+  "version": "0.0.0-pr-29464-ce29f31",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -25,14 +25,14 @@
   "executors": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-11-e92ae29",
-    "@nx/js": "0.0.0-pr-11-e92ae29",
-    "@nx/web": "0.0.0-pr-11-e92ae29",
+    "@nx/devkit": "0.0.0-pr-29464-ce29f31",
+    "@nx/js": "0.0.0-pr-29464-ce29f31",
+    "@nx/web": "0.0.0-pr-29464-ce29f31",
     "picocolors": "^1.1.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "^0.8.8",
-    "@module-federation/node": "^2.6.21",
-    "@module-federation/sdk": "^0.8.8",
+    "@module-federation/enhanced": "^0.9.0",
+    "@module-federation/node": "^2.6.26",
+    "@module-federation/sdk": "^0.9.0",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/plugins/models/index.d.ts

@@ -6,4 +6,9 @@ export interface NxModuleFederationDevServerConfig {
     sslCert?: string;
     sslKey?: string;
     parallel?: number;
+    devRemoteFindOptions?: DevRemoteFindOptions;
+}
+export interface DevRemoteFindOptions {
+    retries?: number;
+    retryDelay?: number;
 }

package/src/plugins/nx-module-federation-plugin/rspack/nx-module-federation-plugin.js

@@ -8,7 +8,6 @@ class NxModuleFederationPlugin {
         this._options = _options;
         this.configOverride = configOverride;
     }
-    // Do nothing
     apply(compiler) {
         if (global.NX_GRAPH_CREATION) {
             return;

package/src/plugins/utils/get-static-remotes.d.ts

@@ -1,2 +1,3 @@
 import { StaticRemoteConfig } from '../../utils';
-export declare function getStaticRemotes(remotesConfig: Record<string, StaticRemoteConfig>): Promise<Record<string, StaticRemoteConfig>>;
+import { DevRemoteFindOptions } from '../models';
+export declare function getStaticRemotes(remotesConfig: Record<string, StaticRemoteConfig>, devRemoteFindOptions?: DevRemoteFindOptions): Promise<Record<string, StaticRemoteConfig>>;

package/src/plugins/utils/get-static-remotes.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStaticRemotes = getStaticRemotes;
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-async function getStaticRemotes(remotesConfig) {
+async function getStaticRemotes(remotesConfig, devRemoteFindOptions) {
     const remotes = Object.keys(remotesConfig);
     const findStaticRemotesPromises = [];
     for (const remote of remotes) {
         findStaticRemotesPromises.push(new Promise((resolve, reject) => {
             (0, wait_for_port_open_1.waitForPortOpen)(remotesConfig[remote].port, {
-                retries: 5,
-                retryDelay: 1000,
+                retries: devRemoteFindOptions?.retries ?? 3,
+                retryDelay: devRemoteFindOptions?.retryDelay ?? 1000,
             }).then((res) => {
                 resolve(undefined);
             }, (rej) => {

package/src/plugins/utils/parse-remotes-config.js

@@ -2,14 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRemotesConfig = parseRemotesConfig;
 const path_1 = require("path");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+const devkit_1 = require("@nx/devkit");
 function parseRemotesConfig(remotes, workspaceRoot, projectGraph) {
     if (!remotes?.length) {
         return { remotes: [], config: undefined };
     }
     const config = {};
     for (const app of remotes) {
-        const outputPath = projectGraph.nodes[app].data.targets?.['build']?.options.outputPath ??
-            `${workspaceRoot ? `${workspaceRoot}/` : ''}${projectGraph.nodes[app].data.root}/dist`; // this needs replaced with better logic for finding the output path
+        const projectRoot = projectGraph.nodes[app].data.root;
+        let outputPath = (0, devkit_internals_1.interpolate)(projectGraph.nodes[app].data.targets?.['build']?.options?.outputPath ??
+            projectGraph.nodes[app].data.targets?.['build']?.outputs?.[0] ??
+            `${workspaceRoot ? `${workspaceRoot}/` : ''}${projectGraph.nodes[app].data.root}/dist`, {
+            projectName: projectGraph.nodes[app].data.name,
+            projectRoot,
+            workspaceRoot,
+        });
+        if (outputPath.startsWith(projectRoot)) {
+            outputPath = (0, devkit_1.joinPathFragments)(workspaceRoot, outputPath);
+        }
         const basePath = (0, path_1.dirname)(outputPath);
         const urlSegment = app;
         const port = projectGraph.nodes[app].data.targets?.['serve']?.options.port;

package/src/utils/parse-static-remotes-config.js

@@ -9,9 +9,11 @@ function parseStaticRemotesConfig(staticRemotes, context) {
     }
     const config = {};
     for (const app of staticRemotes) {
-        const outputPath = context.projectGraph.nodes[app].data.targets['build'].options.outputPath;
-        const basePath = (0, path_1.dirname)(outputPath);
-        const urlSegment = (0, path_1.basename)(outputPath);
+        const outputPath = context.projectGraph.nodes[app].data.targets['build'].options.outputPath; // dist || dist/checkout
+        const basePath = ['', '/', '.'].some((p) => (0, path_1.dirname)(outputPath) === p)
+            ? outputPath
+            : (0, path_1.dirname)(outputPath); // dist || dist/checkout -> dist
+        const urlSegment = app;
         const port = context.projectGraph.nodes[app].data.targets['serve'].options.port;
         config[app] = { basePath, outputPath, urlSegment, port };
     }
@@ -23,10 +25,13 @@ function parseStaticSsrRemotesConfig(staticRemotes, context) {
     }
     const config = {};
     for (const app of staticRemotes) {
-        const outputPath = (0, path_1.dirname)(context.projectGraph.nodes[app].data.targets['build'].options.outputPath // dist/checkout/browser -> checkout
-        );
-        const basePath = (0, path_1.dirname)(outputPath); // dist/checkout -> dist
-        const urlSegment = (0, path_1.basename)(outputPath); // dist/checkout -> checkout
+        let outputPath = context.projectGraph.nodes[app].data.targets['build']
+            .options.outputPath;
+        outputPath = (0, path_1.dirname)(outputPath); // dist/browser => dist || dist/checkout/browser -> checkout
+        const basePath = ['', '/', '.'].some((p) => (0, path_1.dirname)(outputPath) === p)
+            ? outputPath
+            : (0, path_1.dirname)(outputPath); // dist || dist/checkout -> dist
+        const urlSegment = app;
         const port = context.projectGraph.nodes[app].data.targets['serve'].options.port;
         config[app] = { basePath, outputPath, urlSegment, port };
     }