@module-federation/modern-js 0.0.0-next-20240620090145 → 0.0.0-next-20240620115801

package/dist/cjs/cli/index.js

@@ -99,7 +99,7 @@ const moduleFederationPlugin = (userConfig = {}) => ({
               var _modernjsConfig_source;
               modifyBundlerConfig(config, isServer);
               const enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
-              if (mfConfig.async || !enableAsyncEntry && mfConfig.async !== false) {
+              if (!enableAsyncEntry && mfConfig.async !== false) {
                 var _config_plugins;
                 const asyncBoundaryPluginOptions = typeof mfConfig.async === "object" ? mfConfig.async : {
                   eager: (module2) => module2 && /\.federation/.test((module2 === null || module2 === void 0 ? void 0 : module2.request) || ""),

package/dist/cjs/cli/utils.js

@@ -102,9 +102,6 @@ const patchMFConfig = (mfConfig, isServer) => {
     }
     injectRuntimePlugins(import_path.default.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js"), runtimePlugins);
   }
-  if (typeof mfConfig.async === "undefined") {
-    mfConfig.async = true;
-  }
   if (!isServer) {
     return {
       ...mfConfig,

package/dist/cjs/cli/utils.spec.js

@@ -0,0 +1,148 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_vitest = require("vitest");
+var import_path = __toESM(require("path"));
+var import_utils = require("./utils");
+const mfConfig = {
+  name: "host",
+  filename: "remoteEntry.js",
+  remotes: {
+    remote: "http://localhost:3000/remoteEntry.js"
+  },
+  shared: {
+    react: {
+      singleton: true,
+      eager: true
+    },
+    "react-dom": {
+      singleton: true,
+      eager: true
+    }
+  }
+};
+(0, import_vitest.describe)("getTargetEnvConfig", async () => {
+  (0, import_vitest.it)("getTargetEnvConfig: server", async () => {
+    const targetEnvConfig = (0, import_utils.getTargetEnvConfig)(mfConfig, true);
+    (0, import_vitest.expect)(targetEnvConfig).toStrictEqual({
+      dev: false,
+      dts: false,
+      filename: "remoteEntry.js",
+      library: {
+        name: "host",
+        type: "commonjs-module"
+      },
+      name: "host",
+      remotes: {
+        remote: "http://localhost:3000/remoteEntry.js"
+      },
+      runtimePlugins: [
+        import_path.default.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js"),
+        import_path.default.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js")
+      ],
+      shared: {
+        react: {
+          eager: true,
+          singleton: true
+        },
+        "react-dom": {
+          eager: true,
+          singleton: true
+        }
+      }
+    });
+  });
+  (0, import_vitest.it)("getTargetEnvConfig: client", async () => {
+    const targetEnvConfig = (0, import_utils.getTargetEnvConfig)(mfConfig, false);
+    (0, import_vitest.expect)(targetEnvConfig).toStrictEqual({
+      filename: "remoteEntry.js",
+      name: "host",
+      remotes: {
+        remote: "http://localhost:3000/remoteEntry.js"
+      },
+      runtimePlugins: [
+        import_path.default.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js")
+      ],
+      shared: {
+        react: {
+          eager: true,
+          singleton: true
+        },
+        "react-dom": {
+          eager: true,
+          singleton: true
+        }
+      }
+    });
+  });
+});
+(0, import_vitest.describe)("patchWebpackConfig", async () => {
+  (0, import_vitest.it)("patchWebpackConfig: server", async () => {
+    const bundlerConfig = {
+      output: {
+        publicPath: "auto"
+      }
+    };
+    (0, import_utils.patchWebpackConfig)({
+      bundlerConfig,
+      isServer: true,
+      modernjsConfig: {
+        server: {
+          ssr: {
+            mode: "stream"
+          }
+        }
+      },
+      mfConfig
+    });
+    (0, import_vitest.expect)(bundlerConfig).toStrictEqual({
+      output: {
+        publicPath: "http://localhost:8080/"
+      }
+    });
+  });
+  (0, import_vitest.it)("patchWebpackConfig: client", async () => {
+    const bundlerConfig = {
+      output: {
+        publicPath: "auto"
+      }
+    };
+    (0, import_utils.patchWebpackConfig)({
+      bundlerConfig,
+      isServer: false,
+      modernjsConfig: {
+        server: {
+          ssr: {
+            mode: "stream"
+          }
+        }
+      },
+      mfConfig
+    });
+    (0, import_vitest.expect)(bundlerConfig).toStrictEqual({
+      output: {
+        publicPath: "http://localhost:8080/"
+      }
+    });
+  });
+});

package/dist/cjs/runtime/MFReactComponent.js

@@ -36,7 +36,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = __toESM(require("react"));
 var import_runtime = require("@module-federation/enhanced/runtime");
 function getLoadedRemoteInfos(instance, id) {
-  const { name, expose } = instance.remoteHandler.idToRemoteMap[id];
+  const { name, expose } = instance.remoteHandler.idToRemoteMap[id] || {};
   if (!name) {
     return;
   }

package/dist/esm/cli/index.js

@@ -88,7 +88,7 @@ var moduleFederationPlugin = function() {
                                   var _modernjsConfig_source;
                                   modifyBundlerConfig(config, isServer);
                                   var enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
-                                  if (mfConfig.async || !enableAsyncEntry && mfConfig.async !== false) {
+                                  if (!enableAsyncEntry && mfConfig.async !== false) {
                                     var _config_plugins;
                                     var asyncBoundaryPluginOptions = typeof mfConfig.async === "object" ? mfConfig.async : {
                                       eager: function(module) {

package/dist/esm/cli/utils.js

@@ -121,9 +121,6 @@ var patchMFConfig = function(mfConfig, isServer) {
     }
     injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js"), runtimePlugins);
   }
-  if (typeof mfConfig.async === "undefined") {
-    mfConfig.async = true;
-  }
   if (!isServer) {
     return _object_spread_props(_object_spread({}, mfConfig), {
       runtimePlugins

package/dist/esm/cli/utils.spec.js

@@ -0,0 +1,161 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { it, expect, describe } from "vitest";
+import path from "path";
+import { getTargetEnvConfig, patchWebpackConfig } from "./utils";
+var mfConfig = {
+  name: "host",
+  filename: "remoteEntry.js",
+  remotes: {
+    remote: "http://localhost:3000/remoteEntry.js"
+  },
+  shared: {
+    react: {
+      singleton: true,
+      eager: true
+    },
+    "react-dom": {
+      singleton: true,
+      eager: true
+    }
+  }
+};
+describe("getTargetEnvConfig", /* @__PURE__ */ _async_to_generator(function() {
+  return _ts_generator(this, function(_state) {
+    it("getTargetEnvConfig: server", /* @__PURE__ */ _async_to_generator(function() {
+      var targetEnvConfig;
+      return _ts_generator(this, function(_state2) {
+        targetEnvConfig = getTargetEnvConfig(mfConfig, true);
+        expect(targetEnvConfig).toStrictEqual({
+          dev: false,
+          dts: false,
+          filename: "remoteEntry.js",
+          library: {
+            name: "host",
+            type: "commonjs-module"
+          },
+          name: "host",
+          remotes: {
+            remote: "http://localhost:3000/remoteEntry.js"
+          },
+          runtimePlugins: [
+            path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js"),
+            path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js")
+          ],
+          shared: {
+            react: {
+              eager: true,
+              singleton: true
+            },
+            "react-dom": {
+              eager: true,
+              singleton: true
+            }
+          }
+        });
+        return [
+          2
+        ];
+      });
+    }));
+    it("getTargetEnvConfig: client", /* @__PURE__ */ _async_to_generator(function() {
+      var targetEnvConfig;
+      return _ts_generator(this, function(_state2) {
+        targetEnvConfig = getTargetEnvConfig(mfConfig, false);
+        expect(targetEnvConfig).toStrictEqual({
+          filename: "remoteEntry.js",
+          name: "host",
+          remotes: {
+            remote: "http://localhost:3000/remoteEntry.js"
+          },
+          runtimePlugins: [
+            path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js")
+          ],
+          shared: {
+            react: {
+              eager: true,
+              singleton: true
+            },
+            "react-dom": {
+              eager: true,
+              singleton: true
+            }
+          }
+        });
+        return [
+          2
+        ];
+      });
+    }));
+    return [
+      2
+    ];
+  });
+}));
+describe("patchWebpackConfig", /* @__PURE__ */ _async_to_generator(function() {
+  return _ts_generator(this, function(_state) {
+    it("patchWebpackConfig: server", /* @__PURE__ */ _async_to_generator(function() {
+      var bundlerConfig;
+      return _ts_generator(this, function(_state2) {
+        bundlerConfig = {
+          output: {
+            publicPath: "auto"
+          }
+        };
+        patchWebpackConfig({
+          bundlerConfig,
+          isServer: true,
+          modernjsConfig: {
+            server: {
+              ssr: {
+                mode: "stream"
+              }
+            }
+          },
+          mfConfig
+        });
+        expect(bundlerConfig).toStrictEqual({
+          output: {
+            publicPath: "http://localhost:8080/"
+          }
+        });
+        return [
+          2
+        ];
+      });
+    }));
+    it("patchWebpackConfig: client", /* @__PURE__ */ _async_to_generator(function() {
+      var bundlerConfig;
+      return _ts_generator(this, function(_state2) {
+        bundlerConfig = {
+          output: {
+            publicPath: "auto"
+          }
+        };
+        patchWebpackConfig({
+          bundlerConfig,
+          isServer: false,
+          modernjsConfig: {
+            server: {
+              ssr: {
+                mode: "stream"
+              }
+            }
+          },
+          mfConfig
+        });
+        expect(bundlerConfig).toStrictEqual({
+          output: {
+            publicPath: "http://localhost:8080/"
+          }
+        });
+        return [
+          2
+        ];
+      });
+    }));
+    return [
+      2
+    ];
+  });
+}));

package/dist/esm/runtime/MFReactComponent.js

@@ -5,7 +5,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React from "react";
 import { loadRemote, getInstance } from "@module-federation/enhanced/runtime";
 function getLoadedRemoteInfos(instance, id) {
-  var _instance_remoteHandler_idToRemoteMap_id = instance.remoteHandler.idToRemoteMap[id], name = _instance_remoteHandler_idToRemoteMap_id.name, expose = _instance_remoteHandler_idToRemoteMap_id.expose;
+  var _ref = instance.remoteHandler.idToRemoteMap[id] || {}, name = _ref.name, expose = _ref.expose;
   if (!name) {
     return;
   }

package/dist/esm-node/cli/index.js

@@ -63,7 +63,7 @@ const moduleFederationPlugin = (userConfig = {}) => ({
               var _modernjsConfig_source;
               modifyBundlerConfig(config, isServer);
               const enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
-              if (mfConfig.async || !enableAsyncEntry && mfConfig.async !== false) {
+              if (!enableAsyncEntry && mfConfig.async !== false) {
                 var _config_plugins;
                 const asyncBoundaryPluginOptions = typeof mfConfig.async === "object" ? mfConfig.async : {
                   eager: (module) => module && /\.federation/.test((module === null || module === void 0 ? void 0 : module.request) || ""),

package/dist/esm-node/cli/utils.js

@@ -65,9 +65,6 @@ const patchMFConfig = (mfConfig, isServer) => {
     }
     injectRuntimePlugins(path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js"), runtimePlugins);
   }
-  if (typeof mfConfig.async === "undefined") {
-    mfConfig.async = true;
-  }
   if (!isServer) {
     return {
       ...mfConfig,

package/dist/esm-node/cli/utils.spec.js

@@ -0,0 +1,125 @@
+import { it, expect, describe } from "vitest";
+import path from "path";
+import { getTargetEnvConfig, patchWebpackConfig } from "./utils";
+const mfConfig = {
+  name: "host",
+  filename: "remoteEntry.js",
+  remotes: {
+    remote: "http://localhost:3000/remoteEntry.js"
+  },
+  shared: {
+    react: {
+      singleton: true,
+      eager: true
+    },
+    "react-dom": {
+      singleton: true,
+      eager: true
+    }
+  }
+};
+describe("getTargetEnvConfig", async () => {
+  it("getTargetEnvConfig: server", async () => {
+    const targetEnvConfig = getTargetEnvConfig(mfConfig, true);
+    expect(targetEnvConfig).toStrictEqual({
+      dev: false,
+      dts: false,
+      filename: "remoteEntry.js",
+      library: {
+        name: "host",
+        type: "commonjs-module"
+      },
+      name: "host",
+      remotes: {
+        remote: "http://localhost:3000/remoteEntry.js"
+      },
+      runtimePlugins: [
+        path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js"),
+        path.resolve(__dirname, "./mfRuntimePlugins/inject-node-fetch.js")
+      ],
+      shared: {
+        react: {
+          eager: true,
+          singleton: true
+        },
+        "react-dom": {
+          eager: true,
+          singleton: true
+        }
+      }
+    });
+  });
+  it("getTargetEnvConfig: client", async () => {
+    const targetEnvConfig = getTargetEnvConfig(mfConfig, false);
+    expect(targetEnvConfig).toStrictEqual({
+      filename: "remoteEntry.js",
+      name: "host",
+      remotes: {
+        remote: "http://localhost:3000/remoteEntry.js"
+      },
+      runtimePlugins: [
+        path.resolve(__dirname, "./mfRuntimePlugins/shared-strategy.js")
+      ],
+      shared: {
+        react: {
+          eager: true,
+          singleton: true
+        },
+        "react-dom": {
+          eager: true,
+          singleton: true
+        }
+      }
+    });
+  });
+});
+describe("patchWebpackConfig", async () => {
+  it("patchWebpackConfig: server", async () => {
+    const bundlerConfig = {
+      output: {
+        publicPath: "auto"
+      }
+    };
+    patchWebpackConfig({
+      bundlerConfig,
+      isServer: true,
+      modernjsConfig: {
+        server: {
+          ssr: {
+            mode: "stream"
+          }
+        }
+      },
+      mfConfig
+    });
+    expect(bundlerConfig).toStrictEqual({
+      output: {
+        publicPath: "http://localhost:8080/"
+      }
+    });
+  });
+  it("patchWebpackConfig: client", async () => {
+    const bundlerConfig = {
+      output: {
+        publicPath: "auto"
+      }
+    };
+    patchWebpackConfig({
+      bundlerConfig,
+      isServer: false,
+      modernjsConfig: {
+        server: {
+          ssr: {
+            mode: "stream"
+          }
+        }
+      },
+      mfConfig
+    });
+    expect(bundlerConfig).toStrictEqual({
+      output: {
+        publicPath: "http://localhost:8080/"
+      }
+    });
+  });
+});

package/dist/esm-node/runtime/MFReactComponent.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React from "react";
 import { loadRemote, getInstance } from "@module-federation/enhanced/runtime";
 function getLoadedRemoteInfos(instance, id) {
-  const { name, expose } = instance.remoteHandler.idToRemoteMap[id];
+  const { name, expose } = instance.remoteHandler.idToRemoteMap[id] || {};
   if (!name) {
     return;
   }

package/dist/types/cli/utils.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "0.0.0-next-20240620090145",
+  "version": "0.0.0-next-20240620115801",
   "files": [
     "dist/",
     "types.d.ts",
@@ -46,9 +46,9 @@
     "@modern-js/utils": "^2.49.2",
     "@modern-js/node-bundle-require": "^2.49.2",
     "node-fetch": "~3.3.0",
-    "@module-federation/sdk": "0.0.0-next-20240620090145",
-    "@module-federation/enhanced": "0.0.0-next-20240620090145",
-    "@module-federation/node": "0.0.0-next-20240620090145"
+    "@module-federation/sdk": "0.0.0-next-20240620115801",
+    "@module-federation/enhanced": "0.0.0-next-20240620115801",
+    "@module-federation/node": "0.0.0-next-20240620115801"
   },
   "devDependencies": {
     "@modern-js/app-tools": "^2.49.2",
@@ -56,7 +56,7 @@
     "@modern-js/runtime": "^2.49.2",
     "@modern-js/module-tools": "^2.35.0",
     "@modern-js/tsconfig": "^2.35.0",
-    "@module-federation/manifest": "0.0.0-next-20240620090145"
+    "@module-federation/manifest": "0.0.0-next-20240620115801"
   },
   "peerDependencies": {
     "react": ">=17",