@module-federation/modern-js 0.15.0 → 0.17.0

package/dist/esm/cli/server/data-fetch-server-plugin.js

@@ -1,221 +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 _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { DATA_FETCH_QUERY, MF_DATA_FETCH_STATUS } from "../../constant";
-import logger from "../../logger";
-import { getDataFetchMap } from "../../utils";
-import { fetchData, initDataFetchMap, loadDataFetchModule } from "../../utils/dataFetch";
-import { SEPARATOR, MANIFEST_EXT } from "@module-federation/sdk";
-function wrapSetTimeout(targetPromise) {
-  var delay = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 2e4, id = arguments.length > 2 ? arguments[2] : void 0;
-  if (targetPromise && typeof targetPromise.then === "function") {
-    return new Promise(function(resolve, reject) {
-      var timeoutId = setTimeout(function() {
-        logger.warn("Data fetch for ID ".concat(id, " timed out after 20 seconds."));
-        reject(new Error("Data fetch for ID ".concat(id, " timed out after 20 seconds")));
-      }, delay);
-      targetPromise.then(function(value) {
-        clearTimeout(timeoutId);
-        resolve(value);
-      }).catch(function(err) {
-        clearTimeout(timeoutId);
-        reject(err);
-      });
-    });
-  }
-}
-function addProtocol(url) {
-  if (url.startsWith("//")) {
-    return "https:" + url;
-  }
-  return url;
-}
-var getDecodeQuery = function(url, name) {
-  var res = url.searchParams.get(name);
-  if (!res) {
-    return null;
-  }
-  return decodeURIComponent(res);
-};
-var middleware = function() {
-  var _ref = _async_to_generator(function(ctx, next) {
-    var _globalThis___FEDERATION__, url, dataFetchId, params, remoteInfo, remoteInfoQuery, _dataFetchMap_dataFetchId, _dataFetchMap_dataFetchId1, dataFetchMap, fetchDataPromise, targetPromise, wrappedPromise, res, hostInstance, remoteEntry, remote, _hostInstance_snapshotHandler_getGlobalRemoteInfo, hostGlobalSnapshot, remoteSnapshot, dataFetchItem, callFetchDataPromise, wrappedPromise1, res1, remoteId, hostInstance1, dataFetchFn, data, e;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          try {
-            url = new URL(ctx.req.url);
-            dataFetchId = getDecodeQuery(url, DATA_FETCH_QUERY);
-            params = JSON.parse(getDecodeQuery(url, "params") || "{}");
-            remoteInfoQuery = getDecodeQuery(url, "remoteInfo");
-            remoteInfo = remoteInfoQuery ? JSON.parse(remoteInfoQuery) : null;
-          } catch (e2) {
-            logger.error("fetch data from server, error: ", e2);
-            return [
-              2,
-              next()
-            ];
-          }
-          if (!dataFetchId) {
-            return [
-              2,
-              next()
-            ];
-          }
-          logger.log("fetch data from server, dataFetchId: ", dataFetchId);
-          logger.debug("fetch data from server, moduleInfo: ", (_globalThis___FEDERATION__ = globalThis.__FEDERATION__) === null || _globalThis___FEDERATION__ === void 0 ? void 0 : _globalThis___FEDERATION__.moduleInfo);
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            9,
-            ,
-            10
-          ]);
-          dataFetchMap = getDataFetchMap();
-          if (!dataFetchMap) {
-            initDataFetchMap();
-          }
-          fetchDataPromise = (_dataFetchMap_dataFetchId = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId === void 0 ? void 0 : _dataFetchMap_dataFetchId[1];
-          logger.debug("fetch data from server, fetchDataPromise: ", fetchDataPromise);
-          if (!(fetchDataPromise && ((_dataFetchMap_dataFetchId1 = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId1 === void 0 ? void 0 : _dataFetchMap_dataFetchId1[2]) !== MF_DATA_FETCH_STATUS.ERROR))
-            return [
-              3,
-              4
-            ];
-          targetPromise = fetchDataPromise[0];
-          wrappedPromise = wrapSetTimeout(targetPromise, 2e4, dataFetchId);
-          if (!wrappedPromise)
-            return [
-              3,
-              3
-            ];
-          return [
-            4,
-            wrappedPromise
-          ];
-        case 2:
-          res = _state.sent();
-          logger.log("fetch data from server, fetchDataPromise res: ", res);
-          return [
-            2,
-            ctx.json(res)
-          ];
-        case 3:
-          logger.error("Expected a Promise from fetchDataPromise[0] for dataFetchId ".concat(dataFetchId, ", but received:"), targetPromise, "Will try call new dataFetch again...");
-          _state.label = 4;
-        case 4:
-          if (remoteInfo) {
-            try {
-              hostInstance = globalThis.__FEDERATION__.__INSTANCES__[0];
-              remoteEntry = "".concat(addProtocol(remoteInfo.ssrPublicPath) + remoteInfo.ssrRemoteEntry);
-              if (!hostInstance) {
-                throw new Error("host instance not found!");
-              }
-              remote = hostInstance.options.remotes.find(function(remote2) {
-                return remote2.name === remoteInfo.name;
-              });
-              logger.debug("find remote: ", JSON.stringify(remote));
-              if (!remote) {
-                hostInstance.registerRemotes([
-                  {
-                    name: remoteInfo.name,
-                    entry: remoteEntry,
-                    entryGlobalName: remoteInfo.globalName
-                  }
-                ]);
-              } else if (!("entry" in remote) || !remote.entry.includes(MANIFEST_EXT)) {
-                _hostInstance_snapshotHandler_getGlobalRemoteInfo = hostInstance.snapshotHandler.getGlobalRemoteInfo(remoteInfo), hostGlobalSnapshot = _hostInstance_snapshotHandler_getGlobalRemoteInfo.hostGlobalSnapshot, remoteSnapshot = _hostInstance_snapshotHandler_getGlobalRemoteInfo.remoteSnapshot;
-                logger.debug("find hostGlobalSnapshot: ", JSON.stringify(hostGlobalSnapshot));
-                logger.debug("find remoteSnapshot: ", JSON.stringify(remoteSnapshot));
-                if (!hostGlobalSnapshot || !remoteSnapshot) {
-                  if ("version" in remote) {
-                    delete remote.version;
-                  }
-                  remote.entry = remoteEntry;
-                  remote.entryGlobalName = remoteInfo.globalName;
-                }
-              }
-            } catch (e2) {
-              ctx.status(500);
-              return [
-                2,
-                ctx.text("failed to fetch ".concat(remoteInfo.name, " data, error:\n ").concat(e2))
-              ];
-            }
-          }
-          dataFetchItem = dataFetchMap[dataFetchId];
-          logger.debug("fetch data from server, dataFetchItem: ", dataFetchItem);
-          if (!dataFetchItem)
-            return [
-              3,
-              6
-            ];
-          callFetchDataPromise = fetchData(dataFetchId, _object_spread_props(_object_spread({}, params), {
-            isDowngrade: !remoteInfo
-          }));
-          wrappedPromise1 = wrapSetTimeout(callFetchDataPromise, 2e4, dataFetchId);
-          if (!wrappedPromise1)
-            return [
-              3,
-              6
-            ];
-          return [
-            4,
-            wrappedPromise1
-          ];
-        case 5:
-          res1 = _state.sent();
-          logger.log("fetch data from server, dataFetchItem res: ", res1);
-          return [
-            2,
-            ctx.json(res1)
-          ];
-        case 6:
-          remoteId = dataFetchId.split(SEPARATOR)[0];
-          hostInstance1 = globalThis.__FEDERATION__.__INSTANCES__[0];
-          if (!hostInstance1) {
-            throw new Error("host instance not found!");
-          }
-          return [
-            4,
-            loadDataFetchModule(hostInstance1, remoteId)
-          ];
-        case 7:
-          dataFetchFn = _state.sent();
-          return [
-            4,
-            dataFetchFn(_object_spread_props(_object_spread({}, params), {
-              isDowngrade: !remoteInfo
-            }))
-          ];
-        case 8:
-          data = _state.sent();
-          logger.log("fetch data from server, loadDataFetchModule res: ", data);
-          return [
-            2,
-            ctx.json(data)
-          ];
-        case 9:
-          e = _state.sent();
-          logger.error("server plugin data fetch error: ", e);
-          ctx.status(500);
-          return [
-            2,
-            ctx.text("failed to fetch ".concat(remoteInfo.name, " data, error:\n ").concat(e))
-          ];
-        case 10:
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function middleware2(ctx, next) {
-    return _ref.apply(this, arguments);
-  };
-}();
+import dataFetchMiddleWare from "@module-federation/bridge-react/data-fetch-server-middleware";
 var dataFetchServePlugin = function() {
   return {
     name: "mf-data-fetch-server-plugin",
@@ -225,7 +8,7 @@ var dataFetchServePlugin = function() {
         middlewares.push({
           name: "module-federation-serve-manifest",
           // @ts-ignore type error
-          handler: middleware
+          handler: dataFetchMiddleWare
         });
       });
     }

package/dist/esm/cli/ssrPlugin.js

@@ -8,7 +8,7 @@ import { ModuleFederationPlugin as RspackModuleFederationPlugin } from "@module-
 import UniverseEntryChunkTrackerPlugin from "@module-federation/node/universe-entry-chunk-tracker-plugin";
 import logger from "../logger";
 import { isDev } from "./utils";
-import { updateStatsAndManifest } from "@module-federation/rsbuild-plugin/manifest";
+import { updateStatsAndManifest } from "@module-federation/rsbuild-plugin/utils";
 import { isWebTarget, skipByTarget } from "./utils";
 function setEnv() {
   process.env["MF_DISABLE_EMIT_STATS"] = "true";

package/dist/esm/constant.js

@@ -1,42 +1,6 @@
 var LOCALHOST = "localhost";
 var PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
-var DATA_FETCH_QUERY = "x-mf-data-fetch";
-var DATA_FETCH_ERROR_PREFIX = "caught the following error during dataFetch: ";
-var LOAD_REMOTE_ERROR_PREFIX = "caught the following error during loadRemote: ";
-var DOWNGRADE_KEY = "_mfSSRDowngrade";
-var DATA_FETCH_MAP_KEY = "__MF_DATA_FETCH_MAP__";
-var DATA_FETCH_FUNCTION = "_mfDataFetch";
-var FS_HREF = "_mfFSHref";
-var ERROR_TYPE = {
-  DATA_FETCH: 1,
-  LOAD_REMOTE: 2,
-  UNKNOWN: 3
-};
-var WRAP_DATA_FETCH_ID_IDENTIFIER = "wrap_dfip_identifier";
-var MF_DATA_FETCH_TYPE;
-(function(MF_DATA_FETCH_TYPE2) {
-  MF_DATA_FETCH_TYPE2[MF_DATA_FETCH_TYPE2["FETCH_SERVER"] = 1] = "FETCH_SERVER";
-  MF_DATA_FETCH_TYPE2[MF_DATA_FETCH_TYPE2["FETCH_CLIENT"] = 2] = "FETCH_CLIENT";
-})(MF_DATA_FETCH_TYPE || (MF_DATA_FETCH_TYPE = {}));
-var MF_DATA_FETCH_STATUS;
-(function(MF_DATA_FETCH_STATUS2) {
-  MF_DATA_FETCH_STATUS2[MF_DATA_FETCH_STATUS2["LOADED"] = 1] = "LOADED";
-  MF_DATA_FETCH_STATUS2[MF_DATA_FETCH_STATUS2["LOADING"] = 2] = "LOADING";
-  MF_DATA_FETCH_STATUS2[MF_DATA_FETCH_STATUS2["AWAIT"] = 0] = "AWAIT";
-  MF_DATA_FETCH_STATUS2[MF_DATA_FETCH_STATUS2["ERROR"] = 3] = "ERROR";
-})(MF_DATA_FETCH_STATUS || (MF_DATA_FETCH_STATUS = {}));
 export {
-  DATA_FETCH_ERROR_PREFIX,
-  DATA_FETCH_FUNCTION,
-  DATA_FETCH_MAP_KEY,
-  DATA_FETCH_QUERY,
-  DOWNGRADE_KEY,
-  ERROR_TYPE,
-  FS_HREF,
-  LOAD_REMOTE_ERROR_PREFIX,
   LOCALHOST,
-  MF_DATA_FETCH_STATUS,
-  MF_DATA_FETCH_TYPE,
-  PLUGIN_IDENTIFIER,
-  WRAP_DATA_FETCH_ID_IDENTIFIER
+  PLUGIN_IDENTIFIER
 };

package/dist/esm/react/index.js

@@ -0,0 +1,12 @@
+import { ERROR_TYPE, CacheSize, CacheTime, configureCache, generateKey, cache, revalidateTag, clearStore, lazyLoadComponentPlugin } from "@module-federation/bridge-react";
+export {
+  CacheSize,
+  CacheTime,
+  ERROR_TYPE,
+  cache,
+  clearStore,
+  configureCache,
+  generateKey,
+  lazyLoadComponentPlugin,
+  revalidateTag
+};

package/dist/esm/runtime/index.js

@@ -1,22 +1 @@
 export * from "@module-federation/enhanced/runtime";
-import { ERROR_TYPE } from "../constant";
-var kit = {
-  get createRemoteSSRComponent() {
-    return require("./createRemoteComponent").createRemoteSSRComponent;
-  },
-  get createRemoteComponent() {
-    return require("./createRemoteComponent").createRemoteComponent;
-  },
-  get collectSSRAssets() {
-    return require("./createRemoteComponent").collectSSRAssets;
-  },
-  get wrapNoSSR() {
-    return require("./wrapNoSSR").wrapNoSSR;
-  }
-};
-import { setSSREnv } from "../ssr-runtime/injectDataFetchFunctionPlugin";
-export {
-  ERROR_TYPE,
-  kit,
-  setSSREnv
-};

package/dist/esm/ssr-runtime/devPlugin.js

@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SSRLiveReload } from "./SSRLiveReload";
-import { flushDataFetch } from "../utils";
+import { flushDataFetch } from "@module-federation/bridge-react/lazy-utils";
 var mfSSRDevPlugin = function() {
   return {
     name: "@module-federation/modern-js",

package/dist/esm/ssr-runtime/injectDataFetchFunctionPlugin.js

@@ -1,167 +1,25 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { DATA_FETCH_FUNCTION, DOWNGRADE_KEY, FS_HREF, MF_DATA_FETCH_STATUS, MF_DATA_FETCH_TYPE } from "../constant";
-import logger from "../logger";
-import { getDataFetchMap, getDataFetchItem, initDataFetchMap } from "../utils";
-import { callAllDowngrade, callDowngrade, getDowngradeTag } from "./downgrade";
-function setSSREnv(param) {
-  var fetchServerQuery = param.fetchServerQuery;
-  globalThis.FEDERATION_SSR = true;
-  globalThis.FEDERATION_SERVER_QUERY = fetchServerQuery;
-}
+import { callDataFetch } from "@module-federation/bridge-react/data-fetch-utils";
+import { setSSREnv } from "@module-federation/bridge-react/lazy-utils";
 var injectDataFetchFunctionPlugin = function(param) {
   var fetchServerQuery = param.fetchServerQuery;
   return {
     name: "@module-federation/inject-data-fetch-function-plugin",
     setup: function(api) {
       api.onBeforeRender(/* @__PURE__ */ _async_to_generator(function() {
-        var _globalThis, _DATA_FETCH_FUNCTION, dataFetchFunction, dataFetch;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
               setSSREnv({
                 fetchServerQuery
               });
-              if (typeof window === "undefined") {
-                return [
-                  2
-                ];
-              }
-              dataFetchFunction = function() {
-                var _ref = _async_to_generator(function(options) {
-                  var _options, id, data, downgrade, dataFetchItem, _dataFetchItem__, _dataFetchItem_, dataFetchMap, res, rej, p, mfDowngrade, mfDowngrade1;
-                  return _ts_generator(this, function(_state2) {
-                    _options = _sliced_to_array(options, 3), id = _options[0], data = _options[1], downgrade = _options[2];
-                    logger.debug("==========call data fetch function!");
-                    if (data) {
-                      if (!id) {
-                        throw new Error("id is required!");
-                      }
-                      if (!getDataFetchMap()) {
-                        initDataFetchMap();
-                      }
-                      dataFetchItem = getDataFetchItem(id);
-                      if (dataFetchItem) {
-                        ;
-                        (_dataFetchItem_ = dataFetchItem[1]) === null || _dataFetchItem_ === void 0 ? void 0 : (_dataFetchItem__ = _dataFetchItem_[1]) === null || _dataFetchItem__ === void 0 ? void 0 : _dataFetchItem__.call(_dataFetchItem_, data);
-                        dataFetchItem[2] = MF_DATA_FETCH_STATUS.LOADED;
-                        return [
-                          2
-                        ];
-                      }
-                      if (!dataFetchItem) {
-                        dataFetchMap = getDataFetchMap();
-                        ;
-                        ;
-                        p = new Promise(function(resolve, reject) {
-                          res = resolve;
-                          rej = reject;
-                        });
-                        dataFetchMap[id] = [
-                          [
-                            /* @__PURE__ */ _async_to_generator(function() {
-                              return _ts_generator(this, function(_state3) {
-                                return [
-                                  2,
-                                  _async_to_generator(function() {
-                                    return _ts_generator(this, function(_state4) {
-                                      return [
-                                        2,
-                                        ""
-                                      ];
-                                    });
-                                  })
-                                ];
-                              });
-                            }),
-                            MF_DATA_FETCH_TYPE.FETCH_SERVER
-                          ],
-                          [
-                            p,
-                            res,
-                            rej
-                          ],
-                          MF_DATA_FETCH_STATUS.LOADED
-                        ];
-                        res(data);
-                        return [
-                          2
-                        ];
-                      }
-                    }
-                    if (downgrade) {
-                      mfDowngrade = getDowngradeTag();
-                      if (!mfDowngrade) {
-                        globalThis[DOWNGRADE_KEY] = id ? [
-                          id
-                        ] : true;
-                      } else if (Array.isArray(mfDowngrade) && id && !mfDowngrade.includes(id)) {
-                        mfDowngrade.push(id);
-                      }
-                    }
-                    mfDowngrade1 = getDowngradeTag();
-                    if (typeof mfDowngrade1 === "boolean") {
-                      return [
-                        2,
-                        callAllDowngrade()
-                      ];
-                    }
-                    if (Array.isArray(mfDowngrade1)) {
-                      if (!id) {
-                        globalThis[DOWNGRADE_KEY] = true;
-                        return [
-                          2,
-                          callAllDowngrade()
-                        ];
-                      }
-                      if (!mfDowngrade1.includes(id)) {
-                        mfDowngrade1.push(id);
-                      }
-                      return [
-                        2,
-                        callDowngrade(id)
-                      ];
-                    }
-                    return [
-                      2
-                    ];
-                  });
-                });
-                return function dataFetchFunction2(options) {
-                  return _ref.apply(this, arguments);
-                };
-              }();
-              globalThis[FS_HREF] = window.location.href;
-              (_globalThis = globalThis)[_DATA_FETCH_FUNCTION = DATA_FETCH_FUNCTION] || (_globalThis[_DATA_FETCH_FUNCTION] = []);
-              dataFetch = globalThis[DATA_FETCH_FUNCTION];
               return [
                 4,
-                Promise.all(dataFetch.map(function() {
-                  var _ref = _async_to_generator(function(options) {
-                    return _ts_generator(this, function(_state2) {
-                      switch (_state2.label) {
-                        case 0:
-                          return [
-                            4,
-                            dataFetchFunction(options)
-                          ];
-                        case 1:
-                          _state2.sent();
-                          return [
-                            2
-                          ];
-                      }
-                    });
-                  });
-                  return function(options) {
-                    return _ref.apply(this, arguments);
-                  };
-                }()))
+                callDataFetch()
               ];
             case 1:
               _state.sent();
-              dataFetch.push = dataFetchFunction;
               return [
                 2
               ];
@@ -172,6 +30,5 @@ var injectDataFetchFunctionPlugin = function(param) {
   };
 };
 export {
-  injectDataFetchFunctionPlugin,
-  setSSREnv
+  injectDataFetchFunctionPlugin
 };

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

@@ -107,7 +107,6 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy, enableSSR) => {
   ];
   patchDTSConfig(mfConfig, isServer);
   injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
-  injectRuntimePlugins(require.resolve("@module-federation/modern-js/auto-fetch-data"), runtimePlugins);
   if (enableSSR && isDev()) {
     injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
   }
@@ -223,7 +222,7 @@ function patchBundlerConfig(options) {
     const uniqueName = mfConfig.name || chain.output.get("uniqueName");
     const chunkFileName = chain.output.get("chunkFilename");
     if (typeof chunkFileName === "string" && uniqueName && !chunkFileName.includes(uniqueName)) {
-      const suffix = `${encodeName(uniqueName)}-[chunkhash].js`;
+      const suffix = `${encodeName(uniqueName)}-[contenthash].js`;
       chain.output.chunkFilename(chunkFileName.replace(".js", suffix));
     }
   }
@@ -311,11 +310,13 @@ const moduleFederationConfigPlugin = (userConfig) => ({
             headers: corsHeaders
           }
         },
-        source: {
+        resolve: {
           alias: {
             // TODO: deprecated
             "@modern-js/runtime/mf": require.resolve("@module-federation/modern-js/runtime")
-          },
+          }
+        },
+        source: {
           define: defineConfig,
           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
         },

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

@@ -38,7 +38,6 @@ describe("patchMFConfig", async () => {
       remoteType: "script",
       runtimePlugins: [
         require.resolve("@module-federation/modern-js/shared-strategy"),
-        require.resolve("@module-federation/modern-js/auto-fetch-data"),
         require.resolve("@module-federation/node/runtimePlugin"),
         require.resolve("@module-federation/modern-js/inject-node-fetch")
       ],
@@ -66,8 +65,7 @@ describe("patchMFConfig", async () => {
       },
       remoteType: "script",
       runtimePlugins: [
-        require.resolve("@module-federation/modern-js/shared-strategy"),
-        require.resolve("@module-federation/modern-js/auto-fetch-data")
+        require.resolve("@module-federation/modern-js/shared-strategy")
       ],
       shared: {
         react: {