@module-federation/modern-js 0.8.9 → 0.8.10

package/dist/cjs/cli/configPlugin.js

@@ -61,80 +61,78 @@ const moduleFederationConfigPlugin = (userConfig) => ({
   post: [
     "@modern-js/plugin-module-federation"
   ],
-  setup: async ({ useConfigContext, useAppContext }) => {
-    const modernjsConfig = useConfigContext();
+  setup: async (api) => {
+    const modernjsConfig = api.getConfig();
     const mfConfig = await (0, import_utils.getMFConfig)(userConfig.originPluginOptions);
     const csrConfig = userConfig.csrConfig || JSON.parse(JSON.stringify(mfConfig));
     const ssrConfig = userConfig.ssrConfig || JSON.parse(JSON.stringify(mfConfig));
     userConfig.ssrConfig = ssrConfig;
     userConfig.csrConfig = csrConfig;
-    return {
-      config: async () => {
-        var _userConfig_userConfig, _modernjsConfig_server, _modernjsConfig_source, _modernjsConfig_source1, _modernjsConfig_dev;
-        const bundlerType = useAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
-        const ipv4 = (0, import_utils.getIPV4)();
-        const enableSSR = ((_userConfig_userConfig = userConfig.userConfig) === null || _userConfig_userConfig === void 0 ? void 0 : _userConfig_userConfig.ssr) === false ? false : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
-        if (userConfig.remoteIpStrategy === void 0) {
-          if (!enableSSR) {
-            userConfig.remoteIpStrategy = "inherit";
-          } else {
-            userConfig.remoteIpStrategy = "ipv4";
-          }
+    api.config(() => {
+      var _userConfig_userConfig, _modernjsConfig_server, _modernjsConfig_source, _modernjsConfig_source1, _modernjsConfig_dev;
+      const bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
+      const ipv4 = (0, import_utils.getIPV4)();
+      const enableSSR = ((_userConfig_userConfig = userConfig.userConfig) === null || _userConfig_userConfig === void 0 ? void 0 : _userConfig_userConfig.ssr) === false ? false : Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
+      if (userConfig.remoteIpStrategy === void 0) {
+        if (!enableSSR) {
+          userConfig.remoteIpStrategy = "inherit";
+        } else {
+          userConfig.remoteIpStrategy = "ipv4";
         }
-        var _modernjsConfig_source_enableAsyncEntry;
-        return {
-          tools: {
-            bundlerChain(chain, { isServer }) {
-              (0, import_utils.addMyTypes2Ignored)(chain, isServer ? ssrConfig : csrConfig);
-            },
-            rspack(config, { isServer }) {
-              var _config_output;
-              modifyBundlerConfig({
-                bundlerType,
-                mfConfig: isServer ? ssrConfig : csrConfig,
-                config,
-                isServer,
-                modernjsConfig,
-                remoteIpStrategy: userConfig.remoteIpStrategy
-              });
-              userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
-            },
-            webpack(config, { isServer }) {
-              var _config_output;
-              modifyBundlerConfig({
-                bundlerType,
-                mfConfig: isServer ? ssrConfig : csrConfig,
-                config,
-                isServer,
-                modernjsConfig,
-                remoteIpStrategy: userConfig.remoteIpStrategy
-              });
-              userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
-            },
-            devServer: {
-              headers: {
-                "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-                "Access-Control-Allow-Headers": "*"
-              }
-            }
+      }
+      var _modernjsConfig_source_enableAsyncEntry;
+      return {
+        tools: {
+          bundlerChain(chain, { isServer }) {
+            (0, import_utils.addMyTypes2Ignored)(chain, isServer ? ssrConfig : csrConfig);
           },
-          source: {
-            alias: {
-              "@modern-js/runtime/mf": require.resolve("@module-federation/modern-js/runtime")
-            },
-            define: {
-              FEDERATION_IPV4: JSON.stringify(ipv4),
-              REMOTE_IP_STRATEGY: JSON.stringify(userConfig.remoteIpStrategy)
-            },
-            enableAsyncEntry: bundlerType === "rspack" ? (_modernjsConfig_source_enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry) !== null && _modernjsConfig_source_enableAsyncEntry !== void 0 ? _modernjsConfig_source_enableAsyncEntry : true : (_modernjsConfig_source1 = modernjsConfig.source) === null || _modernjsConfig_source1 === void 0 ? void 0 : _modernjsConfig_source1.enableAsyncEntry
+          rspack(config, { isServer }) {
+            var _config_output;
+            modifyBundlerConfig({
+              bundlerType,
+              mfConfig: isServer ? ssrConfig : csrConfig,
+              config,
+              isServer,
+              modernjsConfig,
+              remoteIpStrategy: userConfig.remoteIpStrategy
+            });
+            userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
           },
-          dev: {
-            assetPrefix: (modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_dev = modernjsConfig.dev) === null || _modernjsConfig_dev === void 0 ? void 0 : _modernjsConfig_dev.assetPrefix) ? modernjsConfig.dev.assetPrefix : true
+          webpack(config, { isServer }) {
+            var _config_output;
+            modifyBundlerConfig({
+              bundlerType,
+              mfConfig: isServer ? ssrConfig : csrConfig,
+              config,
+              isServer,
+              modernjsConfig,
+              remoteIpStrategy: userConfig.remoteIpStrategy
+            });
+            userConfig.distOutputDir = ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
+          },
+          devServer: {
+            headers: {
+              "Access-Control-Allow-Origin": "*",
+              "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+              "Access-Control-Allow-Headers": "*"
+            }
           }
-        };
-      }
-    };
+        },
+        source: {
+          alias: {
+            "@modern-js/runtime/mf": require.resolve("@module-federation/modern-js/runtime")
+          },
+          define: {
+            FEDERATION_IPV4: JSON.stringify(ipv4),
+            REMOTE_IP_STRATEGY: JSON.stringify(userConfig.remoteIpStrategy)
+          },
+          enableAsyncEntry: bundlerType === "rspack" ? (_modernjsConfig_source_enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry) !== null && _modernjsConfig_source_enableAsyncEntry !== void 0 ? _modernjsConfig_source_enableAsyncEntry : true : (_modernjsConfig_source1 = modernjsConfig.source) === null || _modernjsConfig_source1 === void 0 ? void 0 : _modernjsConfig_source1.enableAsyncEntry
+        },
+        dev: {
+          assetPrefix: (modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_dev = modernjsConfig.dev) === null || _modernjsConfig_dev === void 0 ? void 0 : _modernjsConfig_dev.assetPrefix) ? modernjsConfig.dev.assetPrefix : true
+        }
+      };
+    });
   }
 });
 var configPlugin_default = moduleFederationConfigPlugin;

package/dist/cjs/cli/index.js

@@ -41,42 +41,40 @@ const moduleFederationPlugin = (userConfig = {}) => {
   };
   return {
     name: "@modern-js/plugin-module-federation",
-    setup: async ({ useConfigContext }) => {
-      const modernjsConfig = useConfigContext();
-      return {
-        config: async () => {
-          return {
-            tools: {
-              rspack(config, { isServer }) {
-                const browserPluginOptions = internalModernPluginOptions.csrConfig;
-                if (!isServer) {
-                  var _config_plugins;
-                  internalModernPluginOptions.browserPlugin = new import_rspack.ModuleFederationPlugin(browserPluginOptions);
-                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(internalModernPluginOptions.browserPlugin);
-                }
-              },
-              webpack(config, { isServer }) {
-                var _modernjsConfig_source;
-                const browserPluginOptions = internalModernPluginOptions.csrConfig;
-                if (!isServer) {
-                  var _config_plugins;
-                  internalModernPluginOptions.browserPlugin = new import_enhanced.ModuleFederationPlugin(browserPluginOptions);
-                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(internalModernPluginOptions.browserPlugin);
-                }
-                const enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
-                if (!enableAsyncEntry && browserPluginOptions.async !== false) {
-                  var _config_plugins1;
-                  const asyncBoundaryPluginOptions = typeof browserPluginOptions.async === "object" ? browserPluginOptions.async : {
-                    eager: (module2) => module2 && /\.federation/.test((module2 === null || module2 === void 0 ? void 0 : module2.request) || ""),
-                    excludeChunk: (chunk) => chunk.name === browserPluginOptions.name
-                  };
-                  (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(new import_enhanced.AsyncBoundaryPlugin(asyncBoundaryPluginOptions));
-                }
+    setup: async (api) => {
+      const modernjsConfig = api.getConfig();
+      api.config(() => {
+        return {
+          tools: {
+            rspack(config, { isServer }) {
+              const browserPluginOptions = internalModernPluginOptions.csrConfig;
+              if (!isServer) {
+                var _config_plugins;
+                internalModernPluginOptions.browserPlugin = new import_rspack.ModuleFederationPlugin(browserPluginOptions);
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(internalModernPluginOptions.browserPlugin);
+              }
+            },
+            webpack(config, { isServer }) {
+              var _modernjsConfig_source;
+              const browserPluginOptions = internalModernPluginOptions.csrConfig;
+              if (!isServer) {
+                var _config_plugins;
+                internalModernPluginOptions.browserPlugin = new import_enhanced.ModuleFederationPlugin(browserPluginOptions);
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(internalModernPluginOptions.browserPlugin);
+              }
+              const enableAsyncEntry = (_modernjsConfig_source = modernjsConfig.source) === null || _modernjsConfig_source === void 0 ? void 0 : _modernjsConfig_source.enableAsyncEntry;
+              if (!enableAsyncEntry && browserPluginOptions.async !== false) {
+                var _config_plugins1;
+                const asyncBoundaryPluginOptions = typeof browserPluginOptions.async === "object" ? browserPluginOptions.async : {
+                  eager: (module2) => module2 && /\.federation/.test((module2 === null || module2 === void 0 ? void 0 : module2.request) || ""),
+                  excludeChunk: (chunk) => chunk.name === browserPluginOptions.name
+                };
+                (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(new import_enhanced.AsyncBoundaryPlugin(asyncBoundaryPluginOptions));
               }
             }
-          };
-        }
-      };
+          }
+        };
+      });
     },
     usePlugins: [
       (0, import_configPlugin.moduleFederationConfigPlugin)(internalModernPluginOptions),

package/dist/cjs/cli/ssrPlugin.js

@@ -51,110 +51,108 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
     "@modern-js/plugin-module-federation-config",
     "@modern-js/plugin-module-federation"
   ],
-  setup: async ({ useConfigContext, useAppContext }) => {
+  setup: async (api) => {
     var _modernjsConfig_server, _pluginOptions_userConfig;
-    const modernjsConfig = useConfigContext();
+    const modernjsConfig = api.getConfig();
     const enableSSR = Boolean(modernjsConfig === null || modernjsConfig === void 0 ? void 0 : (_modernjsConfig_server = modernjsConfig.server) === null || _modernjsConfig_server === void 0 ? void 0 : _modernjsConfig_server.ssr);
     if (!enableSSR || ((_pluginOptions_userConfig = pluginOptions.userConfig) === null || _pluginOptions_userConfig === void 0 ? void 0 : _pluginOptions_userConfig.ssr) === false) {
       return {};
     }
     setEnv();
-    return {
-      _internalRuntimePlugins: ({ entrypoint, plugins }) => {
-        if (!import_constant.isDev) {
-          return {
-            entrypoint,
-            plugins
-          };
-        }
-        plugins.push({
-          name: "mfSSR",
-          path: "@module-federation/modern-js/ssr-runtime",
-          config: {}
-        });
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      if (!import_constant.isDev) {
         return {
           entrypoint,
           plugins
         };
-      },
-      config: async () => {
-        return {
-          tools: {
-            rspack(config, { isServer }) {
-              if (isServer) {
-                if (!pluginOptions.nodePlugin) {
-                  var _config_plugins;
-                  pluginOptions.nodePlugin = new import_rspack.ModuleFederationPlugin(pluginOptions.ssrConfig);
-                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
-                }
-              } else {
-                var _config_output;
-                pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
+      }
+      plugins.push({
+        name: "mfSSR",
+        path: "@module-federation/modern-js/ssr-runtime",
+        config: {}
+      });
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.config(() => {
+      return {
+        tools: {
+          rspack(config, { isServer }) {
+            if (isServer) {
+              if (!pluginOptions.nodePlugin) {
+                var _config_plugins;
+                pluginOptions.nodePlugin = new import_rspack.ModuleFederationPlugin(pluginOptions.ssrConfig);
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
               }
-            },
-            webpack(config, { isServer }) {
-              if (isServer) {
-                if (!pluginOptions.nodePlugin) {
-                  var _config_plugins;
-                  pluginOptions.nodePlugin = new import_webpack.ModuleFederationPlugin(pluginOptions.ssrConfig);
-                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
-                }
-              } else {
-                var _config_output;
-                pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
+            } else {
+              var _config_output;
+              pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
+            }
+          },
+          webpack(config, { isServer }) {
+            if (isServer) {
+              if (!pluginOptions.nodePlugin) {
+                var _config_plugins;
+                pluginOptions.nodePlugin = new import_webpack.ModuleFederationPlugin(pluginOptions.ssrConfig);
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(pluginOptions.nodePlugin);
               }
-            },
-            devServer: {
-              before: [
-                (req, res, next) => {
-                  if (!enableSSR) {
-                    next();
-                    return;
-                  }
-                  try {
-                    var _req_url, _req_url1;
-                    if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes(".json")) && !((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes("hot-update"))) {
-                      const filepath = import_path.default.join(process.cwd(), `dist${req.url}`);
-                      import_utils.fs.statSync(filepath);
-                      res.setHeader("Access-Control-Allow-Origin", "*");
-                      res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
-                      res.setHeader("Access-Control-Allow-Headers", "*");
-                      import_utils.fs.createReadStream(filepath).pipe(res);
-                    } else {
-                      next();
-                    }
-                  } catch (err) {
-                    import_logger.default.debug(err);
+            } else {
+              var _config_output;
+              pluginOptions.distOutputDir = pluginOptions.distOutputDir || ((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.path) || import_path.default.resolve(process.cwd(), "dist");
+            }
+          },
+          devServer: {
+            before: [
+              (req, res, next) => {
+                if (!enableSSR) {
+                  next();
+                  return;
+                }
+                try {
+                  var _req_url, _req_url1;
+                  if (((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes(".json")) && !((_req_url1 = req.url) === null || _req_url1 === void 0 ? void 0 : _req_url1.includes("hot-update"))) {
+                    const filepath = import_path.default.join(process.cwd(), `dist${req.url}`);
+                    import_utils.fs.statSync(filepath);
+                    res.setHeader("Access-Control-Allow-Origin", "*");
+                    res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
+                    res.setHeader("Access-Control-Allow-Headers", "*");
+                    import_utils.fs.createReadStream(filepath).pipe(res);
+                  } else {
                     next();
                   }
-                }
-              ]
-            },
-            bundlerChain(chain, { isServer }) {
-              if (isServer) {
-                chain.target("async-node");
-                if (import_constant.isDev) {
-                  chain.plugin("UniverseEntryChunkTrackerPlugin").use(import_universe_entry_chunk_tracker_plugin.default);
+                } catch (err) {
+                  import_logger.default.debug(err);
+                  next();
                 }
               }
-              if (import_constant.isDev && !isServer) {
-                chain.externals({
-                  "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
-                });
+            ]
+          },
+          bundlerChain(chain, { isServer }) {
+            if (isServer) {
+              chain.target("async-node");
+              if (import_constant.isDev) {
+                chain.plugin("UniverseEntryChunkTrackerPlugin").use(import_universe_entry_chunk_tracker_plugin.default);
               }
             }
+            if (import_constant.isDev && !isServer) {
+              chain.externals({
+                "@module-federation/node/utils": "NOT_USED_IN_BROWSER"
+              });
+            }
           }
-        };
-      },
-      afterBuild: () => {
-        const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
-        (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
-      },
-      afterDev: () => {
-        const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
-        (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
-      }
-    };
+        }
+      };
+    });
+    api.onAfterBuild(() => {
+      const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
+      (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
+    });
+    api.onDevCompileDone(() => {
+      const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
+      (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
+    });
   }
 });
 var ssrPlugin_default = moduleFederationSSRPlugin;

package/dist/cjs/ssr-runtime/plugin.js

@@ -32,42 +32,34 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_SSRLiveReload = require("./SSRLiveReload");
 const mfSSRPlugin = () => ({
   name: "@module-federation/modern-js",
-  setup: () => {
-    return {
-      async init({ context }, next) {
-        if (typeof window !== "undefined") {
-          return next({
-            context
-          });
-        }
-        globalThis.shouldUpdate = false;
-        const nodeUtils = await Promise.resolve().then(() => __toESM(require("@module-federation/node/utils")));
-        const shouldUpdate = await nodeUtils.revalidate();
-        if (shouldUpdate) {
-          console.log("should RELOAD", shouldUpdate);
-          await nodeUtils.flushChunks();
-          globalThis.shouldUpdate = true;
-        }
-        return next({
-          context
-        });
-      },
-      wrapRoot(App) {
-        const AppWrapper = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_SSRLiveReload.SSRLiveReload, {}),
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
-              ...props
-            })
-          ]
-        });
-        return (0, import_hoist_non_react_statics.default)(AppWrapper, App);
+  setup: (api) => {
+    api.onBeforeRender(async () => {
+      if (typeof window !== "undefined") {
+        return;
       }
-    };
+      globalThis.shouldUpdate = false;
+      const nodeUtils = await Promise.resolve().then(() => __toESM(require("@module-federation/node/utils")));
+      const shouldUpdate = await nodeUtils.revalidate();
+      if (shouldUpdate) {
+        console.log("should RELOAD", shouldUpdate);
+        await nodeUtils.flushChunks();
+        globalThis.shouldUpdate = true;
+      }
+    });
+    api.wrapRoot((App) => {
+      const AppWrapper = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_SSRLiveReload.SSRLiveReload, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+            ...props
+          })
+        ]
+      });
+      return AppWrapper;
+    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node: