@module-federation/data-prefetch 0.0.0-next-20240808065005 → 0.0.0-next-20240808083234

package/CHANGELOG.md

@@ -1,9 +1,9 @@
 @module-federation/data-prefetch
 
-## 0.0.0-next-20240808065005
+## 0.0.0-next-20240808083234
 
 ### Patch Changes
 
 - 3ddab21: feat(@module-federation/data-prefetch): support data prefetch in Module Federation
-  - @module-federation/runtime@0.0.0-next-20240808065005
-  - @module-federation/sdk@0.0.0-next-20240808065005
+  - @module-federation/runtime@0.0.0-next-20240808083234
+  - @module-federation/sdk@0.0.0-next-20240808083234

package/dist/esm/{chunk-WLE6YNDH.js → chunk-TW3B6M25.js}

@@ -3,13 +3,12 @@ import {
 } from "./chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "./chunk-JEPJP5O3.js";
+} from "./chunk-XYNYYK45.js";
 import {
   getSignalFromManifest
-} from "./chunk-EWCGK4XA.js";
+} from "./chunk-VWDP6NMM.js";
 
 // src/plugin.ts
-import { Module } from "@module-federation/runtime";
 import { getResourceUrl } from "@module-federation/sdk";
 var loadingArray = [];
 var strategy = "loaded-first";
@@ -89,71 +88,6 @@ var prefetchPlugin = () => ({
     }
     return options;
   },
-  handlePreloadModule(options) {
-    const { remoteSnapshot, name, id, preloadConfig, origin, remote } = options;
-    const snapshot = remoteSnapshot;
-    const signal = getSignalFromManifest(snapshot);
-    if (!signal) {
-      return options;
-    }
-    const prefetchOptions = {
-      name,
-      origin,
-      remote,
-      remoteSnapshot: snapshot
-    };
-    const instance = MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);
-    let prefetchUrl;
-    if (snapshot.prefetchEntry) {
-      prefetchUrl = getResourceUrl(snapshot, snapshot.prefetchEntry);
-    }
-    if (!preloadConfig.prefetchInterface) {
-      instance.loadEntry(prefetchUrl);
-      return options;
-    }
-    const promise = instance.loadEntry(prefetchUrl).then(async () => {
-      let module = origin.moduleCache.get(remote.name);
-      const moduleOptions = {
-        host: origin,
-        remoteInfo: remote
-      };
-      if (!module) {
-        module = new Module(moduleOptions);
-        origin.moduleCache.set(remote.name, module);
-      }
-      const idPart = id.split("/");
-      let expose = idPart[idPart.length - 1];
-      if (expose !== ".") {
-        expose = `./${expose}`;
-      }
-      await module.get(id, expose, {}, remoteSnapshot);
-      const projectExports = instance.getProjectExports();
-      if (projectExports instanceof Promise) {
-        await projectExports;
-      }
-      const exports = instance.getExposeExports(id);
-      logger_default.info(
-        `1. PreloadRemote Start Prefetch: ${id} - ${performance.now()}`
-      );
-      const result = Object.keys(exports).map((k) => {
-        const value = instance.prefetch({
-          id,
-          functionId: k
-        });
-        const functionId = k;
-        return {
-          value,
-          functionId
-        };
-      });
-      return result;
-    });
-    loadingArray.push({
-      id,
-      promise
-    });
-    return options;
-  },
   beforeLoadShare(options) {
     const shareInfo = options.shareInfo;
     sharedFlag = (shareInfo == null ? void 0 : shareInfo.strategy) || sharedFlag;

package/dist/esm/{chunk-QHQN3BPZ.js → chunk-V2LJYA45.js}

@@ -1,9 +1,9 @@
 import {
   MFDataPrefetch
-} from "./chunk-JEPJP5O3.js";
+} from "./chunk-XYNYYK45.js";
 import {
   getScope
-} from "./chunk-EWCGK4XA.js";
+} from "./chunk-VWDP6NMM.js";
 
 // src/universal/index.ts
 function prefetch(options) {

package/dist/esm/{chunk-EWCGK4XA.js → chunk-VWDP6NMM.js}

@@ -12,6 +12,7 @@ var getScope = (id) => {
   return name;
 };
 var getPrefetchId = (id) => encodeName(`${id}/${MFPrefetchCommon.identifier}`);
+var compatGetPrefetchId = (id) => encodeName(`${id}/VmokPrefetch`);
 var getSignalFromManifest = (remoteSnapshot) => {
   if (!remoteSnapshot) {
     return false;
@@ -28,5 +29,6 @@ var getSignalFromManifest = (remoteSnapshot) => {
 export {
   getScope,
   getPrefetchId,
+  compatGetPrefetchId,
   getSignalFromManifest
 };

package/dist/esm/{chunk-JEPJP5O3.js → chunk-XYNYYK45.js}

@@ -1,6 +1,7 @@
 import {
+  compatGetPrefetchId,
   getPrefetchId
-} from "./chunk-EWCGK4XA.js";
+} from "./chunk-VWDP6NMM.js";
 
 // src/prefetch.ts
 import {
@@ -91,19 +92,21 @@ var MFDataPrefetch = class {
   }
   getExposeExports(id) {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId];
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     return prefetchExports || {};
   }
   prefetch(prefetchOptions) {
     const { id, functionId = "default", refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
-    const prefetchExports = this._exports[prefetchId];
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     if (!prefetchExports) {
       return;
     }

package/dist/esm/cli/index.js

@@ -1,6 +1,6 @@
 import {
   getPrefetchId
-} from "../chunk-EWCGK4XA.js";
+} from "../chunk-VWDP6NMM.js";
 
 // src/cli/index.ts
 import path2 from "path";

package/dist/esm/index.js

@@ -1,11 +1,11 @@
 import {
   prefetchPlugin
-} from "./chunk-WLE6YNDH.js";
+} from "./chunk-TW3B6M25.js";
 import "./chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "./chunk-JEPJP5O3.js";
-import "./chunk-EWCGK4XA.js";
+} from "./chunk-XYNYYK45.js";
+import "./chunk-VWDP6NMM.js";
 export {
   MFDataPrefetch,
   prefetchPlugin

package/dist/esm/plugin.js

@@ -1,10 +1,10 @@
 import {
   plugin_default,
   prefetchPlugin
-} from "./chunk-WLE6YNDH.js";
+} from "./chunk-TW3B6M25.js";
 import "./chunk-TTJJJ2WZ.js";
-import "./chunk-JEPJP5O3.js";
-import "./chunk-EWCGK4XA.js";
+import "./chunk-XYNYYK45.js";
+import "./chunk-VWDP6NMM.js";
 export {
   plugin_default as default,
   prefetchPlugin

package/dist/esm/react/index.js

@@ -1,15 +1,15 @@
 import {
   prefetch
-} from "../chunk-QHQN3BPZ.js";
+} from "../chunk-V2LJYA45.js";
 import {
   logger_default
 } from "../chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "../chunk-JEPJP5O3.js";
+} from "../chunk-XYNYYK45.js";
 import {
   getScope
-} from "../chunk-EWCGK4XA.js";
+} from "../chunk-VWDP6NMM.js";
 
 // src/react/hooks.ts
 import { useEffect as useEffect2, useState } from "react";

package/dist/esm/universal/index.js

@@ -1,8 +1,8 @@
 import {
   prefetch
-} from "../chunk-QHQN3BPZ.js";
-import "../chunk-JEPJP5O3.js";
-import "../chunk-EWCGK4XA.js";
+} from "../chunk-V2LJYA45.js";
+import "../chunk-XYNYYK45.js";
+import "../chunk-VWDP6NMM.js";
 export {
   prefetch
 };

package/dist/index.js

@@ -32,6 +32,7 @@ var import_sdk2 = require("@module-federation/sdk");
 // src/common/runtime-utils.ts
 var import_sdk = require("@module-federation/sdk");
 var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
+var compatGetPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/VmokPrefetch`);
 var getSignalFromManifest = (remoteSnapshot) => {
   if (!remoteSnapshot) {
     return false;
@@ -127,19 +128,21 @@ var MFDataPrefetch = class {
   }
   getExposeExports(id) {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId];
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     return prefetchExports || {};
   }
   prefetch(prefetchOptions) {
     const { id, functionId = "default", refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
-    const prefetchExports = this._exports[prefetchId];
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     if (!prefetchExports) {
       return;
     }
@@ -192,7 +195,6 @@ var MFDataPrefetch = class {
 };
 
 // src/plugin.ts
-var import_runtime2 = require("@module-federation/runtime");
 var import_sdk4 = require("@module-federation/sdk");
 
 // src/logger/index.ts
@@ -278,71 +280,6 @@ var prefetchPlugin = () => ({
     }
     return options;
   },
-  handlePreloadModule(options) {
-    const { remoteSnapshot, name, id, preloadConfig, origin, remote } = options;
-    const snapshot = remoteSnapshot;
-    const signal = getSignalFromManifest(snapshot);
-    if (!signal) {
-      return options;
-    }
-    const prefetchOptions = {
-      name,
-      origin,
-      remote,
-      remoteSnapshot: snapshot
-    };
-    const instance = MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);
-    let prefetchUrl;
-    if (snapshot.prefetchEntry) {
-      prefetchUrl = (0, import_sdk4.getResourceUrl)(snapshot, snapshot.prefetchEntry);
-    }
-    if (!preloadConfig.prefetchInterface) {
-      instance.loadEntry(prefetchUrl);
-      return options;
-    }
-    const promise = instance.loadEntry(prefetchUrl).then(async () => {
-      let module2 = origin.moduleCache.get(remote.name);
-      const moduleOptions = {
-        host: origin,
-        remoteInfo: remote
-      };
-      if (!module2) {
-        module2 = new import_runtime2.Module(moduleOptions);
-        origin.moduleCache.set(remote.name, module2);
-      }
-      const idPart = id.split("/");
-      let expose = idPart[idPart.length - 1];
-      if (expose !== ".") {
-        expose = `./${expose}`;
-      }
-      await module2.get(id, expose, {}, remoteSnapshot);
-      const projectExports = instance.getProjectExports();
-      if (projectExports instanceof Promise) {
-        await projectExports;
-      }
-      const exports = instance.getExposeExports(id);
-      logger_default.info(
-        `1. PreloadRemote Start Prefetch: ${id} - ${performance.now()}`
-      );
-      const result = Object.keys(exports).map((k) => {
-        const value = instance.prefetch({
-          id,
-          functionId: k
-        });
-        const functionId = k;
-        return {
-          value,
-          functionId
-        };
-      });
-      return result;
-    });
-    loadingArray.push({
-      id,
-      promise
-    });
-    return options;
-  },
   beforeLoadShare(options) {
     const shareInfo = options.shareInfo;
     sharedFlag = (shareInfo == null ? void 0 : shareInfo.strategy) || sharedFlag;

package/dist/plugin.js

@@ -24,12 +24,12 @@ __export(plugin_exports, {
   prefetchPlugin: () => prefetchPlugin
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_runtime2 = require("@module-federation/runtime");
 var import_sdk4 = require("@module-federation/sdk");
 
 // src/common/runtime-utils.ts
 var import_sdk = require("@module-federation/sdk");
 var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
+var compatGetPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/VmokPrefetch`);
 var getSignalFromManifest = (remoteSnapshot) => {
   if (!remoteSnapshot) {
     return false;
@@ -127,19 +127,21 @@ var MFDataPrefetch = class {
   }
   getExposeExports(id) {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId];
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     return prefetchExports || {};
   }
   prefetch(prefetchOptions) {
     const { id, functionId = "default", refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
-    const prefetchExports = this._exports[prefetchId];
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     if (!prefetchExports) {
       return;
     }
@@ -274,71 +276,6 @@ var prefetchPlugin = () => ({
     }
     return options;
   },
-  handlePreloadModule(options) {
-    const { remoteSnapshot, name, id, preloadConfig, origin, remote } = options;
-    const snapshot = remoteSnapshot;
-    const signal = getSignalFromManifest(snapshot);
-    if (!signal) {
-      return options;
-    }
-    const prefetchOptions = {
-      name,
-      origin,
-      remote,
-      remoteSnapshot: snapshot
-    };
-    const instance = MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);
-    let prefetchUrl;
-    if (snapshot.prefetchEntry) {
-      prefetchUrl = (0, import_sdk4.getResourceUrl)(snapshot, snapshot.prefetchEntry);
-    }
-    if (!preloadConfig.prefetchInterface) {
-      instance.loadEntry(prefetchUrl);
-      return options;
-    }
-    const promise = instance.loadEntry(prefetchUrl).then(async () => {
-      let module2 = origin.moduleCache.get(remote.name);
-      const moduleOptions = {
-        host: origin,
-        remoteInfo: remote
-      };
-      if (!module2) {
-        module2 = new import_runtime2.Module(moduleOptions);
-        origin.moduleCache.set(remote.name, module2);
-      }
-      const idPart = id.split("/");
-      let expose = idPart[idPart.length - 1];
-      if (expose !== ".") {
-        expose = `./${expose}`;
-      }
-      await module2.get(id, expose, {}, remoteSnapshot);
-      const projectExports = instance.getProjectExports();
-      if (projectExports instanceof Promise) {
-        await projectExports;
-      }
-      const exports = instance.getExposeExports(id);
-      logger_default.info(
-        `1. PreloadRemote Start Prefetch: ${id} - ${performance.now()}`
-      );
-      const result = Object.keys(exports).map((k) => {
-        const value = instance.prefetch({
-          id,
-          functionId: k
-        });
-        const functionId = k;
-        return {
-          value,
-          functionId
-        };
-      });
-      return result;
-    });
-    loadingArray.push({
-      id,
-      promise
-    });
-    return options;
-  },
   beforeLoadShare(options) {
     const shareInfo = options.shareInfo;
     sharedFlag = (shareInfo == null ? void 0 : shareInfo.strategy) || sharedFlag;

package/dist/react/index.js

@@ -46,6 +46,7 @@ var getScope = (id) => {
   return name;
 };
 var getPrefetchId = (id) => (0, import_sdk2.encodeName)(`${id}/${import_sdk2.MFPrefetchCommon.identifier}`);
+var compatGetPrefetchId = (id) => (0, import_sdk2.encodeName)(`${id}/VmokPrefetch`);
 
 // src/prefetch.ts
 globalThis.__FEDERATION__ ?? (globalThis.__FEDERATION__ = {});
@@ -129,19 +130,21 @@ var MFDataPrefetch = class {
   }
   getExposeExports(id) {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId];
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     return prefetchExports || {};
   }
   prefetch(prefetchOptions) {
     const { id, functionId = "default", refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
-    const prefetchExports = this._exports[prefetchId];
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     if (!prefetchExports) {
       return;
     }

package/dist/universal/index.js

@@ -39,6 +39,7 @@ var getScope = (id) => {
   return name;
 };
 var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
+var compatGetPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/VmokPrefetch`);
 
 // src/prefetch.ts
 globalThis.__FEDERATION__ ?? (globalThis.__FEDERATION__ = {});
@@ -122,19 +123,21 @@ var MFDataPrefetch = class {
   }
   getExposeExports(id) {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId];
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     return prefetchExports || {};
   }
   prefetch(prefetchOptions) {
     const { id, functionId = "default", refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
-    const prefetchExports = this._exports[prefetchId];
+    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
     if (!prefetchExports) {
       return;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.0.0-next-20240808065005",
+  "version": "0.0.0-next-20240808083234",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
@@ -85,8 +85,8 @@
   },
   "dependencies": {
     "fs-extra": "9.1.0",
-    "@module-federation/sdk": "0.0.0-next-20240808065005",
-    "@module-federation/runtime": "0.0.0-next-20240808065005"
+    "@module-federation/sdk": "0.0.0-next-20240808083234",
+    "@module-federation/runtime": "0.0.0-next-20240808083234"
   },
   "scripts": {
     "dev": "cross-env WATCH=true tsup",

package/src/common/runtime-utils.ts

@@ -16,6 +16,9 @@ export const getScope = (id: string): string => {
 export const getPrefetchId = (id: string): string =>
   encodeName(`${id}/${MFPrefetchCommon.identifier}`);
 
+export const compatGetPrefetchId = (id: string): string =>
+  encodeName(`${id}/VmokPrefetch`);
+
 export const getSignalFromManifest = (remoteSnapshot: ModuleInfo): boolean => {
   if (!remoteSnapshot) {
     return false;

package/src/plugin.ts

@@ -1,26 +1,10 @@
-import { Module } from '@module-federation/runtime';
-import type {
-  FederationRuntimePlugin,
-  RemoteInfo,
-} from '@module-federation/runtime/types';
+import type { FederationRuntimePlugin } from '@module-federation/runtime/types';
 import { ModuleInfo, getResourceUrl } from '@module-federation/sdk';
 
 import { getSignalFromManifest } from './common/runtime-utils';
 import { MFDataPrefetch } from './prefetch';
 import logger from './logger';
 
-type depsPreloadArg = Omit<PreloadRemoteArgs, 'depsRemote'>;
-
-interface PreloadRemoteArgs {
-  nameOrAlias: string;
-  exposes?: Array<string>;
-  resourceCategory?: 'all' | 'sync';
-  share?: boolean;
-  depsRemote?: boolean | Array<depsPreloadArg>;
-  filter?: (assetUrl: string) => boolean;
-  prefetchInterface?: boolean;
-}
-
 interface Loading {
   id: string;
   promise: Promise<
@@ -122,84 +106,6 @@ export const prefetchPlugin = (): FederationRuntimePlugin => ({
     return options;
   },
 
-  handlePreloadModule(options) {
-    const { remoteSnapshot, name, id, preloadConfig, origin, remote } = options;
-    const snapshot = remoteSnapshot as ModuleInfo;
-
-    const signal = getSignalFromManifest(snapshot);
-    if (!signal) {
-      return options;
-    }
-
-    const prefetchOptions = {
-      name,
-      origin,
-      remote,
-      remoteSnapshot: snapshot,
-    };
-    const instance =
-      MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);
-
-    let prefetchUrl;
-    // @ts-expect-error
-    if (snapshot.prefetchEntry) {
-      // @ts-expect-error
-      prefetchUrl = getResourceUrl(snapshot, snapshot.prefetchEntry);
-    }
-
-    if (!preloadConfig.prefetchInterface) {
-      // @ts-ignore
-      instance.loadEntry(prefetchUrl);
-      return options;
-    }
-
-    const promise = instance.loadEntry(prefetchUrl).then(async () => {
-      let module = origin.moduleCache.get(remote.name);
-      const moduleOptions = {
-        host: origin,
-        remoteInfo: remote as RemoteInfo,
-      };
-      if (!module) {
-        module = new Module(moduleOptions);
-        origin.moduleCache.set(remote.name, module);
-      }
-      const idPart = id.split('/');
-      let expose = idPart[idPart.length - 1];
-      if (expose !== '.') {
-        expose = `./${expose}`;
-      }
-      await module.get(id, expose, {}, remoteSnapshot);
-
-      const projectExports = instance!.getProjectExports();
-      if (projectExports instanceof Promise) {
-        await projectExports;
-      }
-      const exports = instance!.getExposeExports(id);
-      logger.info(
-        `1. PreloadRemote Start Prefetch: ${id} - ${performance.now()}`,
-      );
-      const result = Object.keys(exports).map((k) => {
-        const value = instance!.prefetch({
-          id,
-          functionId: k,
-        });
-        const functionId = k;
-
-        return {
-          value,
-          functionId,
-        };
-      });
-      return result;
-    });
-
-    loadingArray.push({
-      id,
-      promise,
-    });
-    return options;
-  },
-
   beforeLoadShare(options) {
     const shareInfo = options.shareInfo;
     sharedFlag = shareInfo?.strategy || sharedFlag;

package/src/prefetch.ts

@@ -10,7 +10,7 @@ import {
 } from '@module-federation/sdk';
 import { Remote } from '@module-federation/runtime/types';
 
-import { getPrefetchId } from './common/runtime-utils';
+import { getPrefetchId, compatGetPrefetchId } from './common/runtime-utils';
 
 declare module '@module-federation/runtime' {
   export interface Federation {
@@ -137,7 +137,9 @@ export class MFDataPrefetch {
 
   getExposeExports(id: string): PrefetchExports {
     const prefetchId = getPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId] as PrefetchExports;
+    const compatId = compatGetPrefetchId(id);
+    const prefetchExports =
+      this._exports[prefetchId] || (this._exports[compatId] as PrefetchExports);
     return prefetchExports || {};
   }
 
@@ -145,13 +147,15 @@ export class MFDataPrefetch {
     const { id, functionId = 'default', refetchParams } = prefetchOptions;
     let prefetchResult;
     const prefetchId = getPrefetchId(id);
+    const compatId = compatGetPrefetchId(id);
     const memorizeId = id + functionId;
     const memory = this.prefetchMemory.get(memorizeId);
     if (!this.checkOutdate(prefetchOptions) && memory) {
       return memory;
     }
 
-    const prefetchExports = this._exports[prefetchId] as PrefetchExports;
+    const prefetchExports =
+      this._exports[prefetchId] || (this._exports[compatId] as PrefetchExports);
     if (!prefetchExports) {
       return;
     }