@module-federation/runtime 0.6.16 → 0.7.0

package/dist/{helpers.esm.js → helpers.esm.mjs}

@@ -1,4 +1,4 @@
-import { g as getRegisteredShare, a as getGlobalShareScope, G as Global, n as nativeGlobal, r as resetFederationGlobalInfo, b as getGlobalFederationInstance, s as setGlobalFederationInstance, c as getGlobalFederationConstructor, d as setGlobalFederationConstructor, e as getInfoWithoutType, f as getGlobalSnapshot, h as getTargetSnapshotInfoByModuleInfo, i as getGlobalSnapshotInfoByModuleInfo, j as setGlobalSnapshotInfoByModuleInfo, k as addGlobalSnapshot, l as getRemoteEntryExports, m as registerGlobalPlugins, o as getGlobalHostPlugins, p as getPreloaded, q as setPreloaded } from './share.esm.js';
+import { g as getRegisteredShare, a as getGlobalShareScope, G as Global, n as nativeGlobal, r as resetFederationGlobalInfo, b as getGlobalFederationInstance, s as setGlobalFederationInstance, c as getGlobalFederationConstructor, d as setGlobalFederationConstructor, e as getInfoWithoutType, f as getGlobalSnapshot, h as getTargetSnapshotInfoByModuleInfo, i as getGlobalSnapshotInfoByModuleInfo, j as setGlobalSnapshotInfoByModuleInfo, k as addGlobalSnapshot, l as getRemoteEntryExports, m as registerGlobalPlugins, o as getGlobalHostPlugins, p as getPreloaded, q as setPreloaded } from './share.esm.mjs';
 
 const ShareUtils = {
     getRegisteredShare,

package/dist/index.cjs.js

@@ -124,7 +124,7 @@ async function loadSystemJsEntry({ entry, remoteEntryExports }) {
         }
     });
 }
-async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
+async function loadEntryScript({ name, globalName, entry, loaderHook }) {
     const { entryExports: remoteEntryExports } = share.getRemoteEntryExports(name, globalName);
     if (remoteEntryExports) {
         return remoteEntryExports;
@@ -132,7 +132,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     return sdk.loadScript(entry, {
         attrs: {},
         createScriptHook: (url, attrs)=>{
-            const res = createScriptHook.emit({
+            const res = loaderHook.lifecycle.createScript.emit({
                 url,
                 attrs
             });
@@ -157,7 +157,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
         throw e;
     });
 }
-async function loadEntryDom({ remoteInfo, remoteEntryExports, createScriptHook }) {
+async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook }) {
     const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
     switch(type){
         case 'esm':
@@ -176,11 +176,11 @@ async function loadEntryDom({ remoteInfo, remoteEntryExports, createScriptHook }
                 entry,
                 globalName,
                 name,
-                createScriptHook
+                loaderHook
             });
     }
 }
-async function loadEntryNode({ remoteInfo, createScriptHook }) {
+async function loadEntryNode({ remoteInfo, loaderHook }) {
     const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
     const { entryExports: remoteEntryExports } = share.getRemoteEntryExports(name, globalName);
     if (remoteEntryExports) {
@@ -192,16 +192,18 @@ async function loadEntryNode({ remoteInfo, createScriptHook }) {
             globalName,
             type
         },
-        createScriptHook: (url, attrs)=>{
-            const res = createScriptHook.emit({
-                url,
-                attrs
-            });
-            if (!res) return;
-            if ('url' in res) {
-                return res;
+        loaderHook: {
+            createScriptHook: (url, attrs = {})=>{
+                const res = loaderHook.lifecycle.createScript.emit({
+                    url,
+                    attrs
+                });
+                if (!res) return;
+                if ('url' in res) {
+                    return res;
+                }
+                return;
             }
-            return;
         }
     }).then(()=>{
         const { remoteEntryKey, entryExports } = share.getRemoteEntryExports(name, globalName);
@@ -226,9 +228,10 @@ async function getRemoteEntry({ origin, remoteEntryExports, remoteInfo }) {
     }
     if (!share.globalLoading[uniqueKey]) {
         const loadEntryHook = origin.remoteHandler.hooks.lifecycle.loadEntry;
-        const createScriptHook = origin.loaderHook.lifecycle.createScript;
+        origin.loaderHook.lifecycle.createScript;
+        const loaderHook = origin.loaderHook;
         share.globalLoading[uniqueKey] = loadEntryHook.emit({
-            createScriptHook,
+            loaderHook,
             remoteInfo,
             remoteEntryExports
         }).then((res)=>{
@@ -238,10 +241,10 @@ async function getRemoteEntry({ origin, remoteEntryExports, remoteInfo }) {
             return sdk.isBrowserEnv() ? loadEntryDom({
                 remoteInfo,
                 remoteEntryExports,
-                createScriptHook
+                loaderHook
             }) : loadEntryNode({
                 remoteInfo,
-                createScriptHook
+                loaderHook
             });
         });
     }
@@ -1996,7 +1999,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.6.16";
+        this.version = "0.7.0";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/{index.esm.js → index.esm.mjs}

@@ -1,8 +1,8 @@
-import { a as _extends, _ as _object_without_properties_loose } from './polyfills.esm.js';
+import { a as _extends, _ as _object_without_properties_loose } from './polyfills.esm.mjs';
 import { isBrowserEnv, loadScriptNode, composeKeyWithSeparator, loadScript, safeToString, createLink, createScript, getResourceUrl, isManifestProvider, generateSnapshotFromManifest, warn as warn$1 } from '@module-federation/sdk';
 export { loadScript, loadScriptNode } from '@module-federation/sdk';
-import { o as getGlobalHostPlugins, t as globalLoading, D as DEFAULT_REMOTE_TYPE, u as DEFAULT_SCOPE, l as getRemoteEntryExports, v as assert, w as error, x as getFMId, y as isObject, z as warn, A as isPlainObject, B as isRemoteInfoWithEntry, C as isPureRemoteEntry, E as getRemoteEntryInfoFromSnapshot, e as getInfoWithoutType, p as getPreloaded, q as setPreloaded, g as getRegisteredShare, F as arrayOptions, i as getGlobalSnapshotInfoByModuleInfo, k as addGlobalSnapshot, j as setGlobalSnapshotInfoByModuleInfo, G as Global, f as getGlobalSnapshot, H as formatShareConfigs, I as getTargetSharedOptions, a as getGlobalShareScope, J as addUniqueItem, K as logger, L as getBuilderId, d as setGlobalFederationConstructor, b as getGlobalFederationInstance, c as getGlobalFederationConstructor, s as setGlobalFederationInstance } from './share.esm.js';
-export { m as registerGlobalPlugins } from './share.esm.js';
+import { o as getGlobalHostPlugins, t as globalLoading, D as DEFAULT_REMOTE_TYPE, u as DEFAULT_SCOPE, l as getRemoteEntryExports, v as assert, w as error, x as getFMId, y as isObject, z as warn, A as isPlainObject, B as isRemoteInfoWithEntry, C as isPureRemoteEntry, E as getRemoteEntryInfoFromSnapshot, e as getInfoWithoutType, p as getPreloaded, q as setPreloaded, g as getRegisteredShare, F as arrayOptions, i as getGlobalSnapshotInfoByModuleInfo, k as addGlobalSnapshot, j as setGlobalSnapshotInfoByModuleInfo, G as Global, f as getGlobalSnapshot, H as formatShareConfigs, I as getTargetSharedOptions, a as getGlobalShareScope, J as addUniqueItem, K as logger, L as getBuilderId, d as setGlobalFederationConstructor, b as getGlobalFederationInstance, c as getGlobalFederationConstructor, s as setGlobalFederationInstance } from './share.esm.mjs';
+export { m as registerGlobalPlugins } from './share.esm.mjs';
 import { getShortErrorMsg, RUNTIME_001, runtimeDescMap, RUNTIME_002, RUNTIME_007, RUNTIME_003, RUNTIME_005, RUNTIME_006, RUNTIME_004 } from '@module-federation/error-codes';
 
 // Function to match a remote with its name and expose
@@ -124,7 +124,7 @@ async function loadSystemJsEntry({ entry, remoteEntryExports }) {
         }
     });
 }
-async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
+async function loadEntryScript({ name, globalName, entry, loaderHook }) {
     const { entryExports: remoteEntryExports } = getRemoteEntryExports(name, globalName);
     if (remoteEntryExports) {
         return remoteEntryExports;
@@ -132,7 +132,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     return loadScript(entry, {
         attrs: {},
         createScriptHook: (url, attrs)=>{
-            const res = createScriptHook.emit({
+            const res = loaderHook.lifecycle.createScript.emit({
                 url,
                 attrs
             });
@@ -157,7 +157,7 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
         throw e;
     });
 }
-async function loadEntryDom({ remoteInfo, remoteEntryExports, createScriptHook }) {
+async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook }) {
     const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
     switch(type){
         case 'esm':
@@ -176,11 +176,11 @@ async function loadEntryDom({ remoteInfo, remoteEntryExports, createScriptHook }
                 entry,
                 globalName,
                 name,
-                createScriptHook
+                loaderHook
             });
     }
 }
-async function loadEntryNode({ remoteInfo, createScriptHook }) {
+async function loadEntryNode({ remoteInfo, loaderHook }) {
     const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
     const { entryExports: remoteEntryExports } = getRemoteEntryExports(name, globalName);
     if (remoteEntryExports) {
@@ -192,16 +192,18 @@ async function loadEntryNode({ remoteInfo, createScriptHook }) {
             globalName,
             type
         },
-        createScriptHook: (url, attrs)=>{
-            const res = createScriptHook.emit({
-                url,
-                attrs
-            });
-            if (!res) return;
-            if ('url' in res) {
-                return res;
+        loaderHook: {
+            createScriptHook: (url, attrs = {})=>{
+                const res = loaderHook.lifecycle.createScript.emit({
+                    url,
+                    attrs
+                });
+                if (!res) return;
+                if ('url' in res) {
+                    return res;
+                }
+                return;
             }
-            return;
         }
     }).then(()=>{
         const { remoteEntryKey, entryExports } = getRemoteEntryExports(name, globalName);
@@ -226,9 +228,10 @@ async function getRemoteEntry({ origin, remoteEntryExports, remoteInfo }) {
     }
     if (!globalLoading[uniqueKey]) {
         const loadEntryHook = origin.remoteHandler.hooks.lifecycle.loadEntry;
-        const createScriptHook = origin.loaderHook.lifecycle.createScript;
+        origin.loaderHook.lifecycle.createScript;
+        const loaderHook = origin.loaderHook;
         globalLoading[uniqueKey] = loadEntryHook.emit({
-            createScriptHook,
+            loaderHook,
             remoteInfo,
             remoteEntryExports
         }).then((res)=>{
@@ -238,10 +241,10 @@ async function getRemoteEntry({ origin, remoteEntryExports, remoteInfo }) {
             return isBrowserEnv() ? loadEntryDom({
                 remoteInfo,
                 remoteEntryExports,
-                createScriptHook
+                loaderHook
             }) : loadEntryNode({
                 remoteInfo,
-                createScriptHook
+                loaderHook
             });
         });
     }
@@ -1996,7 +1999,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.6.16";
+        this.version = "0.7.0";
         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.6.16",
+  "version": "0.7.0",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
@@ -16,22 +16,22 @@
   "exports": {
     ".": {
       "types": "./dist/index.cjs.d.ts",
-      "import": "./dist/index.esm.js",
+      "import": "./dist/index.esm.mjs",
       "require": "./dist/index.cjs.js"
     },
     "./helpers": {
       "types": "./dist/helpers.cjs.d.ts",
-      "import": "./dist/helpers.esm.js",
+      "import": "./dist/helpers.esm.mjs",
       "require": "./dist/helpers.cjs.js"
     },
     "./types": {
       "types": "./dist/types.cjs.d.ts",
-      "import": "./dist/types.esm.js",
+      "import": "./dist/types.esm.mjs",
       "require": "./dist/types.cjs.js"
     },
     "./embedded": {
       "types": "./dist/embedded.cjs.d.ts",
-      "import": "./dist/embedded.esm.js",
+      "import": "./dist/embedded.esm.mjs",
       "require": "./dist/embedded.cjs.js"
     },
     "./*": "./*"

package/dist/share.cjs.js

@@ -92,8 +92,10 @@ function getRemoteEntryInfoFromSnapshot(snapshot) {
 
 const nativeGlobal = (()=>{
     try {
-        return new Function('return this')();
+        // get real window (incase of sandbox)
+        return document.defaultView;
     } catch (e) {
+        // node env
         return globalThis;
     }
 })();
@@ -177,7 +179,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = sdk.isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.6.16";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.7.0";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -763,6 +765,9 @@ const findVersion = (shareVersionMap, cb)=>{
 const isLoaded = (shared)=>{
     return Boolean(shared.loaded) || typeof shared.lib === 'function';
 };
+const isLoading = (shared)=>{
+    return Boolean(shared.loading);
+};
 function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
@@ -773,14 +778,17 @@ function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        if (isLoaded(versions[cur])) {
-            if (isLoaded(versions[prev])) {
+        const isLoadingOrLoaded = (shared)=>{
+            return isLoaded(shared) || isLoading(shared);
+        };
+        if (isLoadingOrLoaded(versions[cur])) {
+            if (isLoadingOrLoaded(versions[prev])) {
                 return Boolean(versionLt(prev, cur));
             } else {
                 return true;
             }
         }
-        if (isLoaded(versions[prev])) {
+        if (isLoadingOrLoaded(versions[prev])) {
             return false;
         }
         return versionLt(prev, cur);

package/dist/{share.esm.js → share.esm.mjs}

@@ -1,4 +1,4 @@
-import { _ as _object_without_properties_loose, a as _extends } from './polyfills.esm.js';
+import { _ as _object_without_properties_loose, a as _extends } from './polyfills.esm.mjs';
 import { createLogger, isBrowserEnv, isDebugMode } from '@module-federation/sdk';
 
 function getBuilderId() {
@@ -90,8 +90,10 @@ function getRemoteEntryInfoFromSnapshot(snapshot) {
 
 const nativeGlobal = (()=>{
     try {
-        return new Function('return this')();
+        // get real window (incase of sandbox)
+        return document.defaultView;
     } catch (e) {
+        // node env
         return globalThis;
     }
 })();
@@ -175,7 +177,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.6.16";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.7.0";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -761,6 +763,9 @@ const findVersion = (shareVersionMap, cb)=>{
 const isLoaded = (shared)=>{
     return Boolean(shared.loaded) || typeof shared.lib === 'function';
 };
+const isLoading = (shared)=>{
+    return Boolean(shared.loading);
+};
 function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
@@ -771,14 +776,17 @@ function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
     const callback = function(prev, cur) {
-        if (isLoaded(versions[cur])) {
-            if (isLoaded(versions[prev])) {
+        const isLoadingOrLoaded = (shared)=>{
+            return isLoaded(shared) || isLoading(shared);
+        };
+        if (isLoadingOrLoaded(versions[cur])) {
+            if (isLoadingOrLoaded(versions[prev])) {
                 return Boolean(versionLt(prev, cur));
             } else {
                 return true;
             }
         }
-        if (isLoaded(versions[prev])) {
+        if (isLoadingOrLoaded(versions[prev])) {
             return false;
         }
         return versionLt(prev, cur);

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

@@ -79,7 +79,7 @@ export declare class RemoteHandler {
             origin: FederationHost;
         }, false | void | Promise<false | void>>;
         loadEntry: AsyncHook<[{
-            createScriptHook: FederationHost["loaderHook"]["lifecycle"]["createScript"];
+            loaderHook: FederationHost["loaderHook"];
             remoteInfo: RemoteInfo;
             remoteEntryExports?: RemoteEntryExports;
         }], Promise<RemoteEntryExports>>;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.6.16",
+  "version": "0.7.0",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "module": "./dist/index.esm.mjs",
   "types": "./dist/index.cjs.d.ts",
   "license": "MIT",
   "publishConfig": {
@@ -16,22 +16,22 @@
   "exports": {
     ".": {
       "types": "./dist/index.cjs.d.ts",
-      "import": "./dist/index.esm.js",
+      "import": "./dist/index.esm.mjs",
       "require": "./dist/index.cjs.js"
     },
     "./helpers": {
       "types": "./dist/helpers.cjs.d.ts",
-      "import": "./dist/helpers.esm.js",
+      "import": "./dist/helpers.esm.mjs",
       "require": "./dist/helpers.cjs.js"
     },
     "./types": {
       "types": "./dist/types.cjs.d.ts",
-      "import": "./dist/types.esm.js",
+      "import": "./dist/types.esm.mjs",
       "require": "./dist/types.cjs.js"
     },
     "./embedded": {
       "types": "./dist/embedded.cjs.d.ts",
-      "import": "./dist/embedded.esm.js",
+      "import": "./dist/embedded.esm.mjs",
       "require": "./dist/embedded.cjs.js"
     },
     "./*": "./*"
@@ -50,7 +50,7 @@
     }
   },
   "dependencies": {
-    "@module-federation/sdk": "0.6.16",
-    "@module-federation/error-codes": "0.6.14"
+    "@module-federation/sdk": "0.7.0",
+    "@module-federation/error-codes": "0.7.0"
   }
 }