@module-federation/runtime 0.0.0-next-20240510094642 → 0.0.0-next-20240511031741

package/dist/index.cjs.js

@@ -1112,28 +1112,9 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 class SharedHandler {
-    formatShareConfigs(globalOptions, userOptions) {
-        const shareInfos = share.formatShareConfigs(userOptions.shared || {}, userOptions.name);
-        const shared = _extends$2({}, globalOptions.shared);
-        Object.keys(shareInfos).forEach((shareKey)=>{
-            if (!shared[shareKey]) {
-                shared[shareKey] = shareInfos[shareKey];
-            } else {
-                shareInfos[shareKey].forEach((newUserSharedOptions)=>{
-                    const isSameVersion = shared[shareKey].find((sharedVal)=>sharedVal.version === newUserSharedOptions.version);
-                    if (!isSameVersion) {
-                        shared[shareKey].push(newUserSharedOptions);
-                    }
-                });
-            }
-        });
-        return {
-            shared,
-            shareInfos
-        };
-    }
     // register shared in shareScopeMap
-    registerShared(shareInfos, userOptions) {
+    registerShared(globalOptions, userOptions) {
+        const { shareInfos, shared } = share.formatShareConfigs(globalOptions, userOptions);
         const sharedKeys = Object.keys(shareInfos);
         sharedKeys.forEach((sharedKey)=>{
             const sharedVals = shareInfos[sharedKey];
@@ -1151,6 +1132,10 @@ class SharedHandler {
                 }
             });
         });
+        return {
+            shareInfos,
+            shared
+        };
     }
     async loadShare(pkgName, extraOptions) {
         const { host } = this;
@@ -1759,7 +1744,7 @@ class FederationHost {
         this.sharedHandler.initShareScopeMap(scopeName, shareScope);
     }
     formatOptions(globalOptions, userOptions) {
-        const { shared, shareInfos } = this.sharedHandler.formatShareConfigs(globalOptions, userOptions);
+        const { shared } = share.formatShareConfigs(globalOptions, userOptions);
         const { userOptions: userOptionsRes, options: globalOptionsRes } = this.hooks.lifecycle.beforeInit.emit({
             origin: this,
             userOptions,
@@ -1767,7 +1752,7 @@ class FederationHost {
             shareInfo: shared
         });
         const remotes = this.remoteHandler.formatAndRegisterRemote(globalOptionsRes, userOptionsRes);
-        this.sharedHandler.registerShared(shareInfos, userOptions);
+        const { shared: handledShared } = this.sharedHandler.registerShared(globalOptionsRes, userOptionsRes);
         const plugins = [
             ...globalOptionsRes.plugins
         ];
@@ -1781,7 +1766,7 @@ class FederationHost {
         const optionsRes = _extends({}, globalOptions, userOptions, {
             plugins,
             remotes,
-            shared
+            shared: handledShared
         });
         this.hooks.lifecycle.init.emit({
             origin: this,
@@ -1818,7 +1803,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.13";
+        this.version = "0.1.12";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -1110,28 +1110,9 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 class SharedHandler {
-    formatShareConfigs(globalOptions, userOptions) {
-        const shareInfos = formatShareConfigs(userOptions.shared || {}, userOptions.name);
-        const shared = _extends$2({}, globalOptions.shared);
-        Object.keys(shareInfos).forEach((shareKey)=>{
-            if (!shared[shareKey]) {
-                shared[shareKey] = shareInfos[shareKey];
-            } else {
-                shareInfos[shareKey].forEach((newUserSharedOptions)=>{
-                    const isSameVersion = shared[shareKey].find((sharedVal)=>sharedVal.version === newUserSharedOptions.version);
-                    if (!isSameVersion) {
-                        shared[shareKey].push(newUserSharedOptions);
-                    }
-                });
-            }
-        });
-        return {
-            shared,
-            shareInfos
-        };
-    }
     // register shared in shareScopeMap
-    registerShared(shareInfos, userOptions) {
+    registerShared(globalOptions, userOptions) {
+        const { shareInfos, shared } = formatShareConfigs(globalOptions, userOptions);
         const sharedKeys = Object.keys(shareInfos);
         sharedKeys.forEach((sharedKey)=>{
             const sharedVals = shareInfos[sharedKey];
@@ -1149,6 +1130,10 @@ class SharedHandler {
                 }
             });
         });
+        return {
+            shareInfos,
+            shared
+        };
     }
     async loadShare(pkgName, extraOptions) {
         const { host } = this;
@@ -1757,7 +1742,7 @@ class FederationHost {
         this.sharedHandler.initShareScopeMap(scopeName, shareScope);
     }
     formatOptions(globalOptions, userOptions) {
-        const { shared, shareInfos } = this.sharedHandler.formatShareConfigs(globalOptions, userOptions);
+        const { shared } = formatShareConfigs(globalOptions, userOptions);
         const { userOptions: userOptionsRes, options: globalOptionsRes } = this.hooks.lifecycle.beforeInit.emit({
             origin: this,
             userOptions,
@@ -1765,7 +1750,7 @@ class FederationHost {
             shareInfo: shared
         });
         const remotes = this.remoteHandler.formatAndRegisterRemote(globalOptionsRes, userOptionsRes);
-        this.sharedHandler.registerShared(shareInfos, userOptions);
+        const { shared: handledShared } = this.sharedHandler.registerShared(globalOptionsRes, userOptionsRes);
         const plugins = [
             ...globalOptionsRes.plugins
         ];
@@ -1779,7 +1764,7 @@ class FederationHost {
         const optionsRes = _extends({}, globalOptions, userOptions, {
             plugins,
             remotes,
-            shared
+            shared: handledShared
         });
         this.hooks.lifecycle.init.emit({
             origin: this,
@@ -1816,7 +1801,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.13";
+        this.version = "0.1.12";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.13",
+  "version": "0.1.12",
   "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.13";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.12";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -697,11 +697,10 @@ function formatShare(shareArgs, from, name) {
         strategy: shareArgs.strategy || 'version-first'
     });
 }
-function formatShareConfigs(shareArgs, from) {
-    if (!shareArgs) {
-        return {};
-    }
-    return Object.keys(shareArgs).reduce((res, pkgName)=>{
+function formatShareConfigs(globalOptions, userOptions) {
+    const shareArgs = userOptions.shared || {};
+    const from = userOptions.name;
+    const shareInfos = Object.keys(shareArgs).reduce((res, pkgName)=>{
         const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
         res[pkgName] = res[pkgName] || [];
         arrayShareArgs.forEach((shareConfig)=>{
@@ -709,6 +708,23 @@ function formatShareConfigs(shareArgs, from) {
         });
         return res;
     }, {});
+    const shared = _extends({}, globalOptions.shared);
+    Object.keys(shareInfos).forEach((shareKey)=>{
+        if (!shared[shareKey]) {
+            shared[shareKey] = shareInfos[shareKey];
+        } else {
+            shareInfos[shareKey].forEach((newUserSharedOptions)=>{
+                const isSameVersion = shared[shareKey].find((sharedVal)=>sharedVal.version === newUserSharedOptions.version);
+                if (!isSameVersion) {
+                    shared[shareKey].push(newUserSharedOptions);
+                }
+            });
+        }
+    });
+    return {
+        shared,
+        shareInfos
+    };
 }
 function versionLt(a, b) {
     const transformInvalidVersion = (version)=>{

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.13";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.12";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -695,11 +695,10 @@ function formatShare(shareArgs, from, name) {
         strategy: shareArgs.strategy || 'version-first'
     });
 }
-function formatShareConfigs(shareArgs, from) {
-    if (!shareArgs) {
-        return {};
-    }
-    return Object.keys(shareArgs).reduce((res, pkgName)=>{
+function formatShareConfigs(globalOptions, userOptions) {
+    const shareArgs = userOptions.shared || {};
+    const from = userOptions.name;
+    const shareInfos = Object.keys(shareArgs).reduce((res, pkgName)=>{
         const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
         res[pkgName] = res[pkgName] || [];
         arrayShareArgs.forEach((shareConfig)=>{
@@ -707,6 +706,23 @@ function formatShareConfigs(shareArgs, from) {
         });
         return res;
     }, {});
+    const shared = _extends({}, globalOptions.shared);
+    Object.keys(shareInfos).forEach((shareKey)=>{
+        if (!shared[shareKey]) {
+            shared[shareKey] = shareInfos[shareKey];
+        } else {
+            shareInfos[shareKey].forEach((newUserSharedOptions)=>{
+                const isSameVersion = shared[shareKey].find((sharedVal)=>sharedVal.version === newUserSharedOptions.version);
+                if (!isSameVersion) {
+                    shared[shareKey].push(newUserSharedOptions);
+                }
+            });
+        }
+    });
+    return {
+        shared,
+        shareInfos
+    };
 }
 function versionLt(a, b) {
     const transformInvalidVersion = (version)=>{

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

@@ -30,13 +30,12 @@ export declare class SharedHandler {
         }>;
     }>;
     constructor(host: FederationHost);
-    formatShareConfigs(globalOptions: Options, userOptions: UserOptions): {
+    registerShared(globalOptions: Options, userOptions: UserOptions): {
+        shareInfos: ShareInfos;
         shared: {
             [x: string]: Shared[];
         };
-        shareInfos: ShareInfos;
     };
-    registerShared(shareInfos: ShareInfos, userOptions: UserOptions): void;
     loadShare<T>(pkgName: string, extraOptions?: {
         customShareInfo?: Partial<Shared>;
         resolver?: (sharedOptions: ShareInfos[string]) => Shared;

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

@@ -1,8 +1,13 @@
 import { Federation } from '../global';
-import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap, LoadShareExtraOptions, UserOptions } from '../type';
+import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap, LoadShareExtraOptions, UserOptions, Options } from '../type';
 import { SyncWaterfallHook } from './hooks';
 export declare function formatShare(shareArgs: ShareArgs, from: string, name: string): Shared;
-export declare function formatShareConfigs(shareArgs: UserOptions['shared'], from: string): ShareInfos;
+export declare function formatShareConfigs(globalOptions: Options, userOptions: UserOptions): {
+    shared: {
+        [x: string]: Shared[];
+    };
+    shareInfos: 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.0.0-next-20240510094642",
+  "version": "0.0.0-next-20240511031741",
   "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-20240510094642"
+    "@module-federation/sdk": "0.0.0-next-20240511031741"
   }
 }