@module-federation/runtime-core 0.18.1 → 0.18.3

package/dist/index.cjs.cjs

@@ -202,7 +202,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = sdk.isDebugMode()) {
     if (isDebug) {
         CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.18.1";
+        CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.18.3";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -2247,30 +2247,30 @@ class SharedHandler {
         // 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({
+        const shareOptions = getTargetSharedOptions({
             pkgName,
             extraOptions,
             shareInfos: host.options.shared
         });
-        if (shareInfo == null ? void 0 : shareInfo.scope) {
-            await Promise.all(shareInfo.scope.map(async (shareScope)=>{
+        if (shareOptions == null ? void 0 : shareOptions.scope) {
+            await Promise.all(shareOptions.scope.map(async (shareScope)=>{
                 await Promise.all(this.initializeSharing(shareScope, {
-                    strategy: shareInfo.strategy
+                    strategy: shareOptions.strategy
                 }));
                 return;
             }));
         }
         const loadShareRes = await this.hooks.lifecycle.beforeLoadShare.emit({
             pkgName,
-            shareInfo,
+            shareInfo: shareOptions,
             shared: host.options.shared,
             origin: host
         });
-        const { shareInfo: shareInfoRes } = loadShareRes;
+        const { shareInfo: shareOptionsRes } = loadShareRes;
         // Assert that shareInfoRes exists, if not, throw an error
-        assert(shareInfoRes, `Cannot find ${pkgName} Share in the ${host.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
+        assert(shareOptionsRes, `Cannot find ${pkgName} Share in the ${host.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
         // Retrieve from cache
-        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare);
         const addUseIn = (shared)=>{
             if (!shared.useIn) {
                 shared.useIn = [];
@@ -2291,15 +2291,9 @@ class SharedHandler {
         } else if (registeredShared) {
             const asyncLoadProcess = async ()=>{
                 const factory = await registeredShared.get();
-                shareInfoRes.lib = factory;
-                shareInfoRes.loaded = true;
-                addUseIn(shareInfoRes);
-                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
-                if (gShared) {
-                    gShared.lib = factory;
-                    gShared.loaded = true;
-                    addUseIn(gShared);
-                }
+                addUseIn(registeredShared);
+                registeredShared.loaded = true;
+                registeredShared.lib = factory;
                 return factory;
             };
             const loading = asyncLoadProcess();
@@ -2317,14 +2311,15 @@ class SharedHandler {
                 return false;
             }
             const asyncLoadProcess = async ()=>{
-                const factory = await shareInfoRes.get();
-                shareInfoRes.lib = factory;
-                shareInfoRes.loaded = true;
-                addUseIn(shareInfoRes);
-                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
+                const factory = await shareOptionsRes.get();
+                shareOptionsRes.lib = factory;
+                shareOptionsRes.loaded = true;
+                addUseIn(shareOptionsRes);
+                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare);
                 if (gShared) {
                     gShared.lib = factory;
                     gShared.loaded = true;
+                    gShared.from = shareOptionsRes.from;
                 }
                 return factory;
             };
@@ -2332,7 +2327,7 @@ class SharedHandler {
             this.setShared({
                 pkgName,
                 loaded: false,
-                shared: shareInfoRes,
+                shared: shareOptionsRes,
                 from: host.options.name,
                 lib: null,
                 loading
@@ -2428,19 +2423,19 @@ class SharedHandler {
     // 3. If the local get returns something other than Promise, then it will be used directly
     loadShareSync(pkgName, extraOptions) {
         const { host } = this;
-        const shareInfo = getTargetSharedOptions({
+        const shareOptions = getTargetSharedOptions({
             pkgName,
             extraOptions,
             shareInfos: host.options.shared
         });
-        if (shareInfo == null ? void 0 : shareInfo.scope) {
-            shareInfo.scope.forEach((shareScope)=>{
+        if (shareOptions == null ? void 0 : shareOptions.scope) {
+            shareOptions.scope.forEach((shareScope)=>{
                 this.initializeSharing(shareScope, {
-                    strategy: shareInfo.strategy
+                    strategy: shareOptions.strategy
                 });
             });
         }
-        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfo, this.hooks.lifecycle.resolveShare);
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptions, this.hooks.lifecycle.resolveShare);
         const addUseIn = (shared)=>{
             if (!shared.useIn) {
                 shared.useIn = [];
@@ -2453,7 +2448,7 @@ class SharedHandler {
                 if (!registeredShared.loaded) {
                     registeredShared.loaded = true;
                     if (registeredShared.from === host.options.name) {
-                        shareInfo.loaded = true;
+                        shareOptions.loaded = true;
                     }
                 }
                 return registeredShared.lib;
@@ -2473,14 +2468,14 @@ class SharedHandler {
                 }
             }
         }
-        if (shareInfo.lib) {
-            if (!shareInfo.loaded) {
-                shareInfo.loaded = true;
+        if (shareOptions.lib) {
+            if (!shareOptions.loaded) {
+                shareOptions.loaded = true;
             }
-            return shareInfo.lib;
+            return shareOptions.lib;
         }
-        if (shareInfo.get) {
-            const module = shareInfo.get();
+        if (shareOptions.get) {
+            const module = shareOptions.get();
             if (module instanceof Promise) {
                 const errorCode = (extraOptions == null ? void 0 : extraOptions.from) === 'build' ? errorCodes.RUNTIME_005 : errorCodes.RUNTIME_006;
                 throw new Error(errorCodes.getShortErrorMsg(errorCode, errorCodes.runtimeDescMap, {
@@ -2488,15 +2483,15 @@ class SharedHandler {
                     sharedPkgName: pkgName
                 }));
             }
-            shareInfo.lib = module;
+            shareOptions.lib = module;
             this.setShared({
                 pkgName,
                 loaded: true,
                 from: host.options.name,
-                lib: shareInfo.lib,
-                shared: shareInfo
+                lib: shareOptions.lib,
+                shared: shareOptions
             });
-            return shareInfo.lib;
+            return shareOptions.lib;
         }
         throw new Error(errorCodes.getShortErrorMsg(errorCodes.RUNTIME_006, errorCodes.runtimeDescMap, {
             hostName: host.options.name,
@@ -2549,6 +2544,12 @@ class SharedHandler {
             if (loading && !registeredShared.loading) {
                 registeredShared.loading = loading;
             }
+            if (loaded && !registeredShared.loaded) {
+                registeredShared.loaded = loaded;
+            }
+            if (from && registeredShared.from !== from) {
+                registeredShared.from = from;
+            }
         });
     }
     _setGlobalShareScopeMap(hostOptions) {
@@ -3034,7 +3035,7 @@ class ModuleFederation {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.18.1";
+        this.version = "0.18.3";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -201,7 +201,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.18.1";
+        CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.18.3";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -2246,30 +2246,30 @@ class SharedHandler {
         // 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({
+        const shareOptions = getTargetSharedOptions({
             pkgName,
             extraOptions,
             shareInfos: host.options.shared
         });
-        if (shareInfo == null ? void 0 : shareInfo.scope) {
-            await Promise.all(shareInfo.scope.map(async (shareScope)=>{
+        if (shareOptions == null ? void 0 : shareOptions.scope) {
+            await Promise.all(shareOptions.scope.map(async (shareScope)=>{
                 await Promise.all(this.initializeSharing(shareScope, {
-                    strategy: shareInfo.strategy
+                    strategy: shareOptions.strategy
                 }));
                 return;
             }));
         }
         const loadShareRes = await this.hooks.lifecycle.beforeLoadShare.emit({
             pkgName,
-            shareInfo,
+            shareInfo: shareOptions,
             shared: host.options.shared,
             origin: host
         });
-        const { shareInfo: shareInfoRes } = loadShareRes;
+        const { shareInfo: shareOptionsRes } = loadShareRes;
         // Assert that shareInfoRes exists, if not, throw an error
-        assert(shareInfoRes, `Cannot find ${pkgName} Share in the ${host.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
+        assert(shareOptionsRes, `Cannot find ${pkgName} Share in the ${host.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
         // Retrieve from cache
-        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare);
         const addUseIn = (shared)=>{
             if (!shared.useIn) {
                 shared.useIn = [];
@@ -2290,15 +2290,9 @@ class SharedHandler {
         } else if (registeredShared) {
             const asyncLoadProcess = async ()=>{
                 const factory = await registeredShared.get();
-                shareInfoRes.lib = factory;
-                shareInfoRes.loaded = true;
-                addUseIn(shareInfoRes);
-                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
-                if (gShared) {
-                    gShared.lib = factory;
-                    gShared.loaded = true;
-                    addUseIn(gShared);
-                }
+                addUseIn(registeredShared);
+                registeredShared.loaded = true;
+                registeredShared.lib = factory;
                 return factory;
             };
             const loading = asyncLoadProcess();
@@ -2316,14 +2310,15 @@ class SharedHandler {
                 return false;
             }
             const asyncLoadProcess = async ()=>{
-                const factory = await shareInfoRes.get();
-                shareInfoRes.lib = factory;
-                shareInfoRes.loaded = true;
-                addUseIn(shareInfoRes);
-                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
+                const factory = await shareOptionsRes.get();
+                shareOptionsRes.lib = factory;
+                shareOptionsRes.loaded = true;
+                addUseIn(shareOptionsRes);
+                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare);
                 if (gShared) {
                     gShared.lib = factory;
                     gShared.loaded = true;
+                    gShared.from = shareOptionsRes.from;
                 }
                 return factory;
             };
@@ -2331,7 +2326,7 @@ class SharedHandler {
             this.setShared({
                 pkgName,
                 loaded: false,
-                shared: shareInfoRes,
+                shared: shareOptionsRes,
                 from: host.options.name,
                 lib: null,
                 loading
@@ -2427,19 +2422,19 @@ class SharedHandler {
     // 3. If the local get returns something other than Promise, then it will be used directly
     loadShareSync(pkgName, extraOptions) {
         const { host } = this;
-        const shareInfo = getTargetSharedOptions({
+        const shareOptions = getTargetSharedOptions({
             pkgName,
             extraOptions,
             shareInfos: host.options.shared
         });
-        if (shareInfo == null ? void 0 : shareInfo.scope) {
-            shareInfo.scope.forEach((shareScope)=>{
+        if (shareOptions == null ? void 0 : shareOptions.scope) {
+            shareOptions.scope.forEach((shareScope)=>{
                 this.initializeSharing(shareScope, {
-                    strategy: shareInfo.strategy
+                    strategy: shareOptions.strategy
                 });
             });
         }
-        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfo, this.hooks.lifecycle.resolveShare);
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptions, this.hooks.lifecycle.resolveShare);
         const addUseIn = (shared)=>{
             if (!shared.useIn) {
                 shared.useIn = [];
@@ -2452,7 +2447,7 @@ class SharedHandler {
                 if (!registeredShared.loaded) {
                     registeredShared.loaded = true;
                     if (registeredShared.from === host.options.name) {
-                        shareInfo.loaded = true;
+                        shareOptions.loaded = true;
                     }
                 }
                 return registeredShared.lib;
@@ -2472,14 +2467,14 @@ class SharedHandler {
                 }
             }
         }
-        if (shareInfo.lib) {
-            if (!shareInfo.loaded) {
-                shareInfo.loaded = true;
+        if (shareOptions.lib) {
+            if (!shareOptions.loaded) {
+                shareOptions.loaded = true;
             }
-            return shareInfo.lib;
+            return shareOptions.lib;
         }
-        if (shareInfo.get) {
-            const module = shareInfo.get();
+        if (shareOptions.get) {
+            const module = shareOptions.get();
             if (module instanceof Promise) {
                 const errorCode = (extraOptions == null ? void 0 : extraOptions.from) === 'build' ? RUNTIME_005 : RUNTIME_006;
                 throw new Error(getShortErrorMsg(errorCode, runtimeDescMap, {
@@ -2487,15 +2482,15 @@ class SharedHandler {
                     sharedPkgName: pkgName
                 }));
             }
-            shareInfo.lib = module;
+            shareOptions.lib = module;
             this.setShared({
                 pkgName,
                 loaded: true,
                 from: host.options.name,
-                lib: shareInfo.lib,
-                shared: shareInfo
+                lib: shareOptions.lib,
+                shared: shareOptions
             });
-            return shareInfo.lib;
+            return shareOptions.lib;
         }
         throw new Error(getShortErrorMsg(RUNTIME_006, runtimeDescMap, {
             hostName: host.options.name,
@@ -2548,6 +2543,12 @@ class SharedHandler {
             if (loading && !registeredShared.loading) {
                 registeredShared.loading = loading;
             }
+            if (loaded && !registeredShared.loaded) {
+                registeredShared.loaded = loaded;
+            }
+            if (from && registeredShared.from !== from) {
+                registeredShared.from = from;
+            }
         });
     }
     _setGlobalShareScopeMap(hostOptions) {
@@ -3033,7 +3034,7 @@ class ModuleFederation {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.18.1";
+        this.version = "0.18.3";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime-core",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "type": "module",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs.cjs",
@@ -52,7 +52,7 @@
     }
   },
   "dependencies": {
-    "@module-federation/error-codes": "0.18.1",
-    "@module-federation/sdk": "0.18.1"
+    "@module-federation/sdk": "0.18.3",
+    "@module-federation/error-codes": "0.18.3"
   }
 }