@module-federation/runtime 0.1.19 → 0.1.20

package/dist/index.cjs.js

@@ -264,14 +264,14 @@ let Module = class Module {
                 version: this.remoteInfo.version || ''
             };
             // Help to find host instance
-            Object.defineProperty(remoteEntryInitOptions, 'hostId', {
-                value: this.host.options.id || this.host.name,
+            Object.defineProperty(remoteEntryInitOptions, 'shareScopeMap', {
+                value: localShareScopeMap,
                 // remoteEntryInitOptions will be traversed and assigned during container init, ,so this attribute is not allowed to be traversed
                 enumerable: false
             });
             const initContainerOptions = await this.host.hooks.lifecycle.beforeInitContainer.emit({
                 shareScope,
-                // @ts-ignore hostId will be set by Object.defineProperty
+                // @ts-ignore shareScopeMap will be set by Object.defineProperty
                 remoteEntryInitOptions,
                 initScope,
                 remoteInfo: this.remoteInfo,
@@ -296,7 +296,7 @@ let Module = class Module {
     }
     wraperFactory(moduleFactory, id) {
         function defineModuleId(res, id) {
-            if (res && typeof res === 'object' && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
+            if (res && typeof res === 'object' && Object.isExtensible(res) && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
                 Object.defineProperty(res, Symbol.for('mf_module_id'), {
                     value: id,
                     enumerable: false
@@ -1481,13 +1481,15 @@ class SharedHandler {
         2. The ${pkgName} share was not registered with the 'lib' attribute.\n
       `);
     }
-    initShareScopeMap(scopeName, shareScope) {
+    initShareScopeMap(scopeName, shareScope, extraOptions = {}) {
         const { host } = this;
         this.shareScopeMap[scopeName] = shareScope;
         this.hooks.lifecycle.initContainerShareScopeMap.emit({
             shareScope,
             options: host.options,
-            origin: host
+            origin: host,
+            scopeName,
+            hostShareScopeMap: extraOptions.hostShareScopeMap
         });
     }
     setShared({ pkgName, shared, from, lib, loading, loaded, get }) {
@@ -1538,7 +1540,7 @@ class SharedHandler {
             loadShare: new AsyncHook(),
             resolveShare: new SyncWaterfallHook('resolveShare'),
             // maybe will change, temporarily for internal use only
-            initContainerShareScopeMap: new AsyncWaterfallHook('initContainer')
+            initContainerShareScopeMap: new SyncWaterfallHook('initContainerShareScopeMap')
         });
         this.host = host;
         this.shareScopeMap = {};
@@ -1717,6 +1719,7 @@ class RemoteHandler {
         };
     }
     registerRemote(remote, targetRemotes, options) {
+        const { host } = this;
         const normalizeRemote = ()=>{
             if (remote.alias) {
                 // Validate if alias equals the prefix of remote.name and remote.alias, if so, throw an error
@@ -1744,6 +1747,10 @@ class RemoteHandler {
         if (!registeredRemote) {
             normalizeRemote();
             targetRemotes.push(remote);
+            this.hooks.lifecycle.registerRemote.emit({
+                remote,
+                origin: host
+            });
         } else {
             const messages = [
                 `The remote "${remote.name}" is already registered.`,
@@ -1754,6 +1761,10 @@ class RemoteHandler {
                 this.removeRemote(registeredRemote);
                 normalizeRemote();
                 targetRemotes.push(remote);
+                this.hooks.lifecycle.registerRemote.emit({
+                    remote,
+                    origin: host
+                });
             }
             sdk.warn(messages.join(' '));
         }
@@ -1838,6 +1849,7 @@ class RemoteHandler {
     }
     constructor(host){
         this.hooks = new PluginSystem({
+            registerRemote: new SyncWaterfallHook('registerRemote'),
             beforeRequest: new AsyncWaterfallHook('beforeRequest'),
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
@@ -1907,8 +1919,8 @@ class FederationHost {
     async preloadRemote(preloadOptions) {
         return this.remoteHandler.preloadRemote(preloadOptions);
     }
-    initShareScopeMap(scopeName, shareScope) {
-        this.sharedHandler.initShareScopeMap(scopeName, shareScope);
+    initShareScopeMap(scopeName, shareScope, extraOptions = {}) {
+        this.sharedHandler.initShareScopeMap(scopeName, shareScope, extraOptions);
     }
     formatOptions(globalOptions, userOptions) {
         const { shared } = share.formatShareConfigs(globalOptions, userOptions);
@@ -1970,7 +1982,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.19";
+        this.version = "0.1.20";
         this.moduleCache = new Map();
         this.loaderHook = new PluginSystem({
             // FIXME: may not be suitable , not open to the public yet

package/dist/index.esm.js

@@ -262,14 +262,14 @@ let Module = class Module {
                 version: this.remoteInfo.version || ''
             };
             // Help to find host instance
-            Object.defineProperty(remoteEntryInitOptions, 'hostId', {
-                value: this.host.options.id || this.host.name,
+            Object.defineProperty(remoteEntryInitOptions, 'shareScopeMap', {
+                value: localShareScopeMap,
                 // remoteEntryInitOptions will be traversed and assigned during container init, ,so this attribute is not allowed to be traversed
                 enumerable: false
             });
             const initContainerOptions = await this.host.hooks.lifecycle.beforeInitContainer.emit({
                 shareScope,
-                // @ts-ignore hostId will be set by Object.defineProperty
+                // @ts-ignore shareScopeMap will be set by Object.defineProperty
                 remoteEntryInitOptions,
                 initScope,
                 remoteInfo: this.remoteInfo,
@@ -294,7 +294,7 @@ let Module = class Module {
     }
     wraperFactory(moduleFactory, id) {
         function defineModuleId(res, id) {
-            if (res && typeof res === 'object' && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
+            if (res && typeof res === 'object' && Object.isExtensible(res) && !Object.getOwnPropertyDescriptor(res, Symbol.for('mf_module_id'))) {
                 Object.defineProperty(res, Symbol.for('mf_module_id'), {
                     value: id,
                     enumerable: false
@@ -1479,13 +1479,15 @@ class SharedHandler {
         2. The ${pkgName} share was not registered with the 'lib' attribute.\n
       `);
     }
-    initShareScopeMap(scopeName, shareScope) {
+    initShareScopeMap(scopeName, shareScope, extraOptions = {}) {
         const { host } = this;
         this.shareScopeMap[scopeName] = shareScope;
         this.hooks.lifecycle.initContainerShareScopeMap.emit({
             shareScope,
             options: host.options,
-            origin: host
+            origin: host,
+            scopeName,
+            hostShareScopeMap: extraOptions.hostShareScopeMap
         });
     }
     setShared({ pkgName, shared, from, lib, loading, loaded, get }) {
@@ -1536,7 +1538,7 @@ class SharedHandler {
             loadShare: new AsyncHook(),
             resolveShare: new SyncWaterfallHook('resolveShare'),
             // maybe will change, temporarily for internal use only
-            initContainerShareScopeMap: new AsyncWaterfallHook('initContainer')
+            initContainerShareScopeMap: new SyncWaterfallHook('initContainerShareScopeMap')
         });
         this.host = host;
         this.shareScopeMap = {};
@@ -1715,6 +1717,7 @@ class RemoteHandler {
         };
     }
     registerRemote(remote, targetRemotes, options) {
+        const { host } = this;
         const normalizeRemote = ()=>{
             if (remote.alias) {
                 // Validate if alias equals the prefix of remote.name and remote.alias, if so, throw an error
@@ -1742,6 +1745,10 @@ class RemoteHandler {
         if (!registeredRemote) {
             normalizeRemote();
             targetRemotes.push(remote);
+            this.hooks.lifecycle.registerRemote.emit({
+                remote,
+                origin: host
+            });
         } else {
             const messages = [
                 `The remote "${remote.name}" is already registered.`,
@@ -1752,6 +1759,10 @@ class RemoteHandler {
                 this.removeRemote(registeredRemote);
                 normalizeRemote();
                 targetRemotes.push(remote);
+                this.hooks.lifecycle.registerRemote.emit({
+                    remote,
+                    origin: host
+                });
             }
             warn$1(messages.join(' '));
         }
@@ -1836,6 +1847,7 @@ class RemoteHandler {
     }
     constructor(host){
         this.hooks = new PluginSystem({
+            registerRemote: new SyncWaterfallHook('registerRemote'),
             beforeRequest: new AsyncWaterfallHook('beforeRequest'),
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
@@ -1905,8 +1917,8 @@ class FederationHost {
     async preloadRemote(preloadOptions) {
         return this.remoteHandler.preloadRemote(preloadOptions);
     }
-    initShareScopeMap(scopeName, shareScope) {
-        this.sharedHandler.initShareScopeMap(scopeName, shareScope);
+    initShareScopeMap(scopeName, shareScope, extraOptions = {}) {
+        this.sharedHandler.initShareScopeMap(scopeName, shareScope, extraOptions);
     }
     formatOptions(globalOptions, userOptions) {
         const { shared } = formatShareConfigs(globalOptions, userOptions);
@@ -1968,7 +1980,7 @@ class FederationHost {
             // maybe will change, temporarily for internal use only
             initContainer: new AsyncWaterfallHook('initContainer')
         });
-        this.version = "0.1.19";
+        this.version = "0.1.20";
         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.19",
+  "version": "0.1.20",
   "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.19";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.20";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types

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.19";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.20";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types

package/dist/src/core.d.ts

@@ -74,7 +74,9 @@ export declare class FederationHost {
         from: 'build' | 'runtime';
     }): Promise<T | null>;
     preloadRemote(preloadOptions: Array<PreloadRemoteArgs>): Promise<void>;
-    initShareScopeMap(scopeName: string, shareScope: ShareScopeMap[string]): void;
+    initShareScopeMap(scopeName: string, shareScope: ShareScopeMap[string], extraOptions?: {
+        hostShareScopeMap?: ShareScopeMap;
+    }): void;
     private formatOptions;
     registerPlugins(plugins: UserOptions['plugins']): void;
     registerRemotes(remotes: Remote[], options?: {

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

@@ -1,7 +1,7 @@
 import { type ModuleInfo, type GlobalModuleInfo } from '@module-federation/sdk';
 import { Options, UserOptions, PreloadAssets, PreloadOptions, PreloadRemoteArgs, Remote, RemoteInfo } from '../type';
 import { FederationHost } from '../core';
-import { PluginSystem, AsyncHook, AsyncWaterfallHook, SyncHook } from '../utils/hooks';
+import { PluginSystem, AsyncHook, AsyncWaterfallHook, SyncHook, SyncWaterfallHook } from '../utils/hooks';
 import { Module, ModuleOptions } from '../module';
 export interface LoadRemoteMatch {
     id: string;
@@ -16,6 +16,10 @@ export interface LoadRemoteMatch {
 export declare class RemoteHandler {
     host: FederationHost;
     hooks: PluginSystem<{
+        registerRemote: SyncWaterfallHook<{
+            remote: Remote;
+            origin: FederationHost;
+        }>;
         beforeRequest: AsyncWaterfallHook<{
             id: string;
             options: Options;

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

@@ -23,10 +23,12 @@ export declare class SharedHandler {
             GlobalFederation: Federation;
             resolver: () => Shared | undefined;
         }>;
-        initContainerShareScopeMap: AsyncWaterfallHook<{
+        initContainerShareScopeMap: SyncWaterfallHook<{
             shareScope: ShareScopeMap[string];
             options: Options;
             origin: FederationHost;
+            scopeName: string;
+            hostShareScopeMap?: ShareScopeMap | undefined;
         }>;
     }>;
     constructor(host: FederationHost);
@@ -50,7 +52,9 @@ export declare class SharedHandler {
         customShareInfo?: Partial<Shared>;
         resolver?: (sharedOptions: ShareInfos[string]) => Shared;
     }): () => T | never;
-    initShareScopeMap(scopeName: string, shareScope: ShareScopeMap[string]): void;
+    initShareScopeMap(scopeName: string, shareScope: ShareScopeMap[string], extraOptions?: {
+        hostShareScopeMap?: ShareScopeMap;
+    }): void;
     private setShared;
     private _setGlobalShareScopeMap;
 }

package/dist/src/type/config.d.ts

@@ -94,7 +94,7 @@ export type LoadModuleOptions = {
 };
 export type RemoteEntryInitOptions = {
     version: string;
-    hostId: string;
+    shareScopeMap: ShareScopeMap;
 };
 export type InitScope = Array<Record<string, never>>;
 export type RemoteEntryExports = {

package/package.json

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