@module-federation/modern-js 0.11.3 → 0.11.4

package/dist/esm/cli/ssrPlugin.js

@@ -1,4 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fs } from "@modern-js/utils";
@@ -7,7 +8,6 @@ import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-
 import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
 import { updateStatsAndManifest } from "./manifest";
 import { isDev } from "./constant";
-import { MODERN_JS_SERVER_DIR } from "../constant";
 import logger from "./logger";
 import { isWebTarget, skipByTarget } from "./utils";
 function setEnv() {
@@ -15,6 +15,55 @@ function setEnv() {
   process.env["MF_SSR_PRJ"] = "true";
 }
 var CHAIN_MF_PLUGIN_ID = "plugin-module-federation-server";
+var mfSSRRsbuildPlugin = function(pluginOptions) {
+  return {
+    name: "@modern-js/plugin-mf-post-config",
+    pre: [
+      "@modern-js/builder-plugin-ssr"
+    ],
+    setup: function setup(api) {
+      if (pluginOptions.csrConfig.getPublicPath) {
+        return;
+      }
+      var csrOutputPath = "";
+      var ssrOutputPath = "";
+      var ssrEnv = "";
+      api.modifyEnvironmentConfig(function(config, param) {
+        var name = param.name;
+        var target = config.output.target;
+        if (skipByTarget(target)) {
+          return config;
+        }
+        if (isWebTarget(target)) {
+          csrOutputPath = config.output.distPath.root;
+        } else {
+          ssrOutputPath = config.output.distPath.root;
+          ssrEnv = name;
+        }
+        return config;
+      });
+      var modifySSRPublicPath = function(config, utils) {
+        if (ssrEnv !== utils.environment.name) {
+          return config;
+        }
+        var userSSRConfig = pluginOptions.userConfig.ssr ? _type_of(pluginOptions.userConfig.ssr) === "object" ? pluginOptions.userConfig.ssr : {} : {};
+        if (userSSRConfig.distOutputDir) {
+          return;
+        }
+        config.output.publicPath = "".concat(config.output.publicPath).concat(path.relative(csrOutputPath, ssrOutputPath), "/");
+        return config;
+      };
+      api.modifyWebpackConfig(function(config, utils) {
+        modifySSRPublicPath(config, utils);
+        return config;
+      });
+      api.modifyRspackConfig(function(config, utils) {
+        modifySSRPublicPath(config, utils);
+        return config;
+      });
+    }
+  };
+};
 var moduleFederationSSRPlugin = function(pluginOptions) {
   return {
     name: "@modern-js/plugin-module-federation-ssr",
@@ -24,12 +73,10 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
     ],
     setup: function() {
       var _ref = _async_to_generator(function(api) {
-        var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, _pluginOptions_userConfig_ssr, enableSSR, csrOutputPath, ssrOutputPath;
+        var _pluginOptions_userConfig, _modernjsConfig_server, modernjsConfig, _pluginOptions_userConfig_ssr, enableSSR;
         return _ts_generator(this, function(_state) {
           modernjsConfig = api.getConfig();
           enableSSR = (_pluginOptions_userConfig_ssr = (_pluginOptions_userConfig = pluginOptions.userConfig) === null || _pluginOptions_userConfig === void 0 ? void 0 : _pluginOptions_userConfig.ssr) !== null && _pluginOptions_userConfig_ssr !== void 0 ? _pluginOptions_userConfig_ssr : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
-          csrOutputPath = "";
-          ssrOutputPath = "";
           if (!enableSSR) {
             return [
               2
@@ -77,20 +124,23 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
               if (isDev) {
                 chain.plugin("UniverseEntryChunkTrackerPlugin").use(UniverseEntryChunkTrackerPlugin);
               }
+              var userSSRConfig = pluginOptions.userConfig.ssr ? _type_of(pluginOptions.userConfig.ssr) === "object" ? pluginOptions.userConfig.ssr : {} : {};
+              var publicPath = chain.output.get("publicPath");
+              if (userSSRConfig.distOutputDir && publicPath) {
+                chain.output.publicPath("".concat(publicPath).concat(userSSRConfig.distOutputDir, "/"));
+              }
             }
             if (isDev && isWeb) {
               chain.externals({
                 "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
               });
             }
-            if (!isWeb) {
-              ssrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), "dist/".concat(MODERN_JS_SERVER_DIR));
-            } else {
-              csrOutputPath = chain.output.get("path") || path.resolve(process.cwd(), "dist");
-            }
           });
           api.config(function() {
             return {
+              builderPlugins: [
+                mfSSRRsbuildPlugin(pluginOptions)
+              ],
               tools: {
                 devServer: {
                   before: [
@@ -123,11 +173,11 @@ var moduleFederationSSRPlugin = function(pluginOptions) {
           });
           api.onAfterBuild(function() {
             var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
-            updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
+            updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
           });
           api.onDevCompileDone(function() {
             var nodePlugin = pluginOptions.nodePlugin, browserPlugin = pluginOptions.browserPlugin, distOutputDir = pluginOptions.distOutputDir;
-            updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir, path.relative(csrOutputPath, ssrOutputPath));
+            updateStatsAndManifest(nodePlugin, browserPlugin, distOutputDir);
           });
           return [
             2

package/dist/esm/cli/utils.js

@@ -1,260 +1,4 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _type_of } from "@swc/helpers/_/_type_of";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import os from "os";
-import path from "path";
-import { encodeName } from "@module-federation/sdk";
-import { bundle } from "@modern-js/node-bundle-require";
-import { LOCALHOST, PLUGIN_IDENTIFIER } from "../constant";
-import logger from "./logger";
-import { autoDeleteSplitChunkCacheGroups } from "@module-federation/rsbuild-plugin/utils";
-var defaultPath = path.resolve(process.cwd(), "module-federation.config.ts");
-var isDev = process.env.NODE_ENV === "development";
-var getMFConfig = function() {
-  var _ref = _async_to_generator(function(userConfig) {
-    var config, configPath, mfConfigPath, preBundlePath, mfConfig;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          config = userConfig.config, configPath = userConfig.configPath;
-          if (config) {
-            return [
-              2,
-              config
-            ];
-          }
-          mfConfigPath = configPath ? configPath : defaultPath;
-          return [
-            4,
-            bundle(mfConfigPath)
-          ];
-        case 1:
-          preBundlePath = _state.sent();
-          return [
-            4,
-            import(preBundlePath)
-          ];
-        case 2:
-          mfConfig = _state.sent().default;
-          return [
-            2,
-            mfConfig
-          ];
-      }
-    });
-  });
-  return function getMFConfig2(userConfig) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var injectRuntimePlugins = function(runtimePlugin, runtimePlugins) {
-  if (!runtimePlugins.includes(runtimePlugin)) {
-    runtimePlugins.push(runtimePlugin);
-  }
-};
-var replaceRemoteUrl = function(mfConfig, remoteIpStrategy) {
-  if (remoteIpStrategy && remoteIpStrategy === "inherit") {
-    return;
-  }
-  if (!mfConfig.remotes) {
-    return;
-  }
-  var ipv4 = getIPV4();
-  var handleRemoteObject = function(remoteObject) {
-    Object.keys(remoteObject).forEach(function(remoteKey) {
-      var remote = remoteObject[remoteKey];
-      if (Array.isArray(remote)) {
-        return;
-      }
-      if (typeof remote === "string" && remote.includes(LOCALHOST)) {
-        remoteObject[remoteKey] = remote.replace(LOCALHOST, ipv4);
-      }
-      if ((typeof remote === "undefined" ? "undefined" : _type_of(remote)) === "object" && !Array.isArray(remote.external) && remote.external.includes(LOCALHOST)) {
-        remote.external = remote.external.replace(LOCALHOST, ipv4);
-      }
-    });
-  };
-  if (Array.isArray(mfConfig.remotes)) {
-    mfConfig.remotes.forEach(function(remoteObject) {
-      if (typeof remoteObject === "string") {
-        return;
-      }
-      handleRemoteObject(remoteObject);
-    });
-  } else if (typeof mfConfig.remotes !== "string") {
-    handleRemoteObject(mfConfig.remotes);
-  }
-};
-var patchDTSConfig = function(mfConfig, isServer) {
-  if (isServer) {
-    return;
-  }
-  var ModernJSRuntime = "@modern-js/runtime/mf";
-  if (mfConfig.dts !== false) {
-    var _mfConfig_dts, _mfConfig_dts1;
-    if (typeof mfConfig.dts === "boolean" || mfConfig.dts === void 0) {
-      mfConfig.dts = {
-        consumeTypes: {
-          runtimePkgs: [
-            ModernJSRuntime
-          ]
-        }
-      };
-    } else if (((_mfConfig_dts = mfConfig.dts) === null || _mfConfig_dts === void 0 ? void 0 : _mfConfig_dts.consumeTypes) || ((_mfConfig_dts1 = mfConfig.dts) === null || _mfConfig_dts1 === void 0 ? void 0 : _mfConfig_dts1.consumeTypes) === void 0) {
-      var _mfConfig_dts2;
-      if (typeof mfConfig.dts.consumeTypes === "boolean" || ((_mfConfig_dts2 = mfConfig.dts) === null || _mfConfig_dts2 === void 0 ? void 0 : _mfConfig_dts2.consumeTypes) === void 0) {
-        mfConfig.dts.consumeTypes = {
-          runtimePkgs: [
-            ModernJSRuntime
-          ]
-        };
-      } else {
-        mfConfig.dts.consumeTypes.runtimePkgs = mfConfig.dts.consumeTypes.runtimePkgs || [];
-        if (!mfConfig.dts.consumeTypes.runtimePkgs.includes(ModernJSRuntime)) {
-          mfConfig.dts.consumeTypes.runtimePkgs.push(ModernJSRuntime);
-        }
-      }
-    }
-  }
-};
-var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy) {
-  replaceRemoteUrl(mfConfig, remoteIpStrategy);
-  if (mfConfig.remoteType === void 0) {
-    mfConfig.remoteType = "script";
-  }
-  if (!mfConfig.name) {
-    throw new Error("".concat(PLUGIN_IDENTIFIER, " mfConfig.name can not be empty!"));
-  }
-  var runtimePlugins = _to_consumable_array(mfConfig.runtimePlugins || []);
-  patchDTSConfig(mfConfig, isServer);
-  injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
-  if (isDev) {
-    injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
-  }
-  if (isServer) {
-    injectRuntimePlugins(require.resolve("@module-federation/node/runtimePlugin"), runtimePlugins);
-    if (isDev) {
-      injectRuntimePlugins(require.resolve("@module-federation/node/record-dynamic-remote-entry-hash-plugin"), runtimePlugins);
-    }
-    injectRuntimePlugins(require.resolve("@module-federation/modern-js/inject-node-fetch"), runtimePlugins);
-    if (!mfConfig.library) {
-      mfConfig.library = {
-        type: "commonjs-module",
-        name: mfConfig.name
-      };
-    } else {
-      if (!mfConfig.library.type) {
-        mfConfig.library.type = "commonjs-module";
-      }
-      if (!mfConfig.library.name) {
-        mfConfig.library.name = mfConfig.name;
-      }
-    }
-  }
-  mfConfig.runtimePlugins = runtimePlugins;
-  if (!isServer) {
-    var _mfConfig_library;
-    if (((_mfConfig_library = mfConfig.library) === null || _mfConfig_library === void 0 ? void 0 : _mfConfig_library.type) === "commonjs-module") {
-      mfConfig.library.type = "global";
-    }
-    return mfConfig;
-  }
-  mfConfig.dts = false;
-  mfConfig.dev = false;
-  return mfConfig;
-};
-function patchIgnoreWarning(chain) {
-  var ignoreWarnings = chain.get("ignoreWarnings") || [];
-  var ignoredMsgs = [
-    "external script",
-    "process.env.WS_NO_BUFFER_UTIL",
-    "Can't resolve 'utf-8-validate"
-  ];
-  ignoreWarnings.push(function(warning) {
-    if (ignoredMsgs.some(function(msg) {
-      return warning.message.includes(msg);
-    })) {
-      return true;
-    }
-    return false;
-  });
-  chain.ignoreWarnings(ignoreWarnings);
-}
-function addMyTypes2Ignored(chain, mfConfig) {
-  var watchOptions = chain.get("watchOptions");
-  if (!watchOptions || !watchOptions.ignored) {
-    chain.watchOptions({
-      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
-    });
-    return;
-  }
-  var ignored = watchOptions.ignored;
-  var DEFAULT_IGNORED_GLOB = "**/@mf-types/**";
-  if (Array.isArray(ignored)) {
-    if (mfConfig.dts !== false && _type_of(mfConfig.dts) === "object" && _type_of(mfConfig.dts.consumeTypes) === "object" && mfConfig.dts.consumeTypes.remoteTypesFolder) {
-      chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
-        ignored: ignored.concat("**/".concat(mfConfig.dts.consumeTypes.remoteTypesFolder, "/**"))
-      }));
-    } else {
-      chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
-        ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
-      }));
-    }
-    return;
-  }
-  if (typeof ignored !== "string") {
-    chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
-      ignored: /[\\/](?:\.git|node_modules|@mf-types)[\\/]/
-    }));
-    return;
-  }
-  chain.watchOptions(_object_spread_props(_object_spread({}, watchOptions), {
-    ignored: ignored.concat(DEFAULT_IGNORED_GLOB)
-  }));
-}
-function patchBundlerConfig(options) {
-  var _modernjsConfig_deploy;
-  var chain = options.chain, modernjsConfig = options.modernjsConfig, isServer = options.isServer, mfConfig = options.mfConfig, enableSSR = options.enableSSR;
-  chain.optimization.delete("runtimeChunk");
-  patchIgnoreWarning(chain);
-  if (!chain.output.get("chunkLoadingGlobal")) {
-    chain.output.chunkLoadingGlobal("chunk_".concat(mfConfig.name));
-  }
-  if (!chain.output.get("uniqueName")) {
-    chain.output.uniqueName(mfConfig.name);
-  }
-  var splitChunkConfig = chain.optimization.splitChunks.entries();
-  if (!isServer) {
-    autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
-  }
-  if (!isServer && enableSSR && splitChunkConfig && (typeof splitChunkConfig === "undefined" ? "undefined" : _type_of(splitChunkConfig)) === "object" && splitChunkConfig.cacheGroups) {
-    splitChunkConfig.chunks = "async";
-    logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
-  }
-  if (isDev && chain.output.get("publicPath") === "auto") {
-    var _modernjsConfig_dev, _modernjsConfig_server;
-    var port = ((_modernjsConfig_dev = modernjsConfig.dev) === null || _modernjsConfig_dev === void 0 ? void 0 : _modernjsConfig_dev.port) || ((_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.port) || 8080;
-    var publicPath = "http://localhost:".concat(port, "/");
-    chain.output.publicPath(publicPath);
-  }
-  if (isServer && enableSSR) {
-    var uniqueName = mfConfig.name || chain.output.get("uniqueName");
-    var chunkFileName = chain.output.get("chunkFilename");
-    if (typeof chunkFileName === "string" && uniqueName && !chunkFileName.includes(uniqueName)) {
-      var suffix = "".concat(encodeName(uniqueName), "-[chunkhash].js");
-      chain.output.chunkFilename(chunkFileName.replace(".js", suffix));
-    }
-  }
-  if (isDev && enableSSR && !isServer) {
-    chain.resolve.fallback.set("crypto", false).set("stream", false).set("vm", false);
-  }
-  if (((_modernjsConfig_deploy = modernjsConfig.deploy) === null || _modernjsConfig_deploy === void 0 ? void 0 : _modernjsConfig_deploy.microFrontend) && Object.keys(mfConfig.exposes || {}).length) {
-    chain.optimization.usedExports(false);
-  }
-}
 var localIpv4 = "127.0.0.1";
 var getIpv4Interfaces = function() {
   try {
@@ -299,11 +43,7 @@ var skipByTarget = function(target) {
   return false;
 };
 export {
-  addMyTypes2Ignored,
   getIPV4,
-  getMFConfig,
   isWebTarget,
-  patchBundlerConfig,
-  patchMFConfig,
   skipByTarget
 };

package/dist/esm/constant.js

@@ -1,8 +1,6 @@
-var MODERN_JS_SERVER_DIR = "bundles";
 var LOCALHOST = "localhost";
 var PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
 export {
   LOCALHOST,
-  MODERN_JS_SERVER_DIR,
   PLUGIN_IDENTIFIER
 };