@module-federation/modern-js 0.15.0 → 0.17.0

package/dist/cjs/cli/configPlugin.js

@@ -148,7 +148,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 && (0, import_utils3.isDev)()) {
     injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
   }
@@ -264,7 +263,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 = `${(0, import_sdk.encodeName)(uniqueName)}-[chunkhash].js`;
+      const suffix = `${(0, import_sdk.encodeName)(uniqueName)}-[contenthash].js`;
       chain.output.chunkFilename(chunkFileName.replace(".js", suffix));
     }
   }
@@ -352,11 +351,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/cjs/cli/configPlugin.spec.js

@@ -61,7 +61,6 @@ const mfConfig = {
       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")
       ],
@@ -89,8 +88,7 @@ const mfConfig = {
       },
       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: {

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

@@ -31,148 +31,7 @@ __export(data_fetch_server_plugin_exports, {
   default: () => data_fetch_server_plugin_default
 });
 module.exports = __toCommonJS(data_fetch_server_plugin_exports);
-var import_constant = require("../../constant");
-var import_logger = __toESM(require("../../logger"));
-var import_utils = require("../../utils");
-var import_dataFetch = require("../../utils/dataFetch");
-var import_sdk = require("@module-federation/sdk");
-function wrapSetTimeout(targetPromise, delay = 2e4, id) {
-  if (targetPromise && typeof targetPromise.then === "function") {
-    return new Promise((resolve, reject) => {
-      const timeoutId = setTimeout(() => {
-        import_logger.default.warn(`Data fetch for ID ${id} timed out after 20 seconds.`);
-        reject(new Error(`Data fetch for ID ${id} timed out after 20 seconds`));
-      }, delay);
-      targetPromise.then((value) => {
-        clearTimeout(timeoutId);
-        resolve(value);
-      }).catch((err) => {
-        clearTimeout(timeoutId);
-        reject(err);
-      });
-    });
-  }
-}
-function addProtocol(url) {
-  if (url.startsWith("//")) {
-    return "https:" + url;
-  }
-  return url;
-}
-const getDecodeQuery = (url, name) => {
-  const res = url.searchParams.get(name);
-  if (!res) {
-    return null;
-  }
-  return decodeURIComponent(res);
-};
-const middleware = async (ctx, next) => {
-  var _globalThis___FEDERATION__;
-  let url;
-  let dataFetchId;
-  let params;
-  let remoteInfo;
-  try {
-    url = new URL(ctx.req.url);
-    dataFetchId = getDecodeQuery(url, import_constant.DATA_FETCH_QUERY);
-    params = JSON.parse(getDecodeQuery(url, "params") || "{}");
-    const remoteInfoQuery = getDecodeQuery(url, "remoteInfo");
-    remoteInfo = remoteInfoQuery ? JSON.parse(remoteInfoQuery) : null;
-  } catch (e) {
-    import_logger.default.error("fetch data from server, error: ", e);
-    return next();
-  }
-  if (!dataFetchId) {
-    return next();
-  }
-  import_logger.default.log("fetch data from server, dataFetchId: ", dataFetchId);
-  import_logger.default.debug("fetch data from server, moduleInfo: ", (_globalThis___FEDERATION__ = globalThis.__FEDERATION__) === null || _globalThis___FEDERATION__ === void 0 ? void 0 : _globalThis___FEDERATION__.moduleInfo);
-  try {
-    var _dataFetchMap_dataFetchId, _dataFetchMap_dataFetchId1;
-    const dataFetchMap = (0, import_utils.getDataFetchMap)();
-    if (!dataFetchMap) {
-      (0, import_dataFetch.initDataFetchMap)();
-    }
-    const fetchDataPromise = (_dataFetchMap_dataFetchId = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId === void 0 ? void 0 : _dataFetchMap_dataFetchId[1];
-    import_logger.default.debug("fetch data from server, fetchDataPromise: ", fetchDataPromise);
-    if (fetchDataPromise && ((_dataFetchMap_dataFetchId1 = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId1 === void 0 ? void 0 : _dataFetchMap_dataFetchId1[2]) !== import_constant.MF_DATA_FETCH_STATUS.ERROR) {
-      const targetPromise = fetchDataPromise[0];
-      const wrappedPromise = wrapSetTimeout(targetPromise, 2e4, dataFetchId);
-      if (wrappedPromise) {
-        const res = await wrappedPromise;
-        import_logger.default.log("fetch data from server, fetchDataPromise res: ", res);
-        return ctx.json(res);
-      }
-      import_logger.default.error(`Expected a Promise from fetchDataPromise[0] for dataFetchId ${dataFetchId}, but received:`, targetPromise, "Will try call new dataFetch again...");
-    }
-    if (remoteInfo) {
-      try {
-        const hostInstance2 = globalThis.__FEDERATION__.__INSTANCES__[0];
-        const remoteEntry = `${addProtocol(remoteInfo.ssrPublicPath) + remoteInfo.ssrRemoteEntry}`;
-        if (!hostInstance2) {
-          throw new Error("host instance not found!");
-        }
-        const remote = hostInstance2.options.remotes.find((remote2) => remote2.name === remoteInfo.name);
-        import_logger.default.debug("find remote: ", JSON.stringify(remote));
-        if (!remote) {
-          hostInstance2.registerRemotes([
-            {
-              name: remoteInfo.name,
-              entry: remoteEntry,
-              entryGlobalName: remoteInfo.globalName
-            }
-          ]);
-        } else if (!("entry" in remote) || !remote.entry.includes(import_sdk.MANIFEST_EXT)) {
-          const { hostGlobalSnapshot, remoteSnapshot } = hostInstance2.snapshotHandler.getGlobalRemoteInfo(remoteInfo);
-          import_logger.default.debug("find hostGlobalSnapshot: ", JSON.stringify(hostGlobalSnapshot));
-          import_logger.default.debug("find remoteSnapshot: ", JSON.stringify(remoteSnapshot));
-          if (!hostGlobalSnapshot || !remoteSnapshot) {
-            if ("version" in remote) {
-              delete remote.version;
-            }
-            remote.entry = remoteEntry;
-            remote.entryGlobalName = remoteInfo.globalName;
-          }
-        }
-      } catch (e) {
-        ctx.status(500);
-        return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
- ${e}`);
-      }
-    }
-    const dataFetchItem = dataFetchMap[dataFetchId];
-    import_logger.default.debug("fetch data from server, dataFetchItem: ", dataFetchItem);
-    if (dataFetchItem) {
-      const callFetchDataPromise = (0, import_dataFetch.fetchData)(dataFetchId, {
-        ...params,
-        isDowngrade: !remoteInfo
-      });
-      const wrappedPromise = wrapSetTimeout(callFetchDataPromise, 2e4, dataFetchId);
-      if (wrappedPromise) {
-        const res = await wrappedPromise;
-        import_logger.default.log("fetch data from server, dataFetchItem res: ", res);
-        return ctx.json(res);
-      }
-    }
-    const remoteId = dataFetchId.split(import_sdk.SEPARATOR)[0];
-    const hostInstance = globalThis.__FEDERATION__.__INSTANCES__[0];
-    if (!hostInstance) {
-      throw new Error("host instance not found!");
-    }
-    const dataFetchFn = await (0, import_dataFetch.loadDataFetchModule)(hostInstance, remoteId);
-    const data = await dataFetchFn({
-      ...params,
-      isDowngrade: !remoteInfo
-    });
-    import_logger.default.log("fetch data from server, loadDataFetchModule res: ", data);
-    return ctx.json(data);
-  } catch (e) {
-    import_logger.default.error("server plugin data fetch error: ", e);
-    ctx.status(500);
-    return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
- ${e}`);
-  }
-};
+var import_data_fetch_server_middleware = __toESM(require("@module-federation/bridge-react/data-fetch-server-middleware"));
 const dataFetchServePlugin = () => ({
   name: "mf-data-fetch-server-plugin",
   setup: (api) => {
@@ -181,7 +40,7 @@ const dataFetchServePlugin = () => ({
       middlewares.push({
         name: "module-federation-serve-manifest",
         // @ts-ignore type error
-        handler: middleware
+        handler: import_data_fetch_server_middleware.default
       });
     });
   }

package/dist/cjs/cli/ssrPlugin.js

@@ -41,8 +41,8 @@ var import_rspack = require("@module-federation/enhanced/rspack");
 var import_universe_entry_chunk_tracker_plugin = __toESM(require("@module-federation/node/universe-entry-chunk-tracker-plugin"));
 var import_logger = __toESM(require("../logger"));
 var import_utils = require("./utils");
-var import_manifest = require("@module-federation/rsbuild-plugin/manifest");
-var import_utils2 = require("./utils");
+var import_utils2 = require("@module-federation/rsbuild-plugin/utils");
+var import_utils3 = require("./utils");
 function setEnv() {
   process.env["MF_DISABLE_EMIT_STATS"] = "true";
   process.env["MF_SSR_PRJ"] = "true";
@@ -63,10 +63,10 @@ const mfSSRRsbuildPlugin = (pluginOptions) => {
       let ssrEnv = "";
       api.modifyEnvironmentConfig((config, { name }) => {
         const target = config.output.target;
-        if ((0, import_utils2.skipByTarget)(target)) {
+        if ((0, import_utils3.skipByTarget)(target)) {
           return config;
         }
-        if ((0, import_utils2.isWebTarget)(target)) {
+        if ((0, import_utils3.isWebTarget)(target)) {
           csrOutputPath = config.output.distPath.root;
         } else {
           ssrOutputPath = config.output.distPath.root;
@@ -149,12 +149,12 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
     }
     api.modifyBundlerChain((chain) => {
       const target = chain.get("target");
-      if ((0, import_utils2.skipByTarget)(target)) {
+      if ((0, import_utils3.skipByTarget)(target)) {
         return;
       }
       const bundlerType = api.getAppContext().bundlerType === "rspack" ? "rspack" : "webpack";
       const MFPlugin = bundlerType === "webpack" ? import_webpack.ModuleFederationPlugin : import_rspack.ModuleFederationPlugin;
-      const isWeb = (0, import_utils2.isWebTarget)(target);
+      const isWeb = (0, import_utils3.isWebTarget)(target);
       if (!isWeb) {
         if (!chain.plugins.has(CHAIN_MF_PLUGIN_ID)) {
           chain.plugin(CHAIN_MF_PLUGIN_ID).use(MFPlugin, [
@@ -219,11 +219,11 @@ const moduleFederationSSRPlugin = (pluginOptions) => ({
     });
     api.onAfterBuild(() => {
       const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
-      (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
+      (0, import_utils2.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
     });
     api.onDevCompileDone(() => {
       const { nodePlugin, browserPlugin, distOutputDir } = pluginOptions;
-      (0, import_manifest.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
+      (0, import_utils2.updateStatsAndManifest)(nodePlugin, browserPlugin, distOutputDir);
     });
   }
 });

package/dist/cjs/constant.js

@@ -18,61 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constant_exports = {};
 __export(constant_exports, {
-  DATA_FETCH_ERROR_PREFIX: () => DATA_FETCH_ERROR_PREFIX,
-  DATA_FETCH_FUNCTION: () => DATA_FETCH_FUNCTION,
-  DATA_FETCH_MAP_KEY: () => DATA_FETCH_MAP_KEY,
-  DATA_FETCH_QUERY: () => DATA_FETCH_QUERY,
-  DOWNGRADE_KEY: () => DOWNGRADE_KEY,
-  ERROR_TYPE: () => ERROR_TYPE,
-  FS_HREF: () => FS_HREF,
-  LOAD_REMOTE_ERROR_PREFIX: () => LOAD_REMOTE_ERROR_PREFIX,
   LOCALHOST: () => LOCALHOST,
-  MF_DATA_FETCH_STATUS: () => MF_DATA_FETCH_STATUS,
-  MF_DATA_FETCH_TYPE: () => MF_DATA_FETCH_TYPE,
-  PLUGIN_IDENTIFIER: () => PLUGIN_IDENTIFIER,
-  WRAP_DATA_FETCH_ID_IDENTIFIER: () => WRAP_DATA_FETCH_ID_IDENTIFIER
+  PLUGIN_IDENTIFIER: () => PLUGIN_IDENTIFIER
 });
 module.exports = __toCommonJS(constant_exports);
 const LOCALHOST = "localhost";
 const PLUGIN_IDENTIFIER = "[ Modern.js Module Federation ]";
-const DATA_FETCH_QUERY = "x-mf-data-fetch";
-const DATA_FETCH_ERROR_PREFIX = "caught the following error during dataFetch: ";
-const LOAD_REMOTE_ERROR_PREFIX = "caught the following error during loadRemote: ";
-const DOWNGRADE_KEY = "_mfSSRDowngrade";
-const DATA_FETCH_MAP_KEY = "__MF_DATA_FETCH_MAP__";
-const DATA_FETCH_FUNCTION = "_mfDataFetch";
-const FS_HREF = "_mfFSHref";
-const ERROR_TYPE = {
-  DATA_FETCH: 1,
-  LOAD_REMOTE: 2,
-  UNKNOWN: 3
-};
-const 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 = {}));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  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/cjs/{runtime/wrapNoSSR.js → react/index.js}

@@ -16,20 +16,29 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var wrapNoSSR_exports = {};
-__export(wrapNoSSR_exports, {
-  wrapNoSSR: () => wrapNoSSR
+var react_exports = {};
+__export(react_exports, {
+  CacheSize: () => import_bridge_react.CacheSize,
+  CacheTime: () => import_bridge_react.CacheTime,
+  ERROR_TYPE: () => import_bridge_react.ERROR_TYPE,
+  cache: () => import_bridge_react.cache,
+  clearStore: () => import_bridge_react.clearStore,
+  configureCache: () => import_bridge_react.configureCache,
+  generateKey: () => import_bridge_react.generateKey,
+  lazyLoadComponentPlugin: () => import_bridge_react.lazyLoadComponentPlugin,
+  revalidateTag: () => import_bridge_react.revalidateTag
 });
-module.exports = __toCommonJS(wrapNoSSR_exports);
-function wrapNoSSR(createComponentFn) {
-  return (options) => {
-    return createComponentFn({
-      ...options,
-      noSSR: true
-    });
-  };
-}
+module.exports = __toCommonJS(react_exports);
+var import_bridge_react = require("@module-federation/bridge-react");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  wrapNoSSR
+  CacheSize,
+  CacheTime,
+  ERROR_TYPE,
+  cache,
+  clearStore,
+  configureCache,
+  generateKey,
+  lazyLoadComponentPlugin,
+  revalidateTag
 });

package/dist/cjs/runtime/index.js

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -18,33 +14,9 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var runtime_exports = {};
-__export(runtime_exports, {
-  ERROR_TYPE: () => import_constant.ERROR_TYPE,
-  kit: () => kit,
-  setSSREnv: () => import_injectDataFetchFunctionPlugin.setSSREnv
-});
 module.exports = __toCommonJS(runtime_exports);
 __reExport(runtime_exports, require("@module-federation/enhanced/runtime"), module.exports);
-var import_constant = require("../constant");
-var import_injectDataFetchFunctionPlugin = require("../ssr-runtime/injectDataFetchFunctionPlugin");
-const 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;
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ERROR_TYPE,
-  kit,
-  setSSREnv,
   ...require("@module-federation/enhanced/runtime")
 });

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

@@ -33,7 +33,7 @@ __export(devPlugin_exports, {
 module.exports = __toCommonJS(devPlugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_SSRLiveReload = require("./SSRLiveReload");
-var import_utils = require("../utils");
+var import_lazy_utils = require("@module-federation/bridge-react/lazy-utils");
 const mfSSRDevPlugin = () => ({
   name: "@module-federation/modern-js",
   setup: (api) => {
@@ -48,7 +48,7 @@ const mfSSRDevPlugin = () => ({
       if (shouldUpdate) {
         console.log("should RELOAD", shouldUpdate);
         await nodeUtils.flushChunks();
-        (0, import_utils.flushDataFetch)();
+        (0, import_lazy_utils.flushDataFetch)();
         globalThis.shouldUpdate = true;
       }
     });

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

@@ -1,9 +1,7 @@
 "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 __export = (target, all) => {
   for (var name in all)
@@ -17,120 +15,26 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var injectDataFetchFunctionPlugin_exports = {};
 __export(injectDataFetchFunctionPlugin_exports, {
-  injectDataFetchFunctionPlugin: () => injectDataFetchFunctionPlugin,
-  setSSREnv: () => setSSREnv
+  injectDataFetchFunctionPlugin: () => injectDataFetchFunctionPlugin
 });
 module.exports = __toCommonJS(injectDataFetchFunctionPlugin_exports);
-var import_constant = require("../constant");
-var import_logger = __toESM(require("../logger"));
-var import_utils = require("../utils");
-var import_downgrade = require("./downgrade");
-function setSSREnv({ fetchServerQuery }) {
-  globalThis.FEDERATION_SSR = true;
-  globalThis.FEDERATION_SERVER_QUERY = fetchServerQuery;
-}
+var import_data_fetch_utils = require("@module-federation/bridge-react/data-fetch-utils");
+var import_lazy_utils = require("@module-federation/bridge-react/lazy-utils");
 const injectDataFetchFunctionPlugin = ({ fetchServerQuery }) => ({
   name: "@module-federation/inject-data-fetch-function-plugin",
   setup: (api) => {
     api.onBeforeRender(async () => {
-      var _globalThis, _DATA_FETCH_FUNCTION;
-      setSSREnv({
+      (0, import_lazy_utils.setSSREnv)({
         fetchServerQuery
       });
-      if (typeof window === "undefined") {
-        return;
-      }
-      const dataFetchFunction = async function(options) {
-        const [id, data, downgrade] = options;
-        import_logger.default.debug("==========call data fetch function!");
-        if (data) {
-          if (!id) {
-            throw new Error("id is required!");
-          }
-          if (!(0, import_utils.getDataFetchMap)()) {
-            (0, import_utils.initDataFetchMap)();
-          }
-          const dataFetchItem = (0, import_utils.getDataFetchItem)(id);
-          if (dataFetchItem) {
-            var _dataFetchItem__, _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] = import_constant.MF_DATA_FETCH_STATUS.LOADED;
-            return;
-          }
-          if (!dataFetchItem) {
-            const dataFetchMap = (0, import_utils.getDataFetchMap)();
-            let res;
-            let rej;
-            const p = new Promise((resolve, reject) => {
-              res = resolve;
-              rej = reject;
-            });
-            dataFetchMap[id] = [
-              [
-                async () => async () => {
-                  return "";
-                },
-                import_constant.MF_DATA_FETCH_TYPE.FETCH_SERVER
-              ],
-              [
-                p,
-                res,
-                rej
-              ],
-              import_constant.MF_DATA_FETCH_STATUS.LOADED
-            ];
-            res(data);
-            return;
-          }
-        }
-        if (downgrade) {
-          const mfDowngrade2 = (0, import_downgrade.getDowngradeTag)();
-          if (!mfDowngrade2) {
-            globalThis[import_constant.DOWNGRADE_KEY] = id ? [
-              id
-            ] : true;
-          } else if (Array.isArray(mfDowngrade2) && id && !mfDowngrade2.includes(id)) {
-            mfDowngrade2.push(id);
-          }
-        }
-        const mfDowngrade = (0, import_downgrade.getDowngradeTag)();
-        if (typeof mfDowngrade === "boolean") {
-          return (0, import_downgrade.callAllDowngrade)();
-        }
-        if (Array.isArray(mfDowngrade)) {
-          if (!id) {
-            globalThis[import_constant.DOWNGRADE_KEY] = true;
-            return (0, import_downgrade.callAllDowngrade)();
-          }
-          if (!mfDowngrade.includes(id)) {
-            mfDowngrade.push(id);
-          }
-          return (0, import_downgrade.callDowngrade)(id);
-        }
-      };
-      globalThis[import_constant.FS_HREF] = window.location.href;
-      (_globalThis = globalThis)[_DATA_FETCH_FUNCTION = import_constant.DATA_FETCH_FUNCTION] || (_globalThis[_DATA_FETCH_FUNCTION] = []);
-      const dataFetch = globalThis[import_constant.DATA_FETCH_FUNCTION];
-      await Promise.all(dataFetch.map(async (options) => {
-        await dataFetchFunction(options);
-      }));
-      dataFetch.push = dataFetchFunction;
+      await (0, import_data_fetch_utils.callDataFetch)();
     });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  injectDataFetchFunctionPlugin,
-  setSSREnv
+  injectDataFetchFunctionPlugin
 });

package/dist/esm/cli/configPlugin.js

@@ -138,7 +138,6 @@ var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy, enableSSR) {
   var runtimePlugins = _to_consumable_array(mfConfig.runtimePlugins || []);
   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);
   }
@@ -252,7 +251,7 @@ function patchBundlerConfig(options) {
     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");
+      var suffix = "".concat(encodeName(uniqueName), "-[contenthash].js");
       chain.output.chunkFilename(chunkFileName.replace(".js", suffix));
     }
   }
@@ -349,11 +348,13 @@ var moduleFederationConfigPlugin = function(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/cli/configPlugin.spec.js

@@ -43,7 +43,6 @@ describe("patchMFConfig", /* @__PURE__ */ _async_to_generator(function() {
           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")
           ],
@@ -77,8 +76,7 @@ describe("patchMFConfig", /* @__PURE__ */ _async_to_generator(function() {
           },
           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: {