@module-federation/runtime 0.0.0-next-20231222101023 → 0.0.0-next-20231225041300

package/dist/share.esm.js

@@ -1,5 +1,4 @@
 function getBuilderId() {
-    //@ts-ignore
     return typeof FEDERATION_BUILD_IDENTIFIER !== 'undefined' ? FEDERATION_BUILD_IDENTIFIER : '';
 }
 function isDebugMode() {
@@ -42,7 +41,7 @@ function isRemoteInfoWithEntry(remote) {
     return typeof remote.entry !== 'undefined';
 }
 function isPureRemoteEntry(remote) {
-    return remote.entry.endsWith('.js');
+    return new URL(remote.entry).pathname.endsWith('.js');
 }
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function safeToString(info) {
@@ -87,7 +86,7 @@ function _object_without_properties_loose(source, excluded) {
     }
     return target;
 }
-var _nativeGlobal___FEDERATION__, _nativeGlobal___FEDERATION__1, _nativeGlobal___FEDERATION__2, _nativeGlobal___FEDERATION__3, _nativeGlobal___FEDERATION__4, _nativeGlobal___FEDERATION__5;
+var _nativeGlobal___FEDERATION__, _nativeGlobal___FEDERATION__1, _nativeGlobal___FEDERATION__2, _nativeGlobal___FEDERATION__3, _nativeGlobal___FEDERATION__4, _nativeGlobal___FEDERATION__5, _nativeGlobal___FEDERATION__6;
 // export const nativeGlobal: typeof global = new Function('return this')();
 const nativeGlobal = new Function('return this')();
 // This section is to prevent encapsulation by certain microfrontend frameworks. Due to reuse policies, sandbox escapes.
@@ -110,6 +109,7 @@ if (nativeGlobal.__VMOK__) {
         moduleInfo: {},
         __SHARE__: {},
         __MANIFEST_LOADING__: {},
+        __SHARE_SCOPE_LOADING__: {},
         __PRELOADED_MAP__: new Map()
     };
     nativeGlobal.__VMOK__ = nativeGlobal.__FEDERATION__;
@@ -124,8 +124,10 @@ var ___SHARE__;
 (___SHARE__ = (_nativeGlobal___FEDERATION__3 = nativeGlobal.__FEDERATION__).__SHARE__) != null ? ___SHARE__ : _nativeGlobal___FEDERATION__3.__SHARE__ = {};
 var ___MANIFEST_LOADING__;
 (___MANIFEST_LOADING__ = (_nativeGlobal___FEDERATION__4 = nativeGlobal.__FEDERATION__).__MANIFEST_LOADING__) != null ? ___MANIFEST_LOADING__ : _nativeGlobal___FEDERATION__4.__MANIFEST_LOADING__ = {};
+var ___SHARE_SCOPE_LOADING__;
+(___SHARE_SCOPE_LOADING__ = (_nativeGlobal___FEDERATION__5 = nativeGlobal.__FEDERATION__).__SHARE_SCOPE_LOADING__) != null ? ___SHARE_SCOPE_LOADING__ : _nativeGlobal___FEDERATION__5.__SHARE_SCOPE_LOADING__ = {};
 var ___PRELOADED_MAP__;
-(___PRELOADED_MAP__ = (_nativeGlobal___FEDERATION__5 = nativeGlobal.__FEDERATION__).__PRELOADED_MAP__) != null ? ___PRELOADED_MAP__ : _nativeGlobal___FEDERATION__5.__PRELOADED_MAP__ = new Map();
+(___PRELOADED_MAP__ = (_nativeGlobal___FEDERATION__6 = nativeGlobal.__FEDERATION__).__PRELOADED_MAP__) != null ? ___PRELOADED_MAP__ : _nativeGlobal___FEDERATION__6.__PRELOADED_MAP__ = new Map();
 const Global = {
     get __FEDERATION__ () {
         const globalThisVal = new Function('return globalThis')();
@@ -138,6 +140,7 @@ function resetFederationGlobalInfo() {
     nativeGlobal.__FEDERATION__.moduleInfo = {};
     nativeGlobal.__FEDERATION__.__SHARE__ = {};
     nativeGlobal.__FEDERATION__.__MANIFEST_LOADING__ = {};
+    nativeGlobal.__FEDERATION__.__SHARE_SCOPE_LOADING__ = {};
 }
 function getGlobalFederationInstance(name, version) {
     const buildId = getBuilderId();
@@ -620,7 +623,6 @@ function formatShare(shareArgs, from) {
         loading: null
     }, shareArgs, {
         get,
-        loaded: 'lib' in shareArgs ? true : undefined,
         scope: Array.isArray(shareArgs.scope) ? shareArgs.scope : [
             'default'
         ],
@@ -637,26 +639,15 @@ function formatShareConfigs(shareArgs, from) {
     }, {});
 }
 function versionLt(a, b) {
-    const transformInvalidVersion = (version)=>{
-        const isNumberVersion = !Number.isNaN(Number(version));
-        if (isNumberVersion) {
-            const splitArr = version.split('.');
-            let validVersion = version;
-            for(let i = 0; i < 3 - splitArr.length; i++){
-                validVersion += '.0';
-            }
-            return validVersion;
-        }
-        return version;
-    };
-    if (satisfy(transformInvalidVersion(a), `<=${transformInvalidVersion(b)}`)) {
+    if (satisfy(a, `<=${b}`)) {
         return true;
     } else {
         return false;
     }
 }
-const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
-    const versions = shareScopeMap[scope][pkgName];
+const findVersion = (scope, pkgName, cb)=>{
+    const globalShares = Global.__FEDERATION__.__SHARE__;
+    const versions = globalShares[scope][pkgName];
     const callback = cb || function(prev, cur) {
         return versionLt(prev, cur);
     };
@@ -667,22 +658,20 @@ const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
         if (callback(prev, cur)) {
             return cur;
         }
-        // default version is '0' https://github.com/webpack/webpack/blob/main/lib/sharing/ProvideSharedModule.js#L136
-        if (prev === '0') {
-            return cur;
-        }
         return prev;
     }, 0);
 };
-function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
-    const versions = shareScopeMap[scope][pkgName];
+function findSingletonVersionOrderByVersion(scope, pkgName) {
+    const globalShares = Global.__FEDERATION__.__SHARE__;
+    const versions = globalShares[scope][pkgName];
     const callback = function(prev, cur) {
         return !versions[prev].loaded && versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap, scope, pkgName, callback);
+    return findVersion(scope, pkgName, callback);
 }
-function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
-    const versions = shareScopeMap[scope][pkgName];
+function findSingletonVersionOrderByLoaded(scope, pkgName) {
+    const globalShares = Global.__FEDERATION__.__SHARE__;
+    const versions = globalShares[scope][pkgName];
     const callback = function(prev, cur) {
         if (versions[cur].loaded) {
             if (versions[prev].loaded) {
@@ -696,57 +685,45 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
         }
         return versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap, scope, pkgName, callback);
-}
-function getFindShareFunction(strategy) {
-    if (strategy === 'loaded-first') {
-        return findSingletonVersionOrderByLoaded;
-    }
-    return findSingletonVersionOrderByVersion;
+    return findVersion(scope, pkgName, callback);
 }
 // Details about shared resources
 // TODO: Implement strictVersion for alignment with module federation.
-function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare) {
-    if (!localShareScopeMap) {
-        return;
-    }
+function getGlobalShare(pkgName, shareInfo) {
+    const globalShares = Global.__FEDERATION__.__SHARE__;
     const { shareConfig, scope = DEFAULT_SCOPE, strategy } = shareInfo;
     const scopes = Array.isArray(scope) ? scope : [
         scope
     ];
     for (const sc of scopes){
-        if (shareConfig && localShareScopeMap[sc] && localShareScopeMap[sc][pkgName]) {
+        if (shareConfig && globalShares[sc] && globalShares[sc][pkgName]) {
             const { requiredVersion } = shareConfig;
-            const findShareFunction = getFindShareFunction(strategy);
-            const maxOrSingletonVersion = findShareFunction(localShareScopeMap, sc, pkgName);
-            //@ts-ignore
-            const defaultResolver = ()=>{
-                if (shareConfig.singleton) {
-                    if (typeof requiredVersion === 'string' && !satisfy(maxOrSingletonVersion, requiredVersion)) {
-                        warn(`Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion && localShareScopeMap[sc][pkgName][maxOrSingletonVersion].from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`);
-                    }
-                    return localShareScopeMap[sc][pkgName][maxOrSingletonVersion];
-                } else {
-                    if (requiredVersion === false || requiredVersion === '*') {
-                        return localShareScopeMap[sc][pkgName][maxOrSingletonVersion];
-                    }
-                    for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])){
-                        if (satisfy(versionKey, requiredVersion)) {
-                            return versionValue;
-                        }
+            // eslint-disable-next-line max-depth
+            if (shareConfig.singleton) {
+                const singletonVersion = strategy === 'loaded-first' ? findSingletonVersionOrderByLoaded(sc, pkgName) : findSingletonVersionOrderByVersion(sc, pkgName);
+                // eslint-disable-next-line max-depth
+                if (typeof requiredVersion === 'string' && !satisfy(singletonVersion, requiredVersion)) {
+                    warn(`Version ${singletonVersion} from ${singletonVersion && globalShares[sc][pkgName][singletonVersion].from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`);
+                }
+                return globalShares[sc][pkgName][singletonVersion];
+            } else {
+                const maxVersion = findSingletonVersionOrderByLoaded(sc, pkgName);
+                // eslint-disable-next-line max-depth
+                if (requiredVersion === false || requiredVersion === '*') {
+                    return globalShares[sc][pkgName][maxVersion];
+                }
+                // eslint-disable-next-line max-depth
+                if (satisfy(maxVersion, requiredVersion)) {
+                    return globalShares[sc][pkgName][maxVersion];
+                }
+                // eslint-disable-next-line max-depth
+                for (const [versionKey, versionValue] of Object.entries(globalShares[sc][pkgName])){
+                    // eslint-disable-next-line max-depth
+                    if (satisfy(versionKey, requiredVersion)) {
+                        return versionValue;
                     }
                 }
-            };
-            const params = {
-                shareScopeMap: localShareScopeMap,
-                scope: sc,
-                pkgName,
-                version: maxOrSingletonVersion,
-                GlobalFederation: Global.__FEDERATION__,
-                resolver: defaultResolver
-            };
-            const resolveShared = resolveShare.emit(params) || params;
-            return resolveShared.resolver();
+            }
         }
     }
 }
@@ -754,4 +731,4 @@ function getGlobalShareScope() {
     return Global.__FEDERATION__.__SHARE__;
 }
 
-export { getGlobalFederationInstance as A, getGlobalFederationConstructor as B, setGlobalFederationInstance as C, DEFAULT_REMOTE_TYPE as D, registerGlobalPlugins as E, nativeGlobal as F, Global as G, resetFederationGlobalInfo as H, getTargetSnapshotInfoByModuleInfo as I, addGlobalSnapshot as J, DEFAULT_SCOPE as a, globalLoading 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, getRegisteredShare as l, getInfoWithoutType as m, getPreloaded as n, setPreloaded as o, getGlobalSnapshotInfoByModuleInfo as p, setGlobalSnapshotInfoByModuleInfo as q, getGlobalSnapshot as r, safeToString as s, getGlobalShareScope as t, addUniqueItem as u, formatShareConfigs as v, warn as w, isBrowserEnv as x, getBuilderId as y, setGlobalFederationConstructor as z };
+export { getGlobalFederationInstance as A, getGlobalFederationConstructor as B, setGlobalFederationInstance as C, DEFAULT_REMOTE_TYPE as D, registerGlobalPlugins as E, nativeGlobal as F, Global as G, resetFederationGlobalInfo as H, getTargetSnapshotInfoByModuleInfo as I, addGlobalSnapshot as J, DEFAULT_SCOPE as a, globalLoading 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, getGlobalShare as l, getInfoWithoutType as m, getPreloaded as n, setPreloaded as o, getGlobalSnapshotInfoByModuleInfo as p, setGlobalSnapshotInfoByModuleInfo as q, getGlobalSnapshot as r, safeToString as s, addUniqueItem as t, formatShareConfigs as u, isBrowserEnv as v, warn as w, getGlobalShareScope as x, getBuilderId as y, setGlobalFederationConstructor as z };

package/dist/src/core.d.ts

@@ -1,8 +1,7 @@
 import type { ModuleInfo, GlobalModuleInfo } from '@module-federation/sdk';
-import { Options, PreloadAssets, PreloadOptions, PreloadRemoteArgs, Remote, Shared, ShareInfos, UserOptions, RemoteInfo, ShareScopeMap } from './type';
+import { Options, PreloadAssets, PreloadOptions, PreloadRemoteArgs, Remote, Shared, ShareInfos, UserOptions, RemoteInfo } from './type';
 import { Module, ModuleOptions } from './module';
 import { AsyncHook, AsyncWaterfallHook, PluginSystem, SyncHook, SyncWaterfallHook } from './utils/hooks';
-import { Federation } from './global';
 import { SnapshotHandler } from './plugins/snapshot/SnapshotHandler';
 interface LoadRemoteMatch {
     id: string;
@@ -61,14 +60,6 @@ export declare class FederationHost {
             origin: FederationHost;
         }>;
         loadShare: AsyncHook<[FederationHost, string, ShareInfos], false | void | Promise<false | void>>;
-        resolveShare: SyncWaterfallHook<{
-            shareScopeMap: ShareScopeMap;
-            scope: string;
-            pkgName: string;
-            version: string;
-            GlobalFederation: Federation;
-            resolver: () => Shared | undefined;
-        }>;
         beforePreloadRemote: AsyncHook<{
             preloadOps: Array<PreloadRemoteArgs>;
             options: Options;
@@ -88,12 +79,10 @@ export declare class FederationHost {
             origin: FederationHost;
         }, false | void | Promise<false | void>>;
     }>;
-    releaseNumber: string;
     version: string;
     name: string;
     moduleCache: Map<string, Module>;
     snapshotHandler: SnapshotHandler;
-    shareScopeMap: ShareScopeMap;
     loaderHook: PluginSystem<{
         getModuleInfo: SyncHook<[{
             target: Record<string, any>;
@@ -107,8 +96,10 @@ export declare class FederationHost {
         }], void | HTMLScriptElement>;
         fetch: AsyncHook<[string, RequestInit], false | void | Promise<Response>>;
     }>;
+    loadingShare: {
+        [key: string]: Promise<any>;
+    };
     constructor(userOptions: UserOptions);
-    private _setGlobalShareScopeMap;
     initOptions(userOptions: UserOptions): Options;
     loadShare<T>(pkgName: string, customShareInfo?: Partial<Shared>): Promise<false | (() => T | undefined)>;
     loadShareSync<T>(pkgName: string): () => T | never;
@@ -122,8 +113,7 @@ export declare class FederationHost {
      * It accepts one argument, the name of the share scope.
      * If the share scope does not exist, it creates one.
      */
-    initializeSharing(shareScopeName?: string, strategy?: Shared['strategy']): Array<Promise<void>>;
-    initShareScopeMap(scopeName: string, shareScope: ShareScopeMap[string]): void;
+    initializeSharing(shareScopeName?: string): boolean | Promise<boolean>;
     private formatOptions;
     private registerPlugins;
     private setShared;

package/dist/src/global.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { FederationHost } from './core';
-import { RemoteEntryExports, GlobalShareScopeMap, Remote, Optional } from './type';
+import { RemoteEntryExports, GlobalShareScope, Remote, Optional } from './type';
 import { GlobalModuleInfo, ModuleInfo } from '@module-federation/sdk';
 import { FederationRuntimePlugin } from './type/plugin';
 export interface Federation {
@@ -9,8 +9,9 @@ export interface Federation {
     moduleInfo: GlobalModuleInfo;
     __DEBUG_CONSTRUCTOR__?: typeof FederationHost;
     __INSTANCES__: Array<FederationHost>;
-    __SHARE__: GlobalShareScopeMap;
+    __SHARE__: GlobalShareScope;
     __MANIFEST_LOADING__: Record<string, Promise<ModuleInfo>>;
+    __SHARE_SCOPE_LOADING__: Record<string, boolean | Promise<boolean>>;
     __PRELOADED_MAP__: Map<string, boolean>;
 }
 export declare const nativeGlobal: typeof global;

package/dist/src/helpers.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { resetFederationGlobalInfo, getGlobalFederationInstance, setGlobalFederationInstance, getGlobalFederationConstructor, setGlobalFederationConstructor, getInfoWithoutType, getGlobalSnapshot, getTargetSnapshotInfoByModuleInfo, getGlobalSnapshotInfoByModuleInfo, setGlobalSnapshotInfoByModuleInfo, addGlobalSnapshot, getRemoteEntryExports, registerGlobalPlugins, getGlobalHostPlugins, getPreloaded, setPreloaded } from './global';
-import { getRegisteredShare, getGlobalShareScope } from './utils/share';
+import { getGlobalShare, getGlobalShareScope } from './utils/share';
 interface IShareUtils {
-    getRegisteredShare: typeof getRegisteredShare;
+    getGlobalShare: typeof getGlobalShare;
     getGlobalShareScope: typeof getGlobalShareScope;
 }
 interface IGlobalUtils {

package/dist/src/index.d.ts

@@ -2,7 +2,6 @@ import { FederationHost } from './core';
 import { UserOptions } from './type';
 export { FederationHost } from './core';
 export { registerGlobalPlugins } from './global';
-export { loadScript } from '@module-federation/sdk';
 export type { Federation } from './global';
 export declare function init(options: UserOptions): FederationHost;
 export declare function loadRemote(...args: Parameters<FederationHost['loadRemote']>): ReturnType<FederationHost['loadRemote']>;

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

@@ -1,5 +1,5 @@
 import { FederationHost } from '../core';
-import { RemoteEntryExports, Options, Remote, ShareInfos, RemoteInfo, ShareScopeMap } from '../type';
+import { RemoteEntryExports, Options, Remote, ShareInfos, RemoteInfo } from '../type';
 export type ModuleOptions = ConstructorParameters<typeof Module>[0];
 type HostInfo = Remote;
 declare class Module {
@@ -10,14 +10,12 @@ declare class Module {
     remoteEntryExports?: RemoteEntryExports;
     lib: RemoteEntryExports | undefined;
     loaderHook: FederationHost['loaderHook'];
-    shareScopeMap: ShareScopeMap;
-    constructor({ hostInfo, remoteInfo, shared, loaderHook, shareScopeMap, }: {
+    constructor({ hostInfo, remoteInfo, shared, loaderHook, }: {
         hostInfo: HostInfo;
         remoteInfo: RemoteInfo;
         shared: ShareInfos;
         plugins: Options['plugins'];
         loaderHook: FederationHost['loaderHook'];
-        shareScopeMap: ShareScopeMap;
     });
     getEntry(): Promise<RemoteEntryExports>;
     get(expose: string, options?: {

package/dist/src/type/config.d.ts

@@ -57,16 +57,13 @@ export type Shared = {
     eager?: boolean;
     strategy: 'version-first' | 'loaded-first';
 };
-export type ShareScopeMap = {
+export type GlobalShareScope = {
     [scope: string]: {
         [pkgName: string]: {
             [sharedVersion: string]: Shared;
         };
     };
 };
-export type GlobalShareScopeMap = {
-    [instanceName: string]: ShareScopeMap;
-};
 export type ShareInfos = {
     [pkgName: string]: Shared;
 };
@@ -92,6 +89,6 @@ export type RemoteEntryInitOptions = {
 };
 export type RemoteEntryExports = {
     get: (id: string) => () => Promise<Module>;
-    init: (shareScope: ShareScopeMap[string], initScope?: Array<Record<string, any>>, remoteEntryInitOPtions?: RemoteEntryInitOptions) => void;
+    init: (shareScope: GlobalShareScope[string], initScope?: Array<Record<string, never>>, remoteEntryInitOPtions?: RemoteEntryInitOptions) => void;
 };
 export {};

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

@@ -1,16 +1,7 @@
-import { Federation } from '../global';
-import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap } from '../type';
-import { SyncWaterfallHook } from './hooks';
+import { GlobalShareScope, Shared, ShareArgs, ShareInfos } from '../type';
 export declare function formatShare(shareArgs: ShareArgs, from: string): Shared;
 export declare function formatShareConfigs(shareArgs: {
     [pkgName: string]: ShareArgs;
 }, from: string): ShareInfos;
-export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pkgName: string, shareInfo: ShareInfos[keyof ShareInfos], resolveShare: SyncWaterfallHook<{
-    shareScopeMap: ShareScopeMap;
-    scope: string;
-    pkgName: string;
-    version: string;
-    GlobalFederation: Federation;
-    resolver: () => Shared | undefined;
-}>): Shared | void;
-export declare function getGlobalShareScope(): GlobalShareScopeMap;
+export declare function getGlobalShare(pkgName: string, shareInfo: ShareInfos[keyof ShareInfos]): Shared | void;
+export declare function getGlobalShareScope(): GlobalShareScope;

package/dist/type.cjs.d.ts

@@ -0,0 +1 @@
+export * from "./src/type/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.0.0-next-20231222101023",
+  "version": "0.0.0-next-20231225041300",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs",
   "module": "./dist/index.esm.js",
@@ -39,12 +39,12 @@
       "helpers": [
         "./dist/helpers.cjs.d.ts"
       ],
-      "types": [
-        "./dist/types.cjs.d.ts"
+      "type": [
+        "./dist/type.cjs.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@module-federation/sdk": "0.0.0-next-20231222101023"
+    "@module-federation/sdk": "0.0.0-next-20231225041300"
   }
 }

package/dist/types.cjs.d.ts

@@ -1 +0,0 @@
-export * from "./src/types";