@module-federation/runtime 0.1.15 → 0.1.17

package/dist/index.cjs.js

@@ -243,7 +243,7 @@ let Module = class Module {
         return this.remoteEntryExports;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async get(expose, options) {
+    async get(id, expose, options) {
         const { loadFactory = true } = options || {
             loadFactory: true
         };
@@ -284,12 +284,38 @@ let Module = class Module {
         // get exposeGetter
         const moduleFactory = await remoteEntryExports.get(expose);
         share.assert(moduleFactory, `${share.getFMId(this.remoteInfo)} remote don't export ${expose}.`);
+        const wrapModuleFactory = this.wraperFactory(moduleFactory, id);
         if (!loadFactory) {
-            return moduleFactory;
+            return wrapModuleFactory;
         }
-        const exposeContent = await moduleFactory();
+        const exposeContent = await wrapModuleFactory();
         return exposeContent;
     }
+    wraperFactory(moduleFactory, id) {
+        function defineModuleId(res, id) {
+            if (res && typeof res === 'object' && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
+                Object.defineProperty(res, Symbol.for('mf_module_id'), {
+                    value: id,
+                    enumerable: false
+                });
+            }
+        }
+        if (moduleFactory instanceof Promise) {
+            return async ()=>{
+                const res = await moduleFactory();
+                // This parameter is used for bridge debugging
+                defineModuleId(res, id);
+                return res;
+            };
+        } else {
+            return ()=>{
+                const res = moduleFactory();
+                // This parameter is used for bridge debugging
+                defineModuleId(res, id);
+                return res;
+            };
+        }
+    }
     constructor({ remoteInfo, host }){
         this.inited = false;
         this.lib = undefined;
@@ -1500,7 +1526,7 @@ class RemoteHandler {
                 id
             });
             const { pkgNameOrAlias, remote, expose, id: idRes } = remoteMatchInfo;
-            const moduleOrFactory = await module.get(expose, options);
+            const moduleOrFactory = await module.get(idRes, expose, options);
             const moduleWrapper = await this.hooks.lifecycle.onLoad.emit({
                 id: idRes,
                 pkgNameOrAlias,
@@ -1537,7 +1563,7 @@ class RemoteHandler {
     async preloadRemote(preloadOptions) {
         const { host } = this;
         await this.hooks.lifecycle.beforePreloadRemote.emit({
-            preloadOptions,
+            preloadOps: preloadOptions,
             options: host.options,
             origin: host
         });
@@ -1678,9 +1704,10 @@ class RemoteHandler {
         }
         const loadedModule = host.moduleCache.get(remote.name);
         if (loadedModule) {
+            var _Object_getOwnPropertyDescriptor;
             const remoteInfo = loadedModule.remoteInfo;
             const key = remoteInfo.entryGlobalName;
-            if (globalThis[key]) {
+            if (globalThis[key] && ((_Object_getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor(globalThis, key)) == null ? void 0 : _Object_getOwnPropertyDescriptor.configurable)) {
                 delete globalThis[key];
             }
             const remoteEntryUniqueKey = getRemoteEntryUniqueKey(loadedModule.remoteInfo);
@@ -1752,7 +1779,7 @@ class RemoteHandler {
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
             errorLoadRemote: new AsyncHook('errorLoadRemote'),
-            beforePreloadRemote: new AsyncHook(),
+            beforePreloadRemote: new AsyncHook('beforePreloadRemote'),
             generatePreloadAssets: new AsyncHook('generatePreloadAssets'),
             // not used yet
             afterPreloadRemote: new AsyncHook()
@@ -1880,7 +1907,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.15";
+        this.version = "0.1.17";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -241,7 +241,7 @@ let Module = class Module {
         return this.remoteEntryExports;
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async get(expose, options) {
+    async get(id, expose, options) {
         const { loadFactory = true } = options || {
             loadFactory: true
         };
@@ -282,12 +282,38 @@ let Module = class Module {
         // get exposeGetter
         const moduleFactory = await remoteEntryExports.get(expose);
         assert(moduleFactory, `${getFMId(this.remoteInfo)} remote don't export ${expose}.`);
+        const wrapModuleFactory = this.wraperFactory(moduleFactory, id);
         if (!loadFactory) {
-            return moduleFactory;
+            return wrapModuleFactory;
         }
-        const exposeContent = await moduleFactory();
+        const exposeContent = await wrapModuleFactory();
         return exposeContent;
     }
+    wraperFactory(moduleFactory, id) {
+        function defineModuleId(res, id) {
+            if (res && typeof res === 'object' && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
+                Object.defineProperty(res, Symbol.for('mf_module_id'), {
+                    value: id,
+                    enumerable: false
+                });
+            }
+        }
+        if (moduleFactory instanceof Promise) {
+            return async ()=>{
+                const res = await moduleFactory();
+                // This parameter is used for bridge debugging
+                defineModuleId(res, id);
+                return res;
+            };
+        } else {
+            return ()=>{
+                const res = moduleFactory();
+                // This parameter is used for bridge debugging
+                defineModuleId(res, id);
+                return res;
+            };
+        }
+    }
     constructor({ remoteInfo, host }){
         this.inited = false;
         this.lib = undefined;
@@ -1498,7 +1524,7 @@ class RemoteHandler {
                 id
             });
             const { pkgNameOrAlias, remote, expose, id: idRes } = remoteMatchInfo;
-            const moduleOrFactory = await module.get(expose, options);
+            const moduleOrFactory = await module.get(idRes, expose, options);
             const moduleWrapper = await this.hooks.lifecycle.onLoad.emit({
                 id: idRes,
                 pkgNameOrAlias,
@@ -1535,7 +1561,7 @@ class RemoteHandler {
     async preloadRemote(preloadOptions) {
         const { host } = this;
         await this.hooks.lifecycle.beforePreloadRemote.emit({
-            preloadOptions,
+            preloadOps: preloadOptions,
             options: host.options,
             origin: host
         });
@@ -1676,9 +1702,10 @@ class RemoteHandler {
         }
         const loadedModule = host.moduleCache.get(remote.name);
         if (loadedModule) {
+            var _Object_getOwnPropertyDescriptor;
             const remoteInfo = loadedModule.remoteInfo;
             const key = remoteInfo.entryGlobalName;
-            if (globalThis[key]) {
+            if (globalThis[key] && ((_Object_getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor(globalThis, key)) == null ? void 0 : _Object_getOwnPropertyDescriptor.configurable)) {
                 delete globalThis[key];
             }
             const remoteEntryUniqueKey = getRemoteEntryUniqueKey(loadedModule.remoteInfo);
@@ -1750,7 +1777,7 @@ class RemoteHandler {
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
             errorLoadRemote: new AsyncHook('errorLoadRemote'),
-            beforePreloadRemote: new AsyncHook(),
+            beforePreloadRemote: new AsyncHook('beforePreloadRemote'),
             generatePreloadAssets: new AsyncHook('generatePreloadAssets'),
             // not used yet
             afterPreloadRemote: new AsyncHook()
@@ -1878,7 +1905,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.15";
+        this.version = "0.1.17";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/dist/share.cjs.js

@@ -190,7 +190,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.15";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.17";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types

package/dist/share.esm.js

@@ -188,7 +188,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.15";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.17";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types

package/dist/src/module/index.d.ts

@@ -12,8 +12,9 @@ declare class Module {
         host: FederationHost;
     });
     getEntry(): Promise<RemoteEntryExports>;
-    get(expose: string, options?: {
+    get(id: string, expose: string, options?: {
         loadFactory?: boolean;
     }): Promise<any>;
+    private wraperFactory;
 }
 export { Module };

package/dist/src/remote/index.d.ts

@@ -48,11 +48,11 @@ export declare class RemoteHandler {
             lifecycle: 'onLoad' | 'beforeRequest';
             origin: FederationHost;
         }], unknown>;
-        beforePreloadRemote: AsyncHook<{
+        beforePreloadRemote: AsyncHook<[{
             preloadOps: Array<PreloadRemoteArgs>;
             options: Options;
             origin: FederationHost;
-        }, false | void | Promise<false | void>>;
+        }], false | void | Promise<false | void>>;
         generatePreloadAssets: AsyncHook<[{
             origin: FederationHost;
             preloadOptions: PreloadOptions[number];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -45,6 +45,6 @@
     }
   },
   "dependencies": {
-    "@module-federation/sdk": "0.1.15"
+    "@module-federation/sdk": "0.1.17"
   }
 }