@module-federation/runtime 0.0.0-next-20240411125344 → 0.0.0-next-20240412091739

package/README.md

@@ -50,25 +50,9 @@ type InitOptions {
     // List of dependencies that need to be shared by the current host
     // When using the build plugin, users can configure the dependencies that need to be shared in the build plugin, and the build plugin will inject the dependencies that need to be shared into the runtime shared configuration.
     // Shared must be manually passed in the version instance reference when it is passed in at runtime, because it cannot be directly passed in at runtime.
-    shared?: {
-      [pkgName: string]: ShareArgs | ShareArgs[];
-    };
+    shared?: ShareInfos;
 };
 
-type ShareArgs =
-  | (SharedBaseArgs & { get: SharedGetter })
-  | (SharedBaseArgs & { lib: () => Module });
-
-type SharedBaseArgs = {
-  version: string;
-  shareConfig?: SharedConfig;
-  scope?: string | Array<string>;
-  deps?: Array<string>;
-  strategy?: 'version-first' | 'loaded-first';
-};
-
-type SharedGetter = (() => () => Module) | (() => Promise<() => Module>);
-
 type RemoteInfo = (RemotesWithEntry | RemotesWithVersion) & {
    alias?: string;
 };
@@ -136,7 +120,7 @@ loadRemote('app2/util').then((m) => m.add(1, 2, 3));
 
 ### loadShare
 
-- Type: `loadShare(pkgName: string, extraOptions?: { customShareInfo?: Partial<Shared>;resolver?: (sharedOptions: ShareInfos[string]) => Shared;})`
+- Type: `loadShare(pkgName: string)`
 - Gets the `share` dependency. When there are `share` dependencies that match the current `host` in the global environment, the existing and satisfying `share` dependencies will be reused first. Otherwise, load its own dependencies and store them in the global cache.
 - This `API` is generally not called directly by users, but is used by build plugins to convert their own dependencies.
 
@@ -177,50 +161,6 @@ loadShare('react').then((reactFactory) => {
 });
 ```
 
-If has set multiple version shared, `loadShare` will return the loaded and has max version shared. The behavior can be controlled by set `extraOptions.resolver`: 
-
-```js
-import { init, loadRemote, loadShare } from '@module-federation/runtime';
-
-init({
-  name: '@demo/main-app',
-  remotes: [],
-  shared: {
-    react: [
-      {
-        version: '17.0.0',
-        scope: 'default',
-        get: async ()=>() => ({ version: '17.0.0)' }),
-        shareConfig: {
-          singleton: true,
-          requiredVersion: '^17.0.0',
-        },
-      },
-      {
-        version: '18.0.0',
-        scope: 'default',
-        // pass lib means the shared has loaded
-        lib: () => ({ version: '18.0.0)' }),
-        shareConfig: {
-          singleton: true,
-          requiredVersion: '^18.0.0',
-        },
-      },      
-    ],
-  },
-});
-
-loadShare('react', { 
-   resolver: (sharedOptions) => {
-      return (
-        sharedOptions.find((i) => i.version === '17.0.0') ?? sharedOptions[0]
-      );
-  },
- }).then((reactFactory) => {
-  console.log(reactFactory()); // { version: '17.0.0)' }
-});
-```
-
 ### preloadRemote
 
 - Type: `preloadRemote(preloadOptions: Array<PreloadRemoteArgs>)`

package/dist/helpers.esm.js

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

package/dist/index.cjs.js

@@ -813,33 +813,23 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
         }
     }, true, memo, remoteSnapshot);
     if (remoteSnapshot.shared) {
-        const collectSharedAssets = (shareInfo, snapshotShared)=>{
-            const registeredShared = share.getRegisteredShare(origin.shareScopeMap, snapshotShared.sharedName, shareInfo, origin.hooks.lifecycle.resolveShare);
+        remoteSnapshot.shared.forEach((shared)=>{
+            var _options_shared;
+            const shareInfo = (_options_shared = options.shared) == null ? void 0 : _options_shared[shared.sharedName];
+            // When data is downgraded, the shared configuration may be different.
+            if (!shareInfo) {
+                return;
+            }
+            const registeredShared = share.getRegisteredShare(origin.shareScopeMap, shared.sharedName, shareInfo, origin.hooks.lifecycle.resolveShare);
             // If the global share does not exist, or the lib function does not exist, it means that the shared has not been loaded yet and can be preloaded.
             if (registeredShared && typeof registeredShared.lib === 'function') {
-                snapshotShared.assets.js.sync.forEach((asset)=>{
+                shared.assets.js.sync.forEach((asset)=>{
                     loadedSharedJsAssets.add(asset);
                 });
-                snapshotShared.assets.css.sync.forEach((asset)=>{
+                shared.assets.css.sync.forEach((asset)=>{
                     loadedSharedCssAssets.add(asset);
                 });
             }
-        };
-        remoteSnapshot.shared.forEach((shared)=>{
-            var _options_shared;
-            const shareInfos = (_options_shared = options.shared) == null ? void 0 : _options_shared[shared.sharedName];
-            if (!shareInfos) {
-                return;
-            }
-            // if no version, preload all shared
-            const sharedOptions = shared.version ? shareInfos.find((s)=>s.version === shared.version) : shareInfos;
-            if (!sharedOptions) {
-                return;
-            }
-            const arrayShareInfo = share.arrayOptions(sharedOptions);
-            arrayShareInfo.forEach((s)=>{
-                collectSharedAssets(s, shared);
-            });
         });
     }
     const needPreloadJsAssets = jsAssets.filter((asset)=>!loadedSharedJsAssets.has(asset));
@@ -1124,16 +1114,13 @@ class FederationHost {
         this.options = options;
         return options;
     }
-    async loadShare(pkgName, extraOptions) {
+    async loadShare(pkgName, customShareInfo) {
+        var _this_options_shared;
         // This function performs the following steps:
         // 1. Checks if the currently loaded share already exists, if not, it throws an error
         // 2. Searches globally for a matching share, if found, it uses it directly
         // 3. If not found, it retrieves it from the current share and stores the obtained share globally.
-        const shareInfo = share.getTargetSharedOptions({
-            pkgName,
-            extraOptions,
-            shareInfos: this.options.shared
-        });
+        const shareInfo = Object.assign({}, (_this_options_shared = this.options.shared) == null ? void 0 : _this_options_shared[pkgName], customShareInfo);
         if (shareInfo == null ? void 0 : shareInfo.scope) {
             await Promise.all(shareInfo.scope.map(async (shareScope)=>{
                 await Promise.all(this.initializeSharing(shareScope, shareInfo.strategy));
@@ -1192,7 +1179,7 @@ class FederationHost {
             });
             return loading;
         } else {
-            if (extraOptions == null ? void 0 : extraOptions.customShareInfo) {
+            if (customShareInfo) {
                 return false;
             }
             const asyncLoadProcess = async ()=>{
@@ -1223,12 +1210,9 @@ class FederationHost {
     // 1. If the loaded shared already exists globally, then it will be reused
     // 2. If lib exists in local shared, it will be used directly
     // 3. If the local get returns something other than Promise, then it will be used directly
-    loadShareSync(pkgName, extraOptions) {
-        const shareInfo = share.getTargetSharedOptions({
-            pkgName,
-            extraOptions,
-            shareInfos: this.options.shared
-        });
+    loadShareSync(pkgName, customShareInfo) {
+        var _this_options_shared;
+        const shareInfo = Object.assign({}, (_this_options_shared = this.options.shared) == null ? void 0 : _this_options_shared[pkgName], customShareInfo);
         if (shareInfo == null ? void 0 : shareInfo.scope) {
             shareInfo.scope.forEach((shareScope)=>{
                 this.initializeSharing(shareScope, shareInfo.strategy);
@@ -1468,11 +1452,9 @@ class FederationHost {
         };
         Object.keys(this.options.shared).forEach((shareName)=>{
             const shared = this.options.shared[shareName];
-            shared.forEach((s)=>{
-                if (s.scope.includes(shareScopeName)) {
-                    register(shareName, s);
-                }
-            });
+            if (shared.scope.includes(shareScopeName)) {
+                register(shareName, shared);
+            }
         });
         if (strategy === 'version-first') {
             this.options.remotes.forEach((remote)=>{
@@ -1493,19 +1475,7 @@ class FederationHost {
     }
     formatOptions(globalOptions, userOptions) {
         const formatShareOptions = share.formatShareConfigs(userOptions.shared || {}, userOptions.name);
-        const shared = _extends({}, globalOptions.shared);
-        Object.keys(formatShareOptions).forEach((shareKey)=>{
-            if (!shared[shareKey]) {
-                shared[shareKey] = formatShareOptions[shareKey];
-            } else {
-                formatShareOptions[shareKey].forEach((newUserSharedOptions)=>{
-                    const isSameVersion = shared[shareKey].find((s)=>s.version === newUserSharedOptions.version);
-                    if (!isSameVersion) {
-                        shared[shareKey].push(newUserSharedOptions);
-                    }
-                });
-            }
-        });
+        const shared = _extends({}, globalOptions.shared, formatShareOptions);
         const { userOptions: userOptionsRes, options: globalOptionsRes } = this.hooks.lifecycle.beforeInit.emit({
             origin: this,
             userOptions,
@@ -1523,19 +1493,17 @@ class FederationHost {
         const sharedKeys = Object.keys(formatShareOptions);
         sharedKeys.forEach((sharedKey)=>{
             const sharedVal = formatShareOptions[sharedKey];
-            sharedVal.forEach((s)=>{
-                const registeredShared = share.getRegisteredShare(this.shareScopeMap, sharedKey, s, this.hooks.lifecycle.resolveShare);
-                if (!registeredShared && s && s.lib) {
-                    this.setShared({
-                        pkgName: sharedKey,
-                        lib: s.lib,
-                        get: s.get,
-                        loaded: true,
-                        shared: s,
-                        from: userOptions.name
-                    });
-                }
-            });
+            const registeredShared = share.getRegisteredShare(this.shareScopeMap, sharedKey, sharedVal, this.hooks.lifecycle.resolveShare);
+            if (!registeredShared && sharedVal && sharedVal.lib) {
+                this.setShared({
+                    pkgName: sharedKey,
+                    lib: sharedVal.lib,
+                    get: sharedVal.get,
+                    loaded: true,
+                    shared: sharedVal,
+                    from: userOptions.name
+                });
+            }
         });
         const plugins = [
             ...globalOptionsRes.plugins

package/dist/index.esm.js

@@ -1,5 +1,5 @@
-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 getGlobalShareScope, x as getTargetSharedOptions, y as formatShareConfigs, z as getBuilderId, A as isBrowserEnv, B as addUniqueItem, 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 { 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 getRegisteredShare, m as getInfoWithoutType, n as getPreloaded, o as setPreloaded, p as getGlobalSnapshotInfoByModuleInfo, q as addGlobalSnapshot, r as setGlobalSnapshotInfoByModuleInfo, t as getGlobalSnapshot, G as Global, u as getGlobalShareScope, v as formatShareConfigs, x as getBuilderId, y as isBrowserEnv, z as addUniqueItem, A as setGlobalFederationConstructor, B as getGlobalFederationInstance, C as getGlobalFederationConstructor, E as setGlobalFederationInstance } from './share.esm.js';
+export { F as registerGlobalPlugins } from './share.esm.js';
 import { loadScriptNode, loadScript, composeKeyWithSeparator, createLink, getResourceUrl, isManifestProvider, generateSnapshotFromManifest } from '@module-federation/sdk';
 export { loadScript, loadScriptNode } from '@module-federation/sdk';
 
@@ -811,33 +811,23 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
         }
     }, true, memo, remoteSnapshot);
     if (remoteSnapshot.shared) {
-        const collectSharedAssets = (shareInfo, snapshotShared)=>{
-            const registeredShared = getRegisteredShare(origin.shareScopeMap, snapshotShared.sharedName, shareInfo, origin.hooks.lifecycle.resolveShare);
+        remoteSnapshot.shared.forEach((shared)=>{
+            var _options_shared;
+            const shareInfo = (_options_shared = options.shared) == null ? void 0 : _options_shared[shared.sharedName];
+            // When data is downgraded, the shared configuration may be different.
+            if (!shareInfo) {
+                return;
+            }
+            const registeredShared = getRegisteredShare(origin.shareScopeMap, shared.sharedName, shareInfo, origin.hooks.lifecycle.resolveShare);
             // If the global share does not exist, or the lib function does not exist, it means that the shared has not been loaded yet and can be preloaded.
             if (registeredShared && typeof registeredShared.lib === 'function') {
-                snapshotShared.assets.js.sync.forEach((asset)=>{
+                shared.assets.js.sync.forEach((asset)=>{
                     loadedSharedJsAssets.add(asset);
                 });
-                snapshotShared.assets.css.sync.forEach((asset)=>{
+                shared.assets.css.sync.forEach((asset)=>{
                     loadedSharedCssAssets.add(asset);
                 });
             }
-        };
-        remoteSnapshot.shared.forEach((shared)=>{
-            var _options_shared;
-            const shareInfos = (_options_shared = options.shared) == null ? void 0 : _options_shared[shared.sharedName];
-            if (!shareInfos) {
-                return;
-            }
-            // if no version, preload all shared
-            const sharedOptions = shared.version ? shareInfos.find((s)=>s.version === shared.version) : shareInfos;
-            if (!sharedOptions) {
-                return;
-            }
-            const arrayShareInfo = arrayOptions(sharedOptions);
-            arrayShareInfo.forEach((s)=>{
-                collectSharedAssets(s, shared);
-            });
         });
     }
     const needPreloadJsAssets = jsAssets.filter((asset)=>!loadedSharedJsAssets.has(asset));
@@ -1122,16 +1112,13 @@ class FederationHost {
         this.options = options;
         return options;
     }
-    async loadShare(pkgName, extraOptions) {
+    async loadShare(pkgName, customShareInfo) {
+        var _this_options_shared;
         // This function performs the following steps:
         // 1. Checks if the currently loaded share already exists, if not, it throws an error
         // 2. Searches globally for a matching share, if found, it uses it directly
         // 3. If not found, it retrieves it from the current share and stores the obtained share globally.
-        const shareInfo = getTargetSharedOptions({
-            pkgName,
-            extraOptions,
-            shareInfos: this.options.shared
-        });
+        const shareInfo = Object.assign({}, (_this_options_shared = this.options.shared) == null ? void 0 : _this_options_shared[pkgName], customShareInfo);
         if (shareInfo == null ? void 0 : shareInfo.scope) {
             await Promise.all(shareInfo.scope.map(async (shareScope)=>{
                 await Promise.all(this.initializeSharing(shareScope, shareInfo.strategy));
@@ -1190,7 +1177,7 @@ class FederationHost {
             });
             return loading;
         } else {
-            if (extraOptions == null ? void 0 : extraOptions.customShareInfo) {
+            if (customShareInfo) {
                 return false;
             }
             const asyncLoadProcess = async ()=>{
@@ -1221,12 +1208,9 @@ class FederationHost {
     // 1. If the loaded shared already exists globally, then it will be reused
     // 2. If lib exists in local shared, it will be used directly
     // 3. If the local get returns something other than Promise, then it will be used directly
-    loadShareSync(pkgName, extraOptions) {
-        const shareInfo = getTargetSharedOptions({
-            pkgName,
-            extraOptions,
-            shareInfos: this.options.shared
-        });
+    loadShareSync(pkgName, customShareInfo) {
+        var _this_options_shared;
+        const shareInfo = Object.assign({}, (_this_options_shared = this.options.shared) == null ? void 0 : _this_options_shared[pkgName], customShareInfo);
         if (shareInfo == null ? void 0 : shareInfo.scope) {
             shareInfo.scope.forEach((shareScope)=>{
                 this.initializeSharing(shareScope, shareInfo.strategy);
@@ -1466,11 +1450,9 @@ class FederationHost {
         };
         Object.keys(this.options.shared).forEach((shareName)=>{
             const shared = this.options.shared[shareName];
-            shared.forEach((s)=>{
-                if (s.scope.includes(shareScopeName)) {
-                    register(shareName, s);
-                }
-            });
+            if (shared.scope.includes(shareScopeName)) {
+                register(shareName, shared);
+            }
         });
         if (strategy === 'version-first') {
             this.options.remotes.forEach((remote)=>{
@@ -1491,19 +1473,7 @@ class FederationHost {
     }
     formatOptions(globalOptions, userOptions) {
         const formatShareOptions = formatShareConfigs(userOptions.shared || {}, userOptions.name);
-        const shared = _extends({}, globalOptions.shared);
-        Object.keys(formatShareOptions).forEach((shareKey)=>{
-            if (!shared[shareKey]) {
-                shared[shareKey] = formatShareOptions[shareKey];
-            } else {
-                formatShareOptions[shareKey].forEach((newUserSharedOptions)=>{
-                    const isSameVersion = shared[shareKey].find((s)=>s.version === newUserSharedOptions.version);
-                    if (!isSameVersion) {
-                        shared[shareKey].push(newUserSharedOptions);
-                    }
-                });
-            }
-        });
+        const shared = _extends({}, globalOptions.shared, formatShareOptions);
         const { userOptions: userOptionsRes, options: globalOptionsRes } = this.hooks.lifecycle.beforeInit.emit({
             origin: this,
             userOptions,
@@ -1521,19 +1491,17 @@ class FederationHost {
         const sharedKeys = Object.keys(formatShareOptions);
         sharedKeys.forEach((sharedKey)=>{
             const sharedVal = formatShareOptions[sharedKey];
-            sharedVal.forEach((s)=>{
-                const registeredShared = getRegisteredShare(this.shareScopeMap, sharedKey, s, this.hooks.lifecycle.resolveShare);
-                if (!registeredShared && s && s.lib) {
-                    this.setShared({
-                        pkgName: sharedKey,
-                        lib: s.lib,
-                        get: s.get,
-                        loaded: true,
-                        shared: s,
-                        from: userOptions.name
-                    });
-                }
-            });
+            const registeredShared = getRegisteredShare(this.shareScopeMap, sharedKey, sharedVal, this.hooks.lifecycle.resolveShare);
+            if (!registeredShared && sharedVal && sharedVal.lib) {
+                this.setShared({
+                    pkgName: sharedKey,
+                    lib: sharedVal.lib,
+                    get: sharedVal.get,
+                    loaded: true,
+                    shared: sharedVal,
+                    from: userOptions.name
+                });
+            }
         });
         const plugins = [
             ...globalOptionsRes.plugins

package/dist/package.json

@@ -15,19 +15,19 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/index.cjs.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js",
-      "types": "./dist/index.cjs.d.ts"
+      "require": "./dist/index.cjs.js"
     },
     "./helpers": {
+      "types": "./dist/helpers.cjs.d.ts",
       "import": "./dist/helpers.esm.js",
-      "require": "./dist/helpers.cjs.js",
-      "types": "./dist/helpers.cjs.d.ts"
+      "require": "./dist/helpers.cjs.js"
     },
     "./types": {
+      "types": "./dist/types.cjs.d.ts",
       "import": "./dist/types.esm.js",
-      "require": "./dist/types.cjs.js",
-      "types": "./dist/types.cjs.d.ts"
+      "require": "./dist/types.cjs.js"
     },
     "./*": "./*"
   },

package/dist/share.cjs.js

@@ -71,11 +71,6 @@ const objectToString = Object.prototype.toString;
 function isPlainObject(val) {
     return objectToString.call(val) === '[object Object]';
 }
-function arrayOptions(options) {
-    return Array.isArray(options) ? options : [
-        options
-    ];
-}
 
 function _extends$1() {
     _extends$1 = Object.assign || function(target) {
@@ -679,11 +674,7 @@ function formatShareConfigs(shareArgs, from) {
         return {};
     }
     return Object.keys(shareArgs).reduce((res, pkgName)=>{
-        const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
-        res[pkgName] = res[pkgName] || [];
-        arrayShareArgs.forEach((shareConfig)=>{
-            res[pkgName].push(formatShare(shareConfig, from));
-        });
+        res[pkgName] = formatShare(shareArgs[pkgName], from);
         return res;
     }, {});
 }
@@ -706,11 +697,12 @@ function versionLt(a, b) {
         return false;
     }
 }
-const findVersion = (shareVersionMap, cb)=>{
+const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
+    const versions = shareScopeMap[scope][pkgName];
     const callback = cb || function(prev, cur) {
         return versionLt(prev, cur);
     };
-    return Object.keys(shareVersionMap).reduce((prev, cur)=>{
+    return Object.keys(versions).reduce((prev, cur)=>{
         if (!prev) {
             return cur;
         }
@@ -732,7 +724,7 @@ function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const callback = function(prev, cur) {
         return !isLoaded(versions[prev]) && versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap[scope][pkgName], callback);
+    return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
@@ -749,7 +741,7 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
         }
         return versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap[scope][pkgName], callback);
+    return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function getFindShareFunction(strategy) {
     if (strategy === 'loaded-first') {
@@ -812,33 +804,12 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
 function getGlobalShareScope() {
     return Global.__FEDERATION__.__SHARE__;
 }
-function getTargetSharedOptions(options) {
-    const { pkgName, extraOptions, shareInfos } = options;
-    const defaultResolver = (sharedOptions)=>{
-        if (!sharedOptions) {
-            return undefined;
-        }
-        const shareVersionMap = {};
-        sharedOptions.forEach((shared)=>{
-            shareVersionMap[shared.version] = shared;
-        });
-        const callback = function(prev, cur) {
-            return !isLoaded(shareVersionMap[prev]) && versionLt(prev, cur);
-        };
-        const maxVersion = findVersion(shareVersionMap, callback);
-        return shareVersionMap[maxVersion];
-    };
-    var _extraOptions_resolver;
-    const resolver = (_extraOptions_resolver = extraOptions == null ? void 0 : extraOptions.resolver) != null ? _extraOptions_resolver : defaultResolver;
-    return Object.assign({}, resolver(shareInfos[pkgName]), extraOptions == null ? void 0 : extraOptions.customShareInfo);
-}
 
 exports.DEFAULT_REMOTE_TYPE = DEFAULT_REMOTE_TYPE;
 exports.DEFAULT_SCOPE = DEFAULT_SCOPE;
 exports.Global = Global;
 exports.addGlobalSnapshot = addGlobalSnapshot;
 exports.addUniqueItem = addUniqueItem;
-exports.arrayOptions = arrayOptions;
 exports.assert = assert;
 exports.error = error;
 exports.formatShareConfigs = formatShareConfigs;
@@ -854,7 +825,6 @@ exports.getInfoWithoutType = getInfoWithoutType;
 exports.getPreloaded = getPreloaded;
 exports.getRegisteredShare = getRegisteredShare;
 exports.getRemoteEntryExports = getRemoteEntryExports;
-exports.getTargetSharedOptions = getTargetSharedOptions;
 exports.getTargetSnapshotInfoByModuleInfo = getTargetSnapshotInfoByModuleInfo;
 exports.globalLoading = globalLoading;
 exports.isBrowserEnv = isBrowserEnv;

package/dist/share.esm.js

@@ -69,11 +69,6 @@ const objectToString = Object.prototype.toString;
 function isPlainObject(val) {
     return objectToString.call(val) === '[object Object]';
 }
-function arrayOptions(options) {
-    return Array.isArray(options) ? options : [
-        options
-    ];
-}
 
 function _extends$1() {
     _extends$1 = Object.assign || function(target) {
@@ -677,11 +672,7 @@ function formatShareConfigs(shareArgs, from) {
         return {};
     }
     return Object.keys(shareArgs).reduce((res, pkgName)=>{
-        const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
-        res[pkgName] = res[pkgName] || [];
-        arrayShareArgs.forEach((shareConfig)=>{
-            res[pkgName].push(formatShare(shareConfig, from));
-        });
+        res[pkgName] = formatShare(shareArgs[pkgName], from);
         return res;
     }, {});
 }
@@ -704,11 +695,12 @@ function versionLt(a, b) {
         return false;
     }
 }
-const findVersion = (shareVersionMap, cb)=>{
+const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
+    const versions = shareScopeMap[scope][pkgName];
     const callback = cb || function(prev, cur) {
         return versionLt(prev, cur);
     };
-    return Object.keys(shareVersionMap).reduce((prev, cur)=>{
+    return Object.keys(versions).reduce((prev, cur)=>{
         if (!prev) {
             return cur;
         }
@@ -730,7 +722,7 @@ function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const callback = function(prev, cur) {
         return !isLoaded(versions[prev]) && versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap[scope][pkgName], callback);
+    return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
@@ -747,7 +739,7 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
         }
         return versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap[scope][pkgName], callback);
+    return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function getFindShareFunction(strategy) {
     if (strategy === 'loaded-first') {
@@ -810,25 +802,5 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
 function getGlobalShareScope() {
     return Global.__FEDERATION__.__SHARE__;
 }
-function getTargetSharedOptions(options) {
-    const { pkgName, extraOptions, shareInfos } = options;
-    const defaultResolver = (sharedOptions)=>{
-        if (!sharedOptions) {
-            return undefined;
-        }
-        const shareVersionMap = {};
-        sharedOptions.forEach((shared)=>{
-            shareVersionMap[shared.version] = shared;
-        });
-        const callback = function(prev, cur) {
-            return !isLoaded(shareVersionMap[prev]) && versionLt(prev, cur);
-        };
-        const maxVersion = findVersion(shareVersionMap, callback);
-        return shareVersionMap[maxVersion];
-    };
-    var _extraOptions_resolver;
-    const resolver = (_extraOptions_resolver = extraOptions == null ? void 0 : extraOptions.resolver) != null ? _extraOptions_resolver : defaultResolver;
-    return Object.assign({}, resolver(shareInfos[pkgName]), extraOptions == null ? void 0 : extraOptions.customShareInfo);
-}
 
-export { isBrowserEnv as A, addUniqueItem 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, getGlobalShareScope as v, warn as w, getTargetSharedOptions as x, formatShareConfigs as y, getBuilderId as z };
+export { setGlobalFederationConstructor as A, getGlobalFederationInstance as B, getGlobalFederationConstructor as C, DEFAULT_REMOTE_TYPE as D, setGlobalFederationInstance as E, registerGlobalPlugins as F, Global as G, nativeGlobal as H, resetFederationGlobalInfo as I, getTargetSnapshotInfoByModuleInfo as J, 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, getRegisteredShare as l, getInfoWithoutType as m, getPreloaded as n, setPreloaded as o, getGlobalSnapshotInfoByModuleInfo as p, addGlobalSnapshot as q, setGlobalSnapshotInfoByModuleInfo as r, safeToString as s, getGlobalSnapshot as t, getGlobalShareScope as u, formatShareConfigs as v, warn as w, getBuilderId as x, isBrowserEnv as y, addUniqueItem as z };

package/dist/src/core.d.ts

@@ -136,14 +136,8 @@ export declare class FederationHost {
     constructor(userOptions: UserOptions);
     private _setGlobalShareScopeMap;
     initOptions(userOptions: UserOptions): Options;
-    loadShare<T>(pkgName: string, extraOptions?: {
-        customShareInfo?: Partial<Shared>;
-        resolver?: (sharedOptions: ShareInfos[string]) => Shared;
-    }): Promise<false | (() => T | undefined)>;
-    loadShareSync<T>(pkgName: string, extraOptions?: {
-        customShareInfo?: Partial<Shared>;
-        resolver?: (sharedOptions: ShareInfos[string]) => Shared;
-    }): () => T | never;
+    loadShare<T>(pkgName: string, customShareInfo?: Partial<Shared>): Promise<false | (() => T | undefined)>;
+    loadShareSync<T>(pkgName: string, customShareInfo?: Partial<Shared>): () => T | never;
     initRawContainer(name: string, url: string, container: RemoteEntryExports): Module;
     private _getRemoteModuleAndOptions;
     loadRemote<T>(id: string, options?: {

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

@@ -15,10 +15,6 @@ export type RemoteInfoOptionalVersion = {
     version?: string;
 } & RemoteInfoCommon;
 export type Remote = (RemoteWithEntry | RemoteWithVersion) & RemoteInfoCommon;
-export type LoadShareExtraOptions = {
-    customShareInfo?: Partial<Shared>;
-    resolver?: (sharedOptions: ShareInfos[string]) => Shared;
-};
 export interface RemoteInfo {
     name: string;
     version?: string;
@@ -73,7 +69,7 @@ export type GlobalShareScopeMap = {
     [instanceName: string]: ShareScopeMap;
 };
 export type ShareInfos = {
-    [pkgName: string]: Shared[];
+    [pkgName: string]: Shared;
 };
 export interface Options {
     id?: string;
@@ -86,7 +82,7 @@ export interface Options {
 }
 export type UserOptions = Omit<Optional<Options, 'plugins'>, 'shared' | 'inBrowser'> & {
     shared?: {
-        [pkgName: string]: ShareArgs | ShareArgs[];
+        [pkgName: string]: ShareArgs;
     };
 };
 export type LoadModuleOptions = {

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

@@ -1,12 +1,11 @@
 import { Federation } from '../global';
-import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap, LoadShareExtraOptions, UserOptions } from '../type';
+import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap } from '../type';
 import { SyncWaterfallHook } from './hooks';
 export declare function formatShare(shareArgs: ShareArgs, from: string): Shared;
-export declare function formatShareConfigs(shareArgs: UserOptions['shared'], from: string): ShareInfos;
-export declare function versionLt(a: string, b: string): boolean;
-export declare const findVersion: (shareVersionMap: ShareScopeMap[string][string], cb?: ((prev: string, cur: string) => boolean) | undefined) => string;
-export declare const isLoaded: (shared: Shared) => boolean;
-export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pkgName: string, shareInfo: Shared, resolveShare: SyncWaterfallHook<{
+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;
@@ -15,8 +14,3 @@ export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pk
     resolver: () => Shared | undefined;
 }>): Shared | void;
 export declare function getGlobalShareScope(): GlobalShareScopeMap;
-export declare function getTargetSharedOptions(options: {
-    pkgName: string;
-    extraOptions?: LoadShareExtraOptions;
-    shareInfos: ShareInfos;
-}): Shared & Partial<Shared>;

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

@@ -10,4 +10,3 @@ export declare function isObject(val: any): boolean;
 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>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.0.0-next-20240411125344",
+  "version": "0.0.0-next-20240412091739",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs",
   "module": "./dist/index.esm.js",
@@ -15,19 +15,19 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/index.cjs.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js",
-      "types": "./dist/index.cjs.d.ts"
+      "require": "./dist/index.cjs.js"
     },
     "./helpers": {
+      "types": "./dist/helpers.cjs.d.ts",
       "import": "./dist/helpers.esm.js",
-      "require": "./dist/helpers.cjs.js",
-      "types": "./dist/helpers.cjs.d.ts"
+      "require": "./dist/helpers.cjs.js"
     },
     "./types": {
+      "types": "./dist/types.cjs.d.ts",
       "import": "./dist/types.esm.js",
-      "require": "./dist/types.cjs.js",
-      "types": "./dist/types.cjs.d.ts"
+      "require": "./dist/types.cjs.js"
     },
     "./*": "./*"
   },
@@ -45,6 +45,6 @@
     }
   },
   "dependencies": {
-    "@module-federation/sdk": "0.0.0-next-20240411125344"
+    "@module-federation/sdk": "0.0.0-next-20240412091739"
   }
 }