@module-federation/runtime 0.0.0-next-20240122061426 → 0.0.0-next-20240122073529

package/dist/index.cjs.js

@@ -1324,7 +1324,7 @@ class FederationHost {
             const { module, moduleOptions, remoteMatchInfo } = await this._getRemoteModuleAndOptions(id);
             const { pkgNameOrAlias, remote, expose, id: idRes } = remoteMatchInfo;
             const moduleOrFactory = await module.get(expose, options);
-            await this.hooks.lifecycle.onLoad.emit({
+            const moduleWrapper = await this.hooks.lifecycle.onLoad.emit({
                 id: idRes,
                 pkgNameOrAlias,
                 expose,
@@ -1335,6 +1335,9 @@ class FederationHost {
                 moduleInstance: module,
                 origin: this
             });
+            if (typeof moduleWrapper === 'function') {
+                return moduleWrapper;
+            }
             return moduleOrFactory;
         } catch (error) {
             const { from = 'runtime' } = options || {
@@ -1461,7 +1464,7 @@ class FederationHost {
                 }
                 // Set the remote entry to a complete path
                 if ('entry' in remote) {
-                    if (share.isBrowserEnv()) {
+                    if (share.isBrowserEnv() && !remote.entry.startsWith('http')) {
                         remote.entry = new URL(remote.entry, window.location.origin).href;
                     }
                 }
@@ -1576,7 +1579,7 @@ class FederationHost {
             // not used yet
             afterPreloadRemote: new AsyncHook()
         });
-        this.version = "0.0.8";
+        this.version = "0.0.9";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -1322,7 +1322,7 @@ class FederationHost {
             const { module, moduleOptions, remoteMatchInfo } = await this._getRemoteModuleAndOptions(id);
             const { pkgNameOrAlias, remote, expose, id: idRes } = remoteMatchInfo;
             const moduleOrFactory = await module.get(expose, options);
-            await this.hooks.lifecycle.onLoad.emit({
+            const moduleWrapper = await this.hooks.lifecycle.onLoad.emit({
                 id: idRes,
                 pkgNameOrAlias,
                 expose,
@@ -1333,6 +1333,9 @@ class FederationHost {
                 moduleInstance: module,
                 origin: this
             });
+            if (typeof moduleWrapper === 'function') {
+                return moduleWrapper;
+            }
             return moduleOrFactory;
         } catch (error) {
             const { from = 'runtime' } = options || {
@@ -1459,7 +1462,7 @@ class FederationHost {
                 }
                 // Set the remote entry to a complete path
                 if ('entry' in remote) {
-                    if (isBrowserEnv()) {
+                    if (isBrowserEnv() && !remote.entry.startsWith('http')) {
                         remote.entry = new URL(remote.entry, window.location.origin).href;
                     }
                 }
@@ -1574,7 +1577,7 @@ class FederationHost {
             // not used yet
             afterPreloadRemote: new AsyncHook()
         });
-        this.version = "0.0.8";
+        this.version = "0.0.9";
         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.0.8",
+  "version": "0.0.9",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/dist/share.cjs.js

@@ -171,7 +171,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.8";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.9";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -702,24 +702,27 @@ const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
         return prev;
     }, 0);
 };
+const isLoaded = (shared)=>{
+    return Boolean(shared.loaded) || typeof shared.lib === 'function';
+};
 function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        return !versions[prev].loaded && versionLt(prev, cur);
+        return !isLoaded(versions[prev]) && versionLt(prev, cur);
     };
     return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        if (versions[cur].loaded) {
-            if (versions[prev].loaded) {
+        if (isLoaded(versions[cur])) {
+            if (isLoaded(versions[prev])) {
                 return Boolean(versionLt(prev, cur));
             } else {
                 return true;
             }
         }
-        if (versions[prev].loaded) {
+        if (isLoaded(versions[prev])) {
             return false;
         }
         return versionLt(prev, cur);

package/dist/share.esm.js

@@ -169,7 +169,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.8";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.9";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -700,24 +700,27 @@ const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
         return prev;
     }, 0);
 };
+const isLoaded = (shared)=>{
+    return Boolean(shared.loaded) || typeof shared.lib === 'function';
+};
 function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        return !versions[prev].loaded && versionLt(prev, cur);
+        return !isLoaded(versions[prev]) && versionLt(prev, cur);
     };
     return findVersion(shareScopeMap, scope, pkgName, callback);
 }
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        if (versions[cur].loaded) {
-            if (versions[prev].loaded) {
+        if (isLoaded(versions[cur])) {
+            if (isLoaded(versions[prev])) {
                 return Boolean(versionLt(prev, cur));
             } else {
                 return true;
             }
         }
-        if (versions[prev].loaded) {
+        if (isLoaded(versions[prev])) {
             return false;
         }
         return versionLt(prev, cur);

package/package.json

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