@module-federation/runtime 0.0.0-next-20231220085130 → 0.0.0-next-20231221094341

package/dist/index.esm.js

@@ -1,6 +1,7 @@
-import { g as getGlobalHostPlugins, D as DEFAULT_REMOTE_TYPE, a as DEFAULT_SCOPE, b as globalLoading, c as getRemoteEntryExports, d as assert, s as safeToString, G as Global, e as getFMId, i as isObject, f as error, w as warn, h as isPlainObject, j as isRemoteInfoWithEntry, k as isPureRemoteEntry, l as getGlobalShare, m as getInfoWithoutType, n as getPreloaded, o as setPreloaded, p as getGlobalSnapshotInfoByModuleInfo, q as setGlobalSnapshotInfoByModuleInfo, r as getGlobalSnapshot, t as addUniqueItem, u as formatShareConfigs, v as isBrowserEnv, x as getGlobalShareScope, y as getBuilderId, z as setGlobalFederationConstructor, A as getGlobalFederationInstance, B as getGlobalFederationConstructor, C as setGlobalFederationInstance } from './share.esm.js';
+import { g as getGlobalHostPlugins, D as DEFAULT_REMOTE_TYPE, a as DEFAULT_SCOPE, b as globalLoading, c as getRemoteEntryExports, d as assert, s as safeToString, G as Global, 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 setGlobalSnapshotInfoByModuleInfo, r as getGlobalSnapshot, t as getGlobalShareScope, u as addUniqueItem, v as formatShareConfigs, x as isBrowserEnv, y as getBuilderId, z as setGlobalFederationConstructor, A as getGlobalFederationInstance, B as getGlobalFederationConstructor, C as setGlobalFederationInstance } from './share.esm.js';
 export { E as registerGlobalPlugins } from './share.esm.js';
-import { composeKeyWithSeparator, loadScript, createScript, getResourceUrl, isManifestProvider, generateSnapshotFromManifest } from '@module-federation/sdk';
+import { composeKeyWithSeparator, loadScriptNode, loadScript, createScript, getResourceUrl, isManifestProvider, generateSnapshotFromManifest } from '@module-federation/sdk';
+export { loadScript } from '@module-federation/sdk';
 
 // Function to match a remote with its name and expose
 // id: pkgName(@federation/app1) + expose(button) = @federation/app1/button
@@ -118,6 +119,24 @@ async function loadEntryScript({ name, globalName, entry, createScriptHook }) {
     if (remoteEntryExports) {
         return remoteEntryExports;
     }
+    if (typeof document === 'undefined') {
+        return loadScriptNode(entry, {
+            attrs: {
+                name,
+                globalName
+            },
+            createScriptHook
+        }).then(()=>{
+            const { remoteEntryKey, entryExports } = getRemoteEntryExports(name, globalName);
+            assert(entryExports, `
+        Unable to use the ${name}'s '${entry}' URL with ${remoteEntryKey}'s globalName to get remoteEntry exports.
+        Possible reasons could be:\n
+        1. '${entry}' is not the correct URL, or the remoteEntry resource or name is incorrect.\n
+        2. ${remoteEntryKey} cannot be used to get remoteEntry exports in the window object.
+      `);
+            return entryExports;
+        });
+    }
     return loadScript(entry, {
         attrs: {},
         createScriptHook
@@ -191,6 +210,10 @@ let Module = class Module {
                 const res = this.loaderHook.lifecycle.createScript.emit({
                     url
                 });
+                if (typeof document === 'undefined') {
+                    //todo: needs real fix
+                    return res;
+                }
                 if (res instanceof HTMLScriptElement) {
                     return res;
                 }
@@ -206,15 +229,16 @@ let Module = class Module {
         const { loadFactory = true } = options || {
             loadFactory: true
         };
+        this.hostInfo.name;
         // Get remoteEntry.js
         const remoteEntryExports = await this.getEntry();
         if (!this.inited) {
-            const globalShareScope = Global.__FEDERATION__.__SHARE__;
+            const localShareScopeMap = this.shareScopeMap;
             const remoteShareScope = this.remoteInfo.shareScope || 'default';
-            if (!globalShareScope[remoteShareScope]) {
-                globalShareScope[remoteShareScope] = {};
+            if (!localShareScopeMap[remoteShareScope]) {
+                localShareScopeMap[remoteShareScope] = {};
             }
-            const shareScope = globalShareScope[remoteShareScope];
+            const shareScope = localShareScopeMap[remoteShareScope];
             // TODO: compat logic , it could be moved after providing startup hooks
             const remoteEntryInitOptions = {
                 version: this.remoteInfo.version || '',
@@ -224,10 +248,18 @@ let Module = class Module {
             remoteEntryExports.init(shareScope, [], remoteEntryInitOptions);
             const federationInstance = Global.__FEDERATION__.__INSTANCES__.find((i)=>i.options.id === composeKeyWithSeparator(this.remoteInfo.name, this.remoteInfo.buildVersion));
             if (federationInstance) {
-                federationInstance.initOptions(_extends$4({}, remoteEntryInitOptions, {
-                    remotes: [],
-                    name: this.remoteInfo.name
-                }));
+                // means the instance is prev vmok instance
+                if (!federationInstance.releaseNumber || Number(federationInstance.releaseNumber) <= 100) {
+                    // 兼容旧的生产者传参
+                    federationInstance.initOptions(_extends$4({}, remoteEntryInitOptions, {
+                        remotes: [],
+                        name: this.remoteInfo.name
+                    }));
+                    if (!__FEDERATION__.__SHARE__['default'] && this.shareScopeMap && this.shareScopeMap['default']) {
+                        // @ts-ignore compat prev logic , and it will be optimized by supporting startup hook
+                        __FEDERATION__.__SHARE__['default'] = this.shareScopeMap['default'];
+                    }
+                }
             }
         }
         this.lib = remoteEntryExports;
@@ -242,7 +274,7 @@ let Module = class Module {
         return exposeContent;
     }
     // loading: Record<string, undefined | Promise<RemoteEntryExports | void>> = {};
-    constructor({ hostInfo, remoteInfo, shared, loaderHook }){
+    constructor({ hostInfo, remoteInfo, shared, loaderHook, shareScopeMap }){
         this.inited = false;
         this.shared = {};
         this.lib = undefined;
@@ -250,6 +282,7 @@ let Module = class Module {
         this.remoteInfo = remoteInfo;
         this.shared = shared;
         this.loaderHook = loaderHook;
+        this.shareScopeMap = shareScopeMap;
     }
 };
 
@@ -776,9 +809,9 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
             if (!shareInfo) {
                 return;
             }
-            const globalShare = getGlobalShare(shared.sharedName, shareInfo);
+            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 (globalShare && typeof globalShare.lib === 'function') {
+            if (registeredShared && typeof registeredShared.lib === 'function') {
                 shared.assets.js.sync.forEach((asset)=>{
                     loadedSharedJsAssets.add(asset);
                 });
@@ -1105,6 +1138,13 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 class FederationHost {
+    _setGlobalShareScopeMap() {
+        const globalShareScopeMap = getGlobalShareScope();
+        const identifier = this.options.id || this.options.name;
+        if (identifier && !globalShareScopeMap[identifier]) {
+            globalShareScopeMap[identifier] = this.shareScopeMap;
+        }
+    }
     initOptions(userOptions) {
         this.registerPlugins(userOptions.plugins);
         const options = this.formatOptions(this.options, userOptions);
@@ -1119,6 +1159,11 @@ class FederationHost {
         // 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 = 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);
+            });
+        }
         const loadShareRes = await this.hooks.lifecycle.beforeLoadShare.emit({
             pkgName,
             shareInfo,
@@ -1129,30 +1174,42 @@ class FederationHost {
         // Assert that shareInfoRes exists, if not, throw an error
         assert(shareInfoRes, `Cannot find ${pkgName} Share in the ${this.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
         // Retrieve from cache
-        const globalShare = getGlobalShare(pkgName, shareInfoRes);
-        if (globalShare && globalShare.lib) {
-            addUniqueItem(globalShare.useIn, this.options.name);
-            return globalShare.lib;
-        } else if (globalShare && globalShare.loading) {
-            const factory = await globalShare.loading;
-            addUniqueItem(globalShare.useIn, this.options.name);
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
+        const addUseIn = (shared)=>{
+            if (!shared.useIn) {
+                shared.useIn = [];
+            }
+            addUniqueItem(shared.useIn, this.options.name);
+        };
+        if (registeredShared && registeredShared.lib) {
+            addUseIn(registeredShared);
+            return registeredShared.lib;
+        } else if (registeredShared && registeredShared.loading && !registeredShared.loaded) {
+            const factory = await registeredShared.loading;
+            registeredShared.loaded = true;
+            if (!registeredShared.lib) {
+                registeredShared.lib = factory;
+            }
+            addUseIn(registeredShared);
             return factory;
-        } else if (globalShare) {
+        } else if (registeredShared) {
             const asyncLoadProcess = async ()=>{
-                const factory = await globalShare.get();
+                const factory = await registeredShared.get();
                 shareInfoRes.lib = factory;
-                addUniqueItem(shareInfoRes.useIn, this.options.name);
-                const gShared = getGlobalShare(pkgName, shareInfoRes);
+                shareInfoRes.loaded = true;
+                addUseIn(shareInfoRes);
+                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
                 if (gShared) {
                     gShared.lib = factory;
+                    gShared.loaded = true;
                 }
                 return factory;
             };
             const loading = asyncLoadProcess();
             this.setShared({
                 pkgName,
-                loaded: true,
-                shared: shareInfoRes,
+                loaded: false,
+                shared: registeredShared,
                 from: this.options.name,
                 lib: null,
                 loading
@@ -1165,17 +1222,19 @@ class FederationHost {
             const asyncLoadProcess = async ()=>{
                 const factory = await shareInfoRes.get();
                 shareInfoRes.lib = factory;
-                addUniqueItem(shareInfoRes.useIn, this.options.name);
-                const gShared = getGlobalShare(pkgName, shareInfoRes);
+                shareInfoRes.loaded = true;
+                addUseIn(shareInfoRes);
+                const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfoRes, this.hooks.lifecycle.resolveShare);
                 if (gShared) {
                     gShared.lib = factory;
+                    gShared.loaded = true;
                 }
                 return factory;
             };
             const loading = asyncLoadProcess();
             this.setShared({
                 pkgName,
-                loaded: true,
+                loaded: false,
                 shared: shareInfoRes,
                 from: this.options.name,
                 lib: null,
@@ -1191,16 +1250,16 @@ class FederationHost {
     loadShareSync(pkgName) {
         var _this_options_shared;
         const shareInfo = (_this_options_shared = this.options.shared) == null ? void 0 : _this_options_shared[pkgName];
-        const globalShare = getGlobalShare(pkgName, shareInfo);
-        if (globalShare && typeof globalShare.lib === 'function') {
-            addUniqueItem(globalShare.useIn, this.options.name);
-            if (!globalShare.loaded) {
-                globalShare.loaded = true;
-                if (globalShare.from === this.options.name) {
+        const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareInfo, this.hooks.lifecycle.resolveShare);
+        if (registeredShared && typeof registeredShared.lib === 'function') {
+            addUniqueItem(registeredShared.useIn, this.options.name);
+            if (!registeredShared.loaded) {
+                registeredShared.loaded = true;
+                if (registeredShared.from === this.options.name) {
                     shareInfo.loaded = true;
                 }
             }
-            return globalShare.lib;
+            return registeredShared.lib;
         }
         if (shareInfo.lib) {
             if (!shareInfo.loaded) {
@@ -1271,7 +1330,8 @@ class FederationHost {
             remoteInfo,
             shared: this.options.shared || {},
             plugins: this.options.plugins,
-            loaderHook: this.loaderHook
+            loaderHook: this.loaderHook,
+            shareScopeMap: this.shareScopeMap
         };
         if (!module) {
             module = new Module(moduleOptions);
@@ -1351,14 +1411,9 @@ class FederationHost {
    * It accepts one argument, the name of the share scope.
    * If the share scope does not exist, it creates one.
    */ // eslint-disable-next-line @typescript-eslint/member-ordering
-    initializeSharing(shareScopeName = DEFAULT_SCOPE) {
-        const shareScopeLoading = Global.__FEDERATION__.__SHARE_SCOPE_LOADING__;
-        const shareScope = Global.__FEDERATION__.__SHARE__;
+    initializeSharing(shareScopeName = DEFAULT_SCOPE, strategy) {
+        const shareScope = this.shareScopeMap;
         const hostName = this.options.name;
-        // Executes only once
-        if (shareScopeLoading[shareScopeName]) {
-            return shareScopeLoading[shareScopeName];
-        }
         // Creates a new share scope if necessary
         if (!shareScope[shareScopeName]) {
             shareScope[shareScopeName] = {};
@@ -1366,21 +1421,27 @@ class FederationHost {
         // Executes all initialization snippets from all accessible modules
         const scope = shareScope[shareScopeName];
         const register = (name, shared)=>{
+            var _activeVersion_shareConfig;
             const { version, eager } = shared;
             scope[name] = scope[name] || {};
             const versions = scope[name];
             const activeVersion = versions[version];
-            const activeVersionEager = Boolean(activeVersion && (activeVersion.eager || activeVersion.shareConfig.eager));
+            const activeVersionEager = Boolean(activeVersion && (activeVersion.eager || ((_activeVersion_shareConfig = activeVersion.shareConfig) == null ? void 0 : _activeVersion_shareConfig.eager)));
             if (!activeVersion || !activeVersion.loaded && (Boolean(!eager) !== !activeVersionEager ? eager : hostName > activeVersion.from)) {
                 versions[version] = shared;
             }
         };
         const promises = [];
+        const initFn = (mod)=>mod && mod.init && mod.init(shareScope[shareScopeName]);
         const initRemoteModule = async (key)=>{
             const { module } = await this._getRemoteModuleAndOptions(key);
-            const initFn = (mod)=>mod && mod.init && mod.init(shareScope[shareScopeName]);
-            const entry = await module.getEntry();
-            initFn(entry);
+            if (module.getEntry) {
+                const entry = await module.getEntry();
+                if (!module.inited) {
+                    initFn(entry);
+                    module.inited = true;
+                }
+            }
         };
         Object.keys(this.options.shared).forEach((shareName)=>{
             const shared = this.options.shared[shareName];
@@ -1388,15 +1449,24 @@ class FederationHost {
                 register(shareName, shared);
             }
         });
-        this.options.remotes.forEach((remote)=>{
-            if (remote.shareScope === shareScopeName) {
-                promises.push(initRemoteModule(remote.name));
-            }
-        });
-        if (!promises.length) {
-            return shareScopeLoading[shareScopeName] = true;
+        if (strategy === 'version-first') {
+            this.options.remotes.forEach((remote)=>{
+                if (remote.shareScope === shareScopeName) {
+                    promises.push(initRemoteModule(remote.name));
+                }
+            });
+        }
+        return promises;
+    }
+    initShareScopeMap(scopeName, shareScope) {
+        // compat prev consumers
+        if ('version' in shareScope && typeof shareScope['version'] !== 'object') {
+            return;
+        }
+        if ('region' in shareScope && typeof shareScope['region'] !== 'object') {
+            return;
         }
-        return shareScopeLoading[shareScopeName] = Promise.all(promises).then(()=>shareScopeLoading[shareScopeName] = true);
+        this.shareScopeMap[scopeName] = shareScope;
     }
     formatOptions(globalOptions, userOptions) {
         const formatShareOptions = formatShareConfigs(userOptions.shared || {}, userOptions.name);
@@ -1436,16 +1506,17 @@ class FederationHost {
             }
             return res;
         }, globalOptionsRes.remotes);
-        // register shared include lib
+        // register shared in shareScopeMap
         const sharedKeys = Object.keys(formatShareOptions);
         sharedKeys.forEach((sharedKey)=>{
             const sharedVal = formatShareOptions[sharedKey];
-            const globalShare = getGlobalShare(sharedKey, sharedVal);
-            if (!globalShare && sharedVal && sharedVal.lib) {
+            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
                 });
@@ -1480,7 +1551,6 @@ class FederationHost {
         ]);
     }
     setShared({ pkgName, shared, from, lib, loading, loaded, get }) {
-        const target = getGlobalShareScope();
         const { version, scope = 'default' } = shared, shareInfo = _object_without_properties_loose(shared, [
             "version",
             "scope"
@@ -1489,23 +1559,23 @@ class FederationHost {
             scope
         ];
         scopes.forEach((sc)=>{
-            if (!target[sc]) {
-                target[sc] = {};
+            if (!this.shareScopeMap[sc]) {
+                this.shareScopeMap[sc] = {};
             }
-            if (!target[sc][pkgName]) {
-                target[sc][pkgName] = {};
+            if (!this.shareScopeMap[sc][pkgName]) {
+                this.shareScopeMap[sc][pkgName] = {};
             }
-            if (target[sc][pkgName][version]) {
+            if (this.shareScopeMap[sc][pkgName][version]) {
                 warn(// eslint-disable-next-line max-len
                 `The share \n ${safeToString({
                     scope: sc,
                     pkgName,
                     version,
-                    from: target[sc][pkgName][version].from
+                    from: this.shareScopeMap[sc][pkgName][version].from
                 })} has been registered`);
                 return;
             }
-            target[sc][pkgName][version] = _extends({
+            this.shareScopeMap[sc][pkgName][version] = _extends({
                 version,
                 scope: [
                     'default'
@@ -1516,7 +1586,7 @@ class FederationHost {
                 loading
             });
             if (get) {
-                target[sc][pkgName][version].get = get;
+                this.shareScopeMap[sc][pkgName][version].get = get;
             }
         });
     }
@@ -1531,11 +1601,13 @@ class FederationHost {
             errorLoadRemote: new AsyncHook('errorLoadRemote'),
             beforeLoadShare: new AsyncWaterfallHook('beforeLoadShare'),
             loadShare: new AsyncHook(),
+            resolveShare: new SyncWaterfallHook('resolveShare'),
             beforePreloadRemote: new AsyncHook(),
             generatePreloadAssets: new AsyncHook('generatePreloadAssets'),
             afterPreloadRemote: new AsyncHook()
         });
-        this.version = '0.0.3';
+        this.releaseNumber = `4`;
+        this.version = `0.0.4`;
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable
@@ -1543,7 +1615,6 @@ class FederationHost {
             createScript: new SyncHook(),
             fetch: new AsyncHook('fetch')
         });
-        this.loadingShare = {};
         // TODO: Validate the details of the options
         // Initialize options with default values
         const defaultOptions = {
@@ -1559,6 +1630,8 @@ class FederationHost {
         };
         this.name = userOptions.name;
         this.options = defaultOptions;
+        this.shareScopeMap = {};
+        this._setGlobalShareScopeMap();
         this.snapshotHandler = new SnapshotHandler(this);
         this.registerPlugins([
             ...defaultOptions.plugins,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
@@ -39,8 +39,8 @@
       "helpers": [
         "./dist/helpers.cjs.d.ts"
       ],
-      "type": [
-        "./dist/type.cjs.d.ts"
+      "types": [
+        "./dist/types.cjs.d.ts"
       ]
     }
   },