@module-federation/runtime 0.1.16 → 0.1.18

package/dist/helpers.esm.js

@@ -1,4 +1,4 @@
-import { o as getRegisteredShare, y as getGlobalShareScope, G as Global, J as nativeGlobal, K as resetFederationGlobalInfo, E as getGlobalFederationInstance, H as setGlobalFederationInstance, F as getGlobalFederationConstructor, C as setGlobalFederationConstructor, l as getInfoWithoutType, u as getGlobalSnapshot, L as getTargetSnapshotInfoByModuleInfo, q as getGlobalSnapshotInfoByModuleInfo, t as setGlobalSnapshotInfoByModuleInfo, r as addGlobalSnapshot, c as getRemoteEntryExports, I as registerGlobalPlugins, g as getGlobalHostPlugins, m as getPreloaded, n as setPreloaded } from './share.esm.js';
+import { p as getRegisteredShare, z as getGlobalShareScope, G as Global, J as nativeGlobal, K as resetFederationGlobalInfo, E as getGlobalFederationInstance, H as setGlobalFederationInstance, F as getGlobalFederationConstructor, C as setGlobalFederationConstructor, m as getInfoWithoutType, v as getGlobalSnapshot, L as getTargetSnapshotInfoByModuleInfo, r as getGlobalSnapshotInfoByModuleInfo, u as setGlobalSnapshotInfoByModuleInfo, t as addGlobalSnapshot, c as getRemoteEntryExports, I as registerGlobalPlugins, g as getGlobalHostPlugins, n as getPreloaded, o as setPreloaded } from './share.esm.js';
 
 const ShareUtils = {
     getRegisteredShare,

package/dist/index.cjs.js

@@ -142,7 +142,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
       `);
             return entryExports;
         }).catch((e)=>{
-            return e;
+            throw e;
         });
     }
     return sdk.loadScript(entry, {
@@ -158,7 +158,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     `);
         return entryExports;
     }).catch((e)=>{
-        return e;
+        throw e;
     });
 }
 function getRemoteEntryUniqueKey(remoteInfo) {
@@ -172,7 +172,10 @@ async function getRemoteEntry({ remoteEntryExports, remoteInfo, createScriptHook
         return remoteEntryExports;
     }
     if (!share.globalLoading[uniqueKey]) {
-        if (type === 'esm') {
+        if ([
+            'esm',
+            'module'
+        ].includes(type)) {
             share.globalLoading[uniqueKey] = loadEsmEntry({
                 entry,
                 remoteEntryExports
@@ -243,7 +246,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 +287,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;
@@ -642,7 +671,10 @@ function assignRemoteInfo(remoteInfo, remoteSnapshot) {
         share.error(`The attribute remoteEntry of ${name} must not be undefined.`);
     }
     const { remoteEntry } = remoteSnapshot;
-    const entryUrl = sdk.getResourceUrl(remoteSnapshot, remoteEntry);
+    let entryUrl = sdk.getResourceUrl(remoteSnapshot, remoteEntry);
+    if (!share.isBrowserEnv() && !entryUrl.startsWith('http')) {
+        entryUrl = `https:${entryUrl}`;
+    }
     remoteInfo.type = remoteSnapshot.remoteEntryType;
     remoteInfo.entryGlobalName = remoteSnapshot.globalName;
     remoteInfo.entry = entryUrl;
@@ -1500,7 +1532,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,
@@ -1881,7 +1913,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.16";
+        this.version = "0.1.18";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -1,6 +1,6 @@
-import { g as getGlobalHostPlugins, a as globalLoading, D as DEFAULT_REMOTE_TYPE, b as DEFAULT_SCOPE, c as getRemoteEntryExports, d as assert, s as safeToString, e as getFMId, i as isObject, f as error, w as warn, h as isPlainObject, j as isRemoteInfoWithEntry, k as isPureRemoteEntry, l as getInfoWithoutType, m as getPreloaded, n as setPreloaded, o as getRegisteredShare, p as arrayOptions, q as getGlobalSnapshotInfoByModuleInfo, r as addGlobalSnapshot, t as setGlobalSnapshotInfoByModuleInfo, u as getGlobalSnapshot, G as Global, v as formatShareConfigs, x as getTargetSharedOptions, y as getGlobalShareScope, z as addUniqueItem, A as getBuilderId, B as isBrowserEnv$1, C as setGlobalFederationConstructor, E as getGlobalFederationInstance, F as getGlobalFederationConstructor, H as setGlobalFederationInstance } from './share.esm.js';
+import { g as getGlobalHostPlugins, a as globalLoading, D as DEFAULT_REMOTE_TYPE, b as DEFAULT_SCOPE, c as getRemoteEntryExports, d as assert, s as safeToString, e as getFMId, i as isObject, f as error, w as warn, h as isPlainObject, j as isRemoteInfoWithEntry, k as isPureRemoteEntry, l as isBrowserEnv, m as getInfoWithoutType, n as getPreloaded, o as setPreloaded, p as getRegisteredShare, q as arrayOptions, r as getGlobalSnapshotInfoByModuleInfo, t as addGlobalSnapshot, u as setGlobalSnapshotInfoByModuleInfo, v as getGlobalSnapshot, G as Global, x as formatShareConfigs, y as getTargetSharedOptions, z as getGlobalShareScope, A as addUniqueItem, B as getBuilderId, C as setGlobalFederationConstructor, E as getGlobalFederationInstance, F as getGlobalFederationConstructor, H as setGlobalFederationInstance } from './share.esm.js';
 export { I as registerGlobalPlugins } from './share.esm.js';
-import { loadScriptNode, loadScript, composeKeyWithSeparator, createLink, getResourceUrl, isManifestProvider, generateSnapshotFromManifest, warn as warn$1, isBrowserEnv } from '@module-federation/sdk';
+import { loadScriptNode, loadScript, composeKeyWithSeparator, createLink, getResourceUrl, isManifestProvider, generateSnapshotFromManifest, warn as warn$1, isBrowserEnv as isBrowserEnv$1 } from '@module-federation/sdk';
 export { loadScript, loadScriptNode } from '@module-federation/sdk';
 
 // Function to match a remote with its name and expose
@@ -140,7 +140,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
       `);
             return entryExports;
         }).catch((e)=>{
-            return e;
+            throw e;
         });
     }
     return loadScript(entry, {
@@ -156,7 +156,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     `);
         return entryExports;
     }).catch((e)=>{
-        return e;
+        throw e;
     });
 }
 function getRemoteEntryUniqueKey(remoteInfo) {
@@ -170,7 +170,10 @@ async function getRemoteEntry({ remoteEntryExports, remoteInfo, createScriptHook
         return remoteEntryExports;
     }
     if (!globalLoading[uniqueKey]) {
-        if (type === 'esm') {
+        if ([
+            'esm',
+            'module'
+        ].includes(type)) {
             globalLoading[uniqueKey] = loadEsmEntry({
                 entry,
                 remoteEntryExports
@@ -241,7 +244,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 +285,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;
@@ -640,7 +669,10 @@ function assignRemoteInfo(remoteInfo, remoteSnapshot) {
         error(`The attribute remoteEntry of ${name} must not be undefined.`);
     }
     const { remoteEntry } = remoteSnapshot;
-    const entryUrl = getResourceUrl(remoteSnapshot, remoteEntry);
+    let entryUrl = getResourceUrl(remoteSnapshot, remoteEntry);
+    if (!isBrowserEnv() && !entryUrl.startsWith('http')) {
+        entryUrl = `https:${entryUrl}`;
+    }
     remoteInfo.type = remoteSnapshot.remoteEntryType;
     remoteInfo.entryGlobalName = remoteSnapshot.globalName;
     remoteInfo.entry = entryUrl;
@@ -1498,7 +1530,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,
@@ -1638,7 +1670,7 @@ class RemoteHandler {
             }
             // Set the remote entry to a complete path
             if ('entry' in remote) {
-                if (isBrowserEnv() && !remote.entry.startsWith('http')) {
+                if (isBrowserEnv$1() && !remote.entry.startsWith('http')) {
                     remote.entry = new URL(remote.entry, window.location.origin).href;
                 }
             }
@@ -1879,7 +1911,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.16";
+        this.version = "0.1.18";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet
@@ -1900,7 +1932,7 @@ class FederationHost {
             ],
             remotes: [],
             shared: {},
-            inBrowser: isBrowserEnv$1()
+            inBrowser: isBrowserEnv()
         };
         this.name = userOptions.name;
         this.options = defaultOptions;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "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.16";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.18";
     }
 }
 // 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.16";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.18";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -870,4 +870,4 @@ function getTargetSharedOptions(options) {
     return Object.assign({}, resolver(shareInfos[pkgName]), extraOptions == null ? void 0 : extraOptions.customShareInfo);
 }
 
-export { getBuilderId as A, isBrowserEnv as B, setGlobalFederationConstructor as C, DEFAULT_REMOTE_TYPE as D, getGlobalFederationInstance as E, getGlobalFederationConstructor as F, Global as G, setGlobalFederationInstance as H, registerGlobalPlugins as I, nativeGlobal as J, resetFederationGlobalInfo as K, getTargetSnapshotInfoByModuleInfo as L, globalLoading as a, DEFAULT_SCOPE as b, getRemoteEntryExports as c, assert as d, getFMId as e, error as f, getGlobalHostPlugins as g, isPlainObject as h, isObject as i, isRemoteInfoWithEntry as j, isPureRemoteEntry as k, getInfoWithoutType as l, getPreloaded as m, setPreloaded as n, getRegisteredShare as o, arrayOptions as p, getGlobalSnapshotInfoByModuleInfo as q, addGlobalSnapshot as r, safeToString as s, setGlobalSnapshotInfoByModuleInfo as t, getGlobalSnapshot as u, formatShareConfigs as v, warn as w, getTargetSharedOptions as x, getGlobalShareScope as y, addUniqueItem as z };
+export { addUniqueItem as A, getBuilderId as B, setGlobalFederationConstructor as C, DEFAULT_REMOTE_TYPE as D, getGlobalFederationInstance as E, getGlobalFederationConstructor as F, Global as G, setGlobalFederationInstance as H, registerGlobalPlugins as I, nativeGlobal as J, resetFederationGlobalInfo as K, getTargetSnapshotInfoByModuleInfo as L, globalLoading as a, DEFAULT_SCOPE as b, getRemoteEntryExports as c, assert as d, getFMId as e, error as f, getGlobalHostPlugins as g, isPlainObject as h, isObject as i, isRemoteInfoWithEntry as j, isPureRemoteEntry as k, isBrowserEnv as l, getInfoWithoutType as m, getPreloaded as n, setPreloaded as o, getRegisteredShare as p, arrayOptions as q, getGlobalSnapshotInfoByModuleInfo as r, safeToString as s, addGlobalSnapshot as t, setGlobalSnapshotInfoByModuleInfo as u, getGlobalSnapshot as v, warn as w, formatShareConfigs as x, getTargetSharedOptions as y, getGlobalShareScope as z };

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "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.16"
+    "@module-federation/sdk": "0.1.18"
   }
 }