@module-federation/data-prefetch 0.0.0-next-20241115035905 → 0.0.0-next-20241117184153

package/CHANGELOG.md

@@ -1,12 +1,11 @@
 # @module-federation/data-prefetch
 
-## 0.0.0-next-20241115035905
+## 0.0.0-next-20241117184153
 
 ### Patch Changes
 
-- @module-federation/runtime@0.0.0-next-20241115035905
-- @module-federation/sdk@0.0.0-next-20241115035905
-- @module-federation/runtime-core@0.0.0-next-20241115035905
+- @module-federation/runtime@0.0.0-next-20241117184153
+- @module-federation/sdk@0.0.0-next-20241117184153
 
 ## 0.7.4
 

package/dist/src/prefetch.d.ts

@@ -1,13 +1,14 @@
 import { FederationHost } from '@module-federation/runtime';
 import { ModuleInfo } from '@module-federation/sdk';
 import { Remote } from '@module-federation/runtime/types';
-import { Federation } from '@module-federation/runtime-core';
-interface FederationWithPrefetch extends Federation {
-    __PREFETCH__: {
-        entryLoading: Record<string, undefined | Promise<void>>;
-        instance: Map<string, MFDataPrefetch>;
-        __PREFETCH_EXPORTS__: Record<string, () => Promise<Record<string, any>>>;
-    };
+declare module '@module-federation/runtime' {
+    interface Federation {
+        __PREFETCH__: {
+            entryLoading: Record<string, undefined | Promise<void>>;
+            instance: Map<string, MFDataPrefetch>;
+            __PREFETCH_EXPORTS__: Record<string, () => Promise<Record<string, any>>>;
+        };
+    }
 }
 type PrefetchExports = Record<string, any>;
 export interface DataPrefetchOptions {
@@ -28,7 +29,7 @@ export declare class MFDataPrefetch {
     private _exports;
     private _options;
     constructor(options: DataPrefetchOptions);
-    get global(): FederationWithPrefetch['__PREFETCH__'];
+    get global(): Record<string, any>;
     static getInstance(id: string): MFDataPrefetch | undefined;
     loadEntry(entry: string | undefined): Promise<any>;
     getProjectExports(): Promise<void> | Record<string, any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.0.0-next-20241115035905",
+  "version": "0.0.0-next-20241117184153",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
@@ -78,9 +78,8 @@
   },
   "dependencies": {
     "fs-extra": "9.1.0",
-    "@module-federation/runtime": "0.0.0-next-20241115035905",
-    "@module-federation/runtime-core": "0.0.0-next-20241115035905",
-    "@module-federation/sdk": "0.0.0-next-20241115035905"
+    "@module-federation/runtime": "0.0.0-next-20241117184153",
+    "@module-federation/sdk": "0.0.0-next-20241117184153"
   },
   "scripts": {
     "test": "jest"

package/src/prefetch.ts

@@ -9,16 +9,17 @@ import {
   ProviderModuleInfo,
 } from '@module-federation/sdk';
 import { Remote } from '@module-federation/runtime/types';
-import { Federation } from '@module-federation/runtime-core';
+
 import { getPrefetchId, compatGetPrefetchId } from './common/runtime-utils';
 
-// Define an interface that extends Federation to include __PREFETCH__
-interface FederationWithPrefetch extends Federation {
-  __PREFETCH__: {
-    entryLoading: Record<string, undefined | Promise<void>>;
-    instance: Map<string, MFDataPrefetch>;
-    __PREFETCH_EXPORTS__: Record<string, () => Promise<Record<string, any>>>;
-  };
+declare module '@module-federation/runtime' {
+  export interface Federation {
+    __PREFETCH__: {
+      entryLoading: Record<string, undefined | Promise<void>>;
+      instance: Map<string, MFDataPrefetch>;
+      __PREFETCH_EXPORTS__: Record<string, () => Promise<Record<string, any>>>;
+    };
+  }
 }
 
 type PrefetchExports = Record<string, any>;
@@ -39,13 +40,11 @@ export interface prefetchOptions {
 
 // @ts-ignore init global variable for test
 globalThis.__FEDERATION__ ??= {};
-(
-  globalThis.__FEDERATION__ as unknown as FederationWithPrefetch
-).__PREFETCH__ ??= {
+globalThis.__FEDERATION__.__PREFETCH__ ??= {
   entryLoading: {},
   instance: new Map(),
   __PREFETCH_EXPORTS__: {},
-} as FederationWithPrefetch['__PREFETCH__'];
+};
 export class MFDataPrefetch {
   public prefetchMemory: Map<string, Promise<any>>;
   public recordOutdate: Record<string, Record<string, boolean>>;
@@ -60,15 +59,12 @@ export class MFDataPrefetch {
     this.global.instance.set(options.name, this);
   }
 
-  get global(): FederationWithPrefetch['__PREFETCH__'] {
-    return (globalThis.__FEDERATION__ as unknown as FederationWithPrefetch)
-      .__PREFETCH__;
+  get global(): Record<string, any> {
+    return globalThis.__FEDERATION__.__PREFETCH__;
   }
 
   static getInstance(id: string): MFDataPrefetch | undefined {
-    return (
-      globalThis.__FEDERATION__ as unknown as FederationWithPrefetch
-    ).__PREFETCH__.instance.get(id);
+    return globalThis.__FEDERATION__.__PREFETCH__.instance.get(id);
   }
 
   async loadEntry(entry: string | undefined): Promise<any> {
@@ -98,9 +94,8 @@ export class MFDataPrefetch {
       return this._exports;
     }
     const { name } = this._options;
-    const exportsPromiseFn = (
-      globalThis.__FEDERATION__ as unknown as FederationWithPrefetch
-    ).__PREFETCH__.__PREFETCH_EXPORTS__?.[name];
+    const exportsPromiseFn =
+      globalThis.__FEDERATION__.__PREFETCH__.__PREFETCH_EXPORTS__?.[name];
     const exportsPromise =
       typeof exportsPromiseFn === 'function'
         ? exportsPromiseFn()