@module-federation/runtime 0.0.0-next-20240523121007 → 0.0.0-next-20240523225730

package/dist/helpers.esm.js

@@ -1,4 +1,4 @@
-import { q as getRegisteredShare, A as getGlobalShareScope, G as Global, K as nativeGlobal, L as resetFederationGlobalInfo, F as getGlobalFederationInstance, I as setGlobalFederationInstance, H as getGlobalFederationConstructor, E as setGlobalFederationConstructor, n as getInfoWithoutType, x as getGlobalSnapshot, M as getTargetSnapshotInfoByModuleInfo, t as getGlobalSnapshotInfoByModuleInfo, v as setGlobalSnapshotInfoByModuleInfo, u as addGlobalSnapshot, c as getRemoteEntryExports, J as registerGlobalPlugins, g as getGlobalHostPlugins, o as getPreloaded, p as setPreloaded } from './share.esm.js';
+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';
 
 const ShareUtils = {
     getRegisteredShare,

package/dist/index.cjs.js

@@ -142,7 +142,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
       `);
             return entryExports;
         }).catch((e)=>{
-            throw e;
+            return e;
         });
     }
     return sdk.loadScript(entry, {
@@ -158,7 +158,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     `);
         return entryExports;
     }).catch((e)=>{
-        throw e;
+        return e;
     });
 }
 function getRemoteEntryUniqueKey(remoteInfo) {
@@ -638,16 +638,13 @@ function _extends$4() {
     return _extends$4.apply(this, arguments);
 }
 function assignRemoteInfo(remoteInfo, remoteSnapshot) {
-    const remoteEntryInfo = share.getRemoteEntryInfoFromSnapshot(remoteSnapshot);
-    if (!remoteEntryInfo.url) {
-        share.error(`The attribute remoteEntry of ${remoteInfo.name} must not be undefined.`);
+    if (!('remoteEntry' in remoteSnapshot) || !remoteSnapshot.remoteEntry) {
+        share.error(`The attribute remoteEntry of ${name} must not be undefined.`);
     }
-    let entryUrl = sdk.getResourceUrl(remoteSnapshot, remoteEntryInfo.url);
-    if (!share.isBrowserEnv() && !entryUrl.startsWith('http')) {
-        entryUrl = `https:${entryUrl}`;
-    }
-    remoteInfo.type = remoteEntryInfo.type;
-    remoteInfo.entryGlobalName = remoteEntryInfo.globalName;
+    const { remoteEntry } = remoteSnapshot;
+    const entryUrl = sdk.getResourceUrl(remoteSnapshot, remoteEntry);
+    remoteInfo.type = remoteSnapshot.remoteEntryType;
+    remoteInfo.entryGlobalName = remoteSnapshot.globalName;
     remoteInfo.entry = entryUrl;
     remoteInfo.version = remoteSnapshot.version;
     remoteInfo.buildVersion = remoteSnapshot.buildVersion;
@@ -772,7 +769,7 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
                 return;
             }
         }
-        const remoteEntryUrl = sdk.getResourceUrl(moduleInfoSnapshot, share.getRemoteEntryInfoFromSnapshot(moduleInfoSnapshot).url);
+        const remoteEntryUrl = sdk.getResourceUrl(moduleInfoSnapshot, 'remoteEntry' in moduleInfoSnapshot ? moduleInfoSnapshot.remoteEntry : '');
         if (remoteEntryUrl) {
             entryAssets.push({
                 name: remoteInfo.name,
@@ -978,13 +975,12 @@ class SnapshotHandler {
         // global snapshot includes manifest or module info includes manifest
         if (globalRemoteSnapshot) {
             if (sdk.isManifestProvider(globalRemoteSnapshot)) {
-                const remoteEntry = share.isBrowserEnv() ? globalRemoteSnapshot.remoteEntry : globalRemoteSnapshot.ssrRemoteEntry || globalRemoteSnapshot.remoteEntry || '';
-                const moduleSnapshot = await this.getManifestJson(remoteEntry, moduleInfo, {});
+                const moduleSnapshot = await this.getManifestJson(globalRemoteSnapshot.remoteEntry, moduleInfo, {});
                 // eslint-disable-next-line @typescript-eslint/no-shadow
                 const globalSnapshotRes = share.setGlobalSnapshotInfoByModuleInfo(_extends$3({}, moduleInfo, {
                     // The global remote may be overridden
                     // Therefore, set the snapshot key to the global address of the actual request
-                    entry: remoteEntry
+                    entry: globalRemoteSnapshot.remoteEntry
                 }), moduleSnapshot);
                 return {
                     remoteSnapshot: moduleSnapshot,
@@ -1516,10 +1512,6 @@ class RemoteHandler {
                 moduleInstance: module,
                 origin: host
             });
-            this.idToRemoteMap[id] = {
-                name: remote.name,
-                expose
-            };
             if (typeof moduleWrapper === 'function') {
                 return moduleWrapper;
             }
@@ -1766,7 +1758,6 @@ class RemoteHandler {
             afterPreloadRemote: new AsyncHook()
         });
         this.host = host;
-        this.idToRemoteMap = {};
     }
 }
 
@@ -1978,9 +1969,6 @@ function registerPlugins(...args) {
     // eslint-disable-next-line prefer-spread
     return FederationInstance.registerPlugins.apply(FederationInstance, args);
 }
-function getInstance() {
-    return FederationInstance;
-}
 // Inject for debug
 share.setGlobalFederationConstructor(FederationHost);
 
@@ -1994,7 +1982,6 @@ Object.defineProperty(exports, 'loadScriptNode', {
   get: function () { return sdk.loadScriptNode; }
 });
 exports.FederationHost = FederationHost;
-exports.getInstance = getInstance;
 exports.getRemoteEntry = getRemoteEntry;
 exports.getRemoteInfo = getRemoteInfo;
 exports.init = init;

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 getRemoteEntryInfoFromSnapshot, m as isBrowserEnv, n as getInfoWithoutType, o as getPreloaded, p as setPreloaded, q as getRegisteredShare, r as arrayOptions, t as getGlobalSnapshotInfoByModuleInfo, u as addGlobalSnapshot, v as setGlobalSnapshotInfoByModuleInfo, x as getGlobalSnapshot, G as Global, y as formatShareConfigs, z as getTargetSharedOptions, A as getGlobalShareScope, B as addUniqueItem, C as getBuilderId, E as setGlobalFederationConstructor, F as getGlobalFederationInstance, H as getGlobalFederationConstructor, I as setGlobalFederationInstance } from './share.esm.js';
-export { J as registerGlobalPlugins } from './share.esm.js';
-import { loadScriptNode, loadScript, composeKeyWithSeparator, createLink, getResourceUrl, isManifestProvider, generateSnapshotFromManifest, warn as warn$1, isBrowserEnv as isBrowserEnv$1 } from '@module-federation/sdk';
+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';
+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';
 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)=>{
-            throw e;
+            return e;
         });
     }
     return loadScript(entry, {
@@ -156,7 +156,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     `);
         return entryExports;
     }).catch((e)=>{
-        throw e;
+        return e;
     });
 }
 function getRemoteEntryUniqueKey(remoteInfo) {
@@ -636,16 +636,13 @@ function _extends$4() {
     return _extends$4.apply(this, arguments);
 }
 function assignRemoteInfo(remoteInfo, remoteSnapshot) {
-    const remoteEntryInfo = getRemoteEntryInfoFromSnapshot(remoteSnapshot);
-    if (!remoteEntryInfo.url) {
-        error(`The attribute remoteEntry of ${remoteInfo.name} must not be undefined.`);
+    if (!('remoteEntry' in remoteSnapshot) || !remoteSnapshot.remoteEntry) {
+        error(`The attribute remoteEntry of ${name} must not be undefined.`);
     }
-    let entryUrl = getResourceUrl(remoteSnapshot, remoteEntryInfo.url);
-    if (!isBrowserEnv() && !entryUrl.startsWith('http')) {
-        entryUrl = `https:${entryUrl}`;
-    }
-    remoteInfo.type = remoteEntryInfo.type;
-    remoteInfo.entryGlobalName = remoteEntryInfo.globalName;
+    const { remoteEntry } = remoteSnapshot;
+    const entryUrl = getResourceUrl(remoteSnapshot, remoteEntry);
+    remoteInfo.type = remoteSnapshot.remoteEntryType;
+    remoteInfo.entryGlobalName = remoteSnapshot.globalName;
     remoteInfo.entry = entryUrl;
     remoteInfo.version = remoteSnapshot.version;
     remoteInfo.buildVersion = remoteSnapshot.buildVersion;
@@ -770,7 +767,7 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
                 return;
             }
         }
-        const remoteEntryUrl = getResourceUrl(moduleInfoSnapshot, getRemoteEntryInfoFromSnapshot(moduleInfoSnapshot).url);
+        const remoteEntryUrl = getResourceUrl(moduleInfoSnapshot, 'remoteEntry' in moduleInfoSnapshot ? moduleInfoSnapshot.remoteEntry : '');
         if (remoteEntryUrl) {
             entryAssets.push({
                 name: remoteInfo.name,
@@ -976,13 +973,12 @@ class SnapshotHandler {
         // global snapshot includes manifest or module info includes manifest
         if (globalRemoteSnapshot) {
             if (isManifestProvider(globalRemoteSnapshot)) {
-                const remoteEntry = isBrowserEnv() ? globalRemoteSnapshot.remoteEntry : globalRemoteSnapshot.ssrRemoteEntry || globalRemoteSnapshot.remoteEntry || '';
-                const moduleSnapshot = await this.getManifestJson(remoteEntry, moduleInfo, {});
+                const moduleSnapshot = await this.getManifestJson(globalRemoteSnapshot.remoteEntry, moduleInfo, {});
                 // eslint-disable-next-line @typescript-eslint/no-shadow
                 const globalSnapshotRes = setGlobalSnapshotInfoByModuleInfo(_extends$3({}, moduleInfo, {
                     // The global remote may be overridden
                     // Therefore, set the snapshot key to the global address of the actual request
-                    entry: remoteEntry
+                    entry: globalRemoteSnapshot.remoteEntry
                 }), moduleSnapshot);
                 return {
                     remoteSnapshot: moduleSnapshot,
@@ -1514,10 +1510,6 @@ class RemoteHandler {
                 moduleInstance: module,
                 origin: host
             });
-            this.idToRemoteMap[id] = {
-                name: remote.name,
-                expose
-            };
             if (typeof moduleWrapper === 'function') {
                 return moduleWrapper;
             }
@@ -1646,7 +1638,7 @@ class RemoteHandler {
             }
             // Set the remote entry to a complete path
             if ('entry' in remote) {
-                if (isBrowserEnv$1() && !remote.entry.startsWith('http')) {
+                if (isBrowserEnv() && !remote.entry.startsWith('http')) {
                     remote.entry = new URL(remote.entry, window.location.origin).href;
                 }
             }
@@ -1764,7 +1756,6 @@ class RemoteHandler {
             afterPreloadRemote: new AsyncHook()
         });
         this.host = host;
-        this.idToRemoteMap = {};
     }
 }
 
@@ -1908,7 +1899,7 @@ class FederationHost {
             ],
             remotes: [],
             shared: {},
-            inBrowser: isBrowserEnv()
+            inBrowser: isBrowserEnv$1()
         };
         this.name = userOptions.name;
         this.options = defaultOptions;
@@ -1976,10 +1967,7 @@ function registerPlugins(...args) {
     // eslint-disable-next-line prefer-spread
     return FederationInstance.registerPlugins.apply(FederationInstance, args);
 }
-function getInstance() {
-    return FederationInstance;
-}
 // Inject for debug
 setGlobalFederationConstructor(FederationHost);
 
-export { FederationHost, getInstance, getRemoteEntry, getRemoteInfo, init, loadRemote, loadShare, loadShareSync, preloadRemote, registerPlugins, registerRemotes };
+export { FederationHost, getRemoteEntry, getRemoteInfo, init, loadRemote, loadShare, loadShareSync, preloadRemote, registerPlugins, registerRemotes };

package/dist/share.cjs.js

@@ -76,28 +76,6 @@ function arrayOptions(options) {
         options
     ];
 }
-function getRemoteEntryInfoFromSnapshot(snapshot) {
-    const defaultRemoteEntryInfo = {
-        url: '',
-        type: 'global',
-        globalName: ''
-    };
-    if (isBrowserEnv()) {
-        return 'remoteEntry' in snapshot ? {
-            url: snapshot.remoteEntry,
-            type: snapshot.remoteEntryType,
-            globalName: snapshot.globalName
-        } : defaultRemoteEntryInfo;
-    }
-    if ('ssrRemoteEntry' in snapshot) {
-        return {
-            url: snapshot.ssrRemoteEntry || defaultRemoteEntryInfo.url,
-            type: snapshot.ssrRemoteEntryType || defaultRemoteEntryInfo.type,
-            globalName: snapshot.globalName
-        };
-    }
-    return defaultRemoteEntryInfo;
-}
 
 function _extends$1() {
     _extends$1 = Object.assign || function(target) {
@@ -915,7 +893,6 @@ exports.getInfoWithoutType = getInfoWithoutType;
 exports.getPreloaded = getPreloaded;
 exports.getRegisteredShare = getRegisteredShare;
 exports.getRemoteEntryExports = getRemoteEntryExports;
-exports.getRemoteEntryInfoFromSnapshot = getRemoteEntryInfoFromSnapshot;
 exports.getTargetSharedOptions = getTargetSharedOptions;
 exports.getTargetSnapshotInfoByModuleInfo = getTargetSnapshotInfoByModuleInfo;
 exports.globalLoading = globalLoading;

package/dist/share.esm.js

@@ -74,28 +74,6 @@ function arrayOptions(options) {
         options
     ];
 }
-function getRemoteEntryInfoFromSnapshot(snapshot) {
-    const defaultRemoteEntryInfo = {
-        url: '',
-        type: 'global',
-        globalName: ''
-    };
-    if (isBrowserEnv()) {
-        return 'remoteEntry' in snapshot ? {
-            url: snapshot.remoteEntry,
-            type: snapshot.remoteEntryType,
-            globalName: snapshot.globalName
-        } : defaultRemoteEntryInfo;
-    }
-    if ('ssrRemoteEntry' in snapshot) {
-        return {
-            url: snapshot.ssrRemoteEntry || defaultRemoteEntryInfo.url,
-            type: snapshot.ssrRemoteEntryType || defaultRemoteEntryInfo.type,
-            globalName: snapshot.globalName
-        };
-    }
-    return defaultRemoteEntryInfo;
-}
 
 function _extends$1() {
     _extends$1 = Object.assign || function(target) {
@@ -892,4 +870,4 @@ function getTargetSharedOptions(options) {
     return Object.assign({}, resolver(shareInfos[pkgName]), extraOptions == null ? void 0 : extraOptions.customShareInfo);
 }
 
-export { getGlobalShareScope as A, addUniqueItem as B, getBuilderId as C, DEFAULT_REMOTE_TYPE as D, setGlobalFederationConstructor as E, getGlobalFederationInstance as F, Global as G, getGlobalFederationConstructor as H, setGlobalFederationInstance as I, registerGlobalPlugins as J, nativeGlobal as K, resetFederationGlobalInfo as L, getTargetSnapshotInfoByModuleInfo as M, 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, getRemoteEntryInfoFromSnapshot as l, isBrowserEnv as m, getInfoWithoutType as n, getPreloaded as o, setPreloaded as p, getRegisteredShare as q, arrayOptions as r, safeToString as s, getGlobalSnapshotInfoByModuleInfo as t, addGlobalSnapshot as u, setGlobalSnapshotInfoByModuleInfo as v, warn as w, getGlobalSnapshot as x, formatShareConfigs as y, getTargetSharedOptions as z };
+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 };

package/dist/src/index.d.ts

@@ -13,4 +13,3 @@ export declare function loadShareSync<T>(...args: Parameters<FederationHost['loa
 export declare function preloadRemote(...args: Parameters<FederationHost['preloadRemote']>): ReturnType<FederationHost['preloadRemote']>;
 export declare function registerRemotes(...args: Parameters<FederationHost['registerRemotes']>): ReturnType<FederationHost['registerRemotes']>;
 export declare function registerPlugins(...args: Parameters<FederationHost['registerPlugins']>): ReturnType<FederationHost['registerRemotes']>;
-export declare function getInstance(): FederationHost | null;

package/dist/src/plugins/snapshot/SnapshotHandler.d.ts

@@ -39,10 +39,6 @@ export declare class SnapshotHandler {
         remoteSnapshot: ModuleInfo;
         globalSnapshot: GlobalModuleInfo;
     }> | never;
-    getGlobalRemoteInfo(moduleInfo: Remote): {
-        hostGlobalSnapshot: ModuleInfo | undefined;
-        globalSnapshot: ReturnType<typeof getGlobalSnapshot>;
-        remoteSnapshot: GlobalModuleInfo[string] | undefined;
-    };
+    private getGlobalRemoteInfo;
     private getManifestJson;
 }

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

@@ -15,10 +15,6 @@ export interface LoadRemoteMatch {
 }
 export declare class RemoteHandler {
     host: FederationHost;
-    idToRemoteMap: Record<string, {
-        name: string;
-        expose: string;
-    }>;
     hooks: PluginSystem<{
         beforeRequest: AsyncWaterfallHook<{
             id: string;

package/dist/src/utils/tool.d.ts

@@ -1,4 +1,4 @@
-import type { RemoteWithEntry, ModuleInfo, RemoteEntryType } from '@module-federation/sdk';
+import type { RemoteWithEntry } from '@module-federation/sdk';
 import { Remote, RemoteInfoOptionalVersion } from '../type';
 export declare function addUniqueItem(arr: Array<string>, item: string): Array<string>;
 export declare function getFMId(remoteInfo: RemoteInfoOptionalVersion | RemoteWithEntry): string;
@@ -11,8 +11,3 @@ export declare const objectToString: () => string;
 export declare function isPlainObject(val: any): val is object;
 export declare function isStaticResourcesEqual(url1: string, url2: string): boolean;
 export declare function arrayOptions<T>(options: T | Array<T>): Array<T>;
-export declare function getRemoteEntryInfoFromSnapshot(snapshot: ModuleInfo): {
-    url: string;
-    type: RemoteEntryType;
-    globalName: string;
-};

package/package.json

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