@module-federation/data-prefetch 0.0.0-next-20240911074627 → 0.0.0-next-20240918080432

package/CHANGELOG.md

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

package/dist/cli/index.js

@@ -63,6 +63,7 @@ var fixPrefetchPath = (exposePath) => {
 };
 
 // src/common/runtime-utils.ts
+var import_runtime = require("@module-federation/runtime");
 var import_sdk = require("@module-federation/sdk");
 var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
 
@@ -77,6 +78,7 @@ var PrefetchPlugin = class {
     this._reWriteExports = "";
   }
   apply(compiler) {
+    var _a, _b;
     const { name, exposes } = this.options;
     if (!exposes) {
       return;
@@ -88,12 +90,14 @@ var PrefetchPlugin = class {
     if (!Array.isArray(runtimePlugins)) {
       this.options.runtimePlugins = [];
     }
-    this.options.runtimePlugins.push(
-      import_path2.default.resolve(__dirname, "../esm/plugin.js")
-    );
-    this.options.runtimePlugins.push(
-      import_path2.default.resolve(__dirname, "../esm/shared/index.js")
-    );
+    const runtimePath = import_path2.default.resolve(__dirname, "../esm/plugin.js");
+    const sharedPath = import_path2.default.resolve(__dirname, "../esm/shared/index.js");
+    if (!((_a = this.options.runtimePlugins) == null ? void 0 : _a.includes(runtimePath))) {
+      this.options.runtimePlugins.push(runtimePath);
+    }
+    if (!((_b = this.options.runtimePlugins) == null ? void 0 : _b.includes(sharedPath))) {
+      this.options.runtimePlugins.push(sharedPath);
+    }
     const encodedName = (0, import_sdk2.encodeName)(name);
     const asyncEntryPath = import_path2.default.resolve(
       compiler.options.context,

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

@@ -1,15 +1,11 @@
 // src/common/runtime-utils.ts
+import { getInstance } from "@module-federation/runtime";
 import {
   encodeName,
   MFPrefetchCommon
 } from "@module-federation/sdk";
-var getScope = (id) => {
-  const idArray = id.split("/");
-  if (idArray.length >= 2) {
-    idArray.pop();
-  }
-  const name = idArray.join("/");
-  return name;
+var getScope = () => {
+  return getInstance().options.name;
 };
 var getPrefetchId = (id) => encodeName(`${id}/${MFPrefetchCommon.identifier}`);
 var compatGetPrefetchId = (id) => encodeName(`${id}/VmokPrefetch`);

package/dist/esm/{chunk-57ZXBP7D.js → chunk-ISLXMAIA.js}

@@ -1,7 +1,7 @@
 import {
   compatGetPrefetchId,
   getPrefetchId
-} from "./chunk-VWDP6NMM.js";
+} from "./chunk-AJPO2B2T.js";
 
 // src/prefetch.ts
 import {

package/dist/esm/{chunk-OIIVUMED.js → chunk-KI4QGPIS.js}

@@ -1,14 +1,14 @@
 import {
   MFDataPrefetch
-} from "./chunk-57ZXBP7D.js";
+} from "./chunk-ISLXMAIA.js";
 import {
   getScope
-} from "./chunk-VWDP6NMM.js";
+} from "./chunk-AJPO2B2T.js";
 
 // src/universal/index.ts
 function prefetch(options) {
-  const { id, functionId } = options;
-  const mfScope = getScope(id);
+  const { id, functionId = "default" } = options;
+  const mfScope = getScope();
   const prefetchInstance = MFDataPrefetch.getInstance(mfScope) || new MFDataPrefetch({
     name: mfScope
   });

package/dist/esm/{chunk-YXTPJG2M.js → chunk-VVZ6XIM6.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "./chunk-57ZXBP7D.js";
+} from "./chunk-ISLXMAIA.js";
 import {
   getSignalFromManifest
-} from "./chunk-VWDP6NMM.js";
+} from "./chunk-AJPO2B2T.js";
 
 // src/plugin.ts
 import { getResourceUrl } from "@module-federation/sdk";

package/dist/esm/cli/index.js

@@ -1,6 +1,6 @@
 import {
   getPrefetchId
-} from "../chunk-VWDP6NMM.js";
+} from "../chunk-AJPO2B2T.js";
 import {
   __require
 } from "../chunk-EZUCZHGV.js";
@@ -52,6 +52,7 @@ var PrefetchPlugin = class {
     this._reWriteExports = "";
   }
   apply(compiler) {
+    var _a, _b;
     const { name, exposes } = this.options;
     if (!exposes) {
       return;
@@ -63,12 +64,14 @@ var PrefetchPlugin = class {
     if (!Array.isArray(runtimePlugins)) {
       this.options.runtimePlugins = [];
     }
-    this.options.runtimePlugins.push(
-      path2.resolve(__dirname, "../esm/plugin.js")
-    );
-    this.options.runtimePlugins.push(
-      path2.resolve(__dirname, "../esm/shared/index.js")
-    );
+    const runtimePath = path2.resolve(__dirname, "../esm/plugin.js");
+    const sharedPath = path2.resolve(__dirname, "../esm/shared/index.js");
+    if (!((_a = this.options.runtimePlugins) == null ? void 0 : _a.includes(runtimePath))) {
+      this.options.runtimePlugins.push(runtimePath);
+    }
+    if (!((_b = this.options.runtimePlugins) == null ? void 0 : _b.includes(sharedPath))) {
+      this.options.runtimePlugins.push(sharedPath);
+    }
     const encodedName = encodeName(name);
     const asyncEntryPath = path2.resolve(
       compiler.options.context,

package/dist/esm/index.js

@@ -1,11 +1,11 @@
 import {
   prefetchPlugin
-} from "./chunk-YXTPJG2M.js";
+} from "./chunk-VVZ6XIM6.js";
 import "./chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "./chunk-57ZXBP7D.js";
-import "./chunk-VWDP6NMM.js";
+} from "./chunk-ISLXMAIA.js";
+import "./chunk-AJPO2B2T.js";
 import "./chunk-EZUCZHGV.js";
 export {
   MFDataPrefetch,

package/dist/esm/plugin.js

@@ -1,10 +1,10 @@
 import {
   plugin_default,
   prefetchPlugin
-} from "./chunk-YXTPJG2M.js";
+} from "./chunk-VVZ6XIM6.js";
 import "./chunk-TTJJJ2WZ.js";
-import "./chunk-57ZXBP7D.js";
-import "./chunk-VWDP6NMM.js";
+import "./chunk-ISLXMAIA.js";
+import "./chunk-AJPO2B2T.js";
 import "./chunk-EZUCZHGV.js";
 export {
   plugin_default as default,

package/dist/esm/react/index.js

@@ -1,15 +1,15 @@
 import {
   prefetch
-} from "../chunk-OIIVUMED.js";
+} from "../chunk-KI4QGPIS.js";
 import {
   logger_default
 } from "../chunk-TTJJJ2WZ.js";
 import {
   MFDataPrefetch
-} from "../chunk-57ZXBP7D.js";
+} from "../chunk-ISLXMAIA.js";
 import {
   getScope
-} from "../chunk-VWDP6NMM.js";
+} from "../chunk-AJPO2B2T.js";
 import "../chunk-EZUCZHGV.js";
 
 // src/react/hooks.ts
@@ -39,7 +39,7 @@ var usePrefetch = (options) => {
     id,
     functionId
   };
-  const mfScope = getScope(id);
+  const mfScope = getScope();
   let state;
   const prefetchResult = prefetch(options);
   if (deferId) {

package/dist/esm/universal/index.js

@@ -1,8 +1,8 @@
 import {
   prefetch
-} from "../chunk-OIIVUMED.js";
-import "../chunk-57ZXBP7D.js";
-import "../chunk-VWDP6NMM.js";
+} from "../chunk-KI4QGPIS.js";
+import "../chunk-ISLXMAIA.js";
+import "../chunk-AJPO2B2T.js";
 import "../chunk-EZUCZHGV.js";
 export {
   prefetch

package/dist/index.js

@@ -26,10 +26,11 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/prefetch.ts
-var import_runtime = require("@module-federation/runtime");
+var import_runtime2 = require("@module-federation/runtime");
 var import_sdk2 = require("@module-federation/sdk");
 
 // src/common/runtime-utils.ts
+var import_runtime = require("@module-federation/runtime");
 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`);
@@ -78,9 +79,9 @@ var MFDataPrefetch = class {
       }
       return this.global.entryLoading[uniqueKey];
     } else {
-      const remoteInfo = (0, import_runtime.getRemoteInfo)(remote);
+      const remoteInfo = (0, import_runtime2.getRemoteInfo)(remote);
       const module2 = origin.moduleCache.get(remoteInfo.name);
-      return (0, import_runtime.getRemoteEntry)({
+      return (0, import_runtime2.getRemoteEntry)({
         origin,
         remoteInfo,
         remoteEntryExports: module2 ? module2.remoteEntryExports : void 0

package/dist/plugin.js

@@ -27,6 +27,7 @@ module.exports = __toCommonJS(plugin_exports);
 var import_sdk4 = require("@module-federation/sdk");
 
 // src/common/runtime-utils.ts
+var import_runtime = require("@module-federation/runtime");
 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`);
@@ -44,7 +45,7 @@ var getSignalFromManifest = (remoteSnapshot) => {
 };
 
 // src/prefetch.ts
-var import_runtime = require("@module-federation/runtime");
+var import_runtime2 = require("@module-federation/runtime");
 var import_sdk2 = require("@module-federation/sdk");
 globalThis.__FEDERATION__ ?? (globalThis.__FEDERATION__ = {});
 var _a;
@@ -77,9 +78,9 @@ var MFDataPrefetch = class {
       }
       return this.global.entryLoading[uniqueKey];
     } else {
-      const remoteInfo = (0, import_runtime.getRemoteInfo)(remote);
+      const remoteInfo = (0, import_runtime2.getRemoteInfo)(remote);
       const module2 = origin.moduleCache.get(remoteInfo.name);
-      return (0, import_runtime.getRemoteEntry)({
+      return (0, import_runtime2.getRemoteEntry)({
         origin,
         remoteInfo,
         remoteEntryExports: module2 ? module2.remoteEntryExports : void 0

package/dist/react/index.js

@@ -32,18 +32,14 @@ var import_sdk = require("@module-federation/sdk");
 var logger_default = new import_sdk.Logger("[Module Federation Data Prefetch]");
 
 // src/prefetch.ts
-var import_runtime = require("@module-federation/runtime");
+var import_runtime2 = require("@module-federation/runtime");
 var import_sdk3 = require("@module-federation/sdk");
 
 // src/common/runtime-utils.ts
+var import_runtime = require("@module-federation/runtime");
 var import_sdk2 = require("@module-federation/sdk");
-var getScope = (id) => {
-  const idArray = id.split("/");
-  if (idArray.length >= 2) {
-    idArray.pop();
-  }
-  const name = idArray.join("/");
-  return name;
+var getScope = () => {
+  return (0, import_runtime.getInstance)().options.name;
 };
 var getPrefetchId = (id) => (0, import_sdk2.encodeName)(`${id}/${import_sdk2.MFPrefetchCommon.identifier}`);
 var compatGetPrefetchId = (id) => (0, import_sdk2.encodeName)(`${id}/VmokPrefetch`);
@@ -80,9 +76,9 @@ var MFDataPrefetch = class {
       }
       return this.global.entryLoading[uniqueKey];
     } else {
-      const remoteInfo = (0, import_runtime.getRemoteInfo)(remote);
+      const remoteInfo = (0, import_runtime2.getRemoteInfo)(remote);
       const module2 = origin.moduleCache.get(remoteInfo.name);
-      return (0, import_runtime.getRemoteEntry)({
+      return (0, import_runtime2.getRemoteEntry)({
         origin,
         remoteInfo,
         remoteEntryExports: module2 ? module2.remoteEntryExports : void 0
@@ -190,8 +186,8 @@ var MFDataPrefetch = class {
 
 // src/universal/index.ts
 function prefetch(options) {
-  const { id, functionId } = options;
-  const mfScope = getScope(id);
+  const { id, functionId = "default" } = options;
+  const mfScope = getScope();
   const prefetchInstance = MFDataPrefetch.getInstance(mfScope) || new MFDataPrefetch({
     name: mfScope
   });
@@ -234,7 +230,7 @@ var usePrefetch = (options) => {
     id,
     functionId
   };
-  const mfScope = getScope(id);
+  const mfScope = getScope();
   let state;
   const prefetchResult = prefetch(options);
   if (deferId) {

package/dist/universal/index.js

@@ -25,18 +25,14 @@ __export(universal_exports, {
 module.exports = __toCommonJS(universal_exports);
 
 // src/prefetch.ts
-var import_runtime = require("@module-federation/runtime");
+var import_runtime2 = require("@module-federation/runtime");
 var import_sdk2 = require("@module-federation/sdk");
 
 // src/common/runtime-utils.ts
+var import_runtime = require("@module-federation/runtime");
 var import_sdk = require("@module-federation/sdk");
-var getScope = (id) => {
-  const idArray = id.split("/");
-  if (idArray.length >= 2) {
-    idArray.pop();
-  }
-  const name = idArray.join("/");
-  return name;
+var getScope = () => {
+  return (0, import_runtime.getInstance)().options.name;
 };
 var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
 var compatGetPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/VmokPrefetch`);
@@ -73,9 +69,9 @@ var MFDataPrefetch = class {
       }
       return this.global.entryLoading[uniqueKey];
     } else {
-      const remoteInfo = (0, import_runtime.getRemoteInfo)(remote);
+      const remoteInfo = (0, import_runtime2.getRemoteInfo)(remote);
       const module2 = origin.moduleCache.get(remoteInfo.name);
-      return (0, import_runtime.getRemoteEntry)({
+      return (0, import_runtime2.getRemoteEntry)({
         origin,
         remoteInfo,
         remoteEntryExports: module2 ? module2.remoteEntryExports : void 0
@@ -183,8 +179,8 @@ var MFDataPrefetch = class {
 
 // src/universal/index.ts
 function prefetch(options) {
-  const { id, functionId } = options;
-  const mfScope = getScope(id);
+  const { id, functionId = "default" } = options;
+  const mfScope = getScope();
   const prefetchInstance = MFDataPrefetch.getInstance(mfScope) || new MFDataPrefetch({
     name: mfScope
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.0.0-next-20240911074627",
+  "version": "0.0.0-next-20240918080432",
   "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-20240911074627",
-    "@module-federation/runtime": "0.0.0-next-20240911074627"
+    "@module-federation/sdk": "0.0.0-next-20240918080432",
+    "@module-federation/runtime": "0.0.0-next-20240918080432"
   },
   "scripts": {
     "dev": "cross-env WATCH=true tsup",

package/src/cli/index.ts

@@ -46,12 +46,16 @@ export class PrefetchPlugin implements WebpackPluginInstance {
     if (!Array.isArray(runtimePlugins)) {
       this.options.runtimePlugins = [];
     }
-    this.options.runtimePlugins!.push(
-      path.resolve(__dirname, '../esm/plugin.js'),
-    );
-    this.options.runtimePlugins!.push(
-      path.resolve(__dirname, '../esm/shared/index.js'),
-    );
+
+    const runtimePath = path.resolve(__dirname, '../esm/plugin.js');
+    const sharedPath = path.resolve(__dirname, '../esm/shared/index.js');
+    if (!this.options.runtimePlugins?.includes(runtimePath)) {
+      this.options.runtimePlugins!.push(runtimePath);
+    }
+    if (!this.options.runtimePlugins?.includes(sharedPath)) {
+      this.options.runtimePlugins!.push(sharedPath);
+    }
+
     const encodedName = encodeName(name as string);
     const asyncEntryPath = path.resolve(
       compiler.options.context,

package/src/common/runtime-utils.ts

@@ -1,16 +1,12 @@
+import { getInstance } from '@module-federation/runtime';
 import {
   encodeName,
   ModuleInfo,
   MFPrefetchCommon,
 } from '@module-federation/sdk';
 
-export const getScope = (id: string): string => {
-  const idArray = id.split('/');
-  if (idArray.length >= 2) {
-    idArray.pop();
-  }
-  const name = idArray.join('/');
-  return name;
+export const getScope = (): string => {
+  return getInstance()!.options.name;
 };
 
 export const getPrefetchId = (id: string): string =>

package/src/react/hooks.ts

@@ -35,7 +35,7 @@ export const usePrefetch = <T>(
     id,
     functionId,
   };
-  const mfScope = getScope(id);
+  const mfScope = getScope();
 
   let state;
   const prefetchResult = prefetch(options);

package/src/universal/index.ts

@@ -2,8 +2,8 @@ import { MFDataPrefetch, type prefetchOptions } from '../prefetch';
 import { getScope } from '../common/runtime-utils';
 
 export function prefetch(options: prefetchOptions): Promise<any> {
-  const { id, functionId } = options;
-  const mfScope = getScope(id);
+  const { id, functionId = 'default' } = options;
+  const mfScope = getScope();
 
   const prefetchInstance =
     MFDataPrefetch.getInstance(mfScope) ||