@module-federation/runtime 0.0.0-next-20240102023857 → 0.0.0-next-20240103032717

package/dist/index.cjs.js

@@ -191,7 +191,7 @@ let Module = class Module {
             remoteInfo: this.remoteInfo,
             remoteEntryExports: this.remoteEntryExports,
             createScriptHook: (url)=>{
-                const res = this.loaderHook.lifecycle.createScript.emit({
+                const res = this.host.loaderHook.lifecycle.createScript.emit({
                     url
                 });
                 if (res instanceof HTMLScriptElement) {
@@ -218,20 +218,21 @@ let Module = class Module {
                 globalShareScope[remoteShareScope] = {};
             }
             const shareScope = globalShareScope[remoteShareScope];
-            // TODO: compat logic , it could be moved after providing startup hooks
+            const initScope = [];
             const remoteEntryInitOptions = {
-                version: this.remoteInfo.version || '',
-                // @ts-ignore it will be passed by startup hooks
-                region: this.hostInfo.region
+                version: this.remoteInfo.version || ''
             };
-            remoteEntryExports.init(shareScope, [], remoteEntryInitOptions);
-            const federationInstance = share.Global.__FEDERATION__.__INSTANCES__.find((i)=>i.options.id === sdk.composeKeyWithSeparator(this.remoteInfo.name, this.remoteInfo.buildVersion));
-            if (federationInstance) {
-                federationInstance.initOptions(_extends$4({}, remoteEntryInitOptions, {
-                    remotes: [],
-                    name: this.remoteInfo.name
-                }));
-            }
+            const initContainerOptions = await this.host.hooks.lifecycle.beforeInitContainer.emit({
+                shareScope,
+                remoteEntryInitOptions,
+                initScope,
+                remoteInfo: this.remoteInfo,
+                origin: this.host
+            });
+            remoteEntryExports.init(initContainerOptions.shareScope, initContainerOptions.initScope, initContainerOptions.remoteEntryInitOptions);
+            await this.host.hooks.lifecycle.initContainer.emit(_extends$4({}, initContainerOptions, {
+                remoteEntryExports
+            }));
         }
         this.lib = remoteEntryExports;
         this.inited = true;
@@ -244,15 +245,11 @@ let Module = class Module {
         const exposeContent = await moduleFactory();
         return exposeContent;
     }
-    // loading: Record<string, undefined | Promise<RemoteEntryExports | void>> = {};
-    constructor({ hostInfo, remoteInfo, shared, loaderHook }){
+    constructor({ remoteInfo, host }){
         this.inited = false;
-        this.shared = {};
         this.lib = undefined;
-        this.hostInfo = hostInfo;
         this.remoteInfo = remoteInfo;
-        this.shared = shared;
-        this.loaderHook = loaderHook;
+        this.host = host;
     }
 };
 
@@ -1267,14 +1264,8 @@ class FederationHost {
         share.assert(remote && expose, `The 'beforeRequest' hook was executed, but it failed to return the correct 'remote' and 'expose' values while loading ${idRes}.`);
         let module = this.moduleCache.get(remote.name);
         const moduleOptions = {
-            hostInfo: {
-                name: this.options.name,
-                version: this.options.version || 'custom'
-            },
-            remoteInfo,
-            shared: this.options.shared || {},
-            plugins: this.options.plugins,
-            loaderHook: this.loaderHook
+            host: this,
+            remoteInfo
         };
         if (!module) {
             module = new Module(moduleOptions);
@@ -1529,6 +1520,8 @@ class FederationHost {
             init: new SyncHook(),
             beforeRequest: new AsyncWaterfallHook('beforeRequest'),
             afterResolve: new AsyncWaterfallHook('afterResolve'),
+            beforeInitContainer: new AsyncWaterfallHook('beforeInitContainer'),
+            initContainer: new AsyncWaterfallHook('initContainer'),
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
             errorLoadRemote: new AsyncHook('errorLoadRemote'),

package/dist/index.esm.js

@@ -188,7 +188,7 @@ let Module = class Module {
             remoteInfo: this.remoteInfo,
             remoteEntryExports: this.remoteEntryExports,
             createScriptHook: (url)=>{
-                const res = this.loaderHook.lifecycle.createScript.emit({
+                const res = this.host.loaderHook.lifecycle.createScript.emit({
                     url
                 });
                 if (res instanceof HTMLScriptElement) {
@@ -215,20 +215,21 @@ let Module = class Module {
                 globalShareScope[remoteShareScope] = {};
             }
             const shareScope = globalShareScope[remoteShareScope];
-            // TODO: compat logic , it could be moved after providing startup hooks
+            const initScope = [];
             const remoteEntryInitOptions = {
-                version: this.remoteInfo.version || '',
-                // @ts-ignore it will be passed by startup hooks
-                region: this.hostInfo.region
+                version: this.remoteInfo.version || ''
             };
-            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
-                }));
-            }
+            const initContainerOptions = await this.host.hooks.lifecycle.beforeInitContainer.emit({
+                shareScope,
+                remoteEntryInitOptions,
+                initScope,
+                remoteInfo: this.remoteInfo,
+                origin: this.host
+            });
+            remoteEntryExports.init(initContainerOptions.shareScope, initContainerOptions.initScope, initContainerOptions.remoteEntryInitOptions);
+            await this.host.hooks.lifecycle.initContainer.emit(_extends$4({}, initContainerOptions, {
+                remoteEntryExports
+            }));
         }
         this.lib = remoteEntryExports;
         this.inited = true;
@@ -241,15 +242,11 @@ let Module = class Module {
         const exposeContent = await moduleFactory();
         return exposeContent;
     }
-    // loading: Record<string, undefined | Promise<RemoteEntryExports | void>> = {};
-    constructor({ hostInfo, remoteInfo, shared, loaderHook }){
+    constructor({ remoteInfo, host }){
         this.inited = false;
-        this.shared = {};
         this.lib = undefined;
-        this.hostInfo = hostInfo;
         this.remoteInfo = remoteInfo;
-        this.shared = shared;
-        this.loaderHook = loaderHook;
+        this.host = host;
     }
 };
 
@@ -1264,14 +1261,8 @@ class FederationHost {
         assert(remote && expose, `The 'beforeRequest' hook was executed, but it failed to return the correct 'remote' and 'expose' values while loading ${idRes}.`);
         let module = this.moduleCache.get(remote.name);
         const moduleOptions = {
-            hostInfo: {
-                name: this.options.name,
-                version: this.options.version || 'custom'
-            },
-            remoteInfo,
-            shared: this.options.shared || {},
-            plugins: this.options.plugins,
-            loaderHook: this.loaderHook
+            host: this,
+            remoteInfo
         };
         if (!module) {
             module = new Module(moduleOptions);
@@ -1526,6 +1517,8 @@ class FederationHost {
             init: new SyncHook(),
             beforeRequest: new AsyncWaterfallHook('beforeRequest'),
             afterResolve: new AsyncWaterfallHook('afterResolve'),
+            beforeInitContainer: new AsyncWaterfallHook('beforeInitContainer'),
+            initContainer: new AsyncWaterfallHook('initContainer'),
             onLoad: new AsyncHook('onLoad'),
             handlePreloadModule: new SyncHook('handlePreloadModule'),
             errorLoadRemote: new AsyncHook('errorLoadRemote'),

package/dist/share.cjs.js

@@ -150,7 +150,7 @@ function getGlobalFederationInstance(name, version) {
         if (buildId && GMInstance.options.id === getBuilderId()) {
             return true;
         }
-        if (GMInstance.options.name === name && !version) {
+        if (GMInstance.options.name === name && !GMInstance.options.version && !version) {
             return true;
         }
         if (GMInstance.options.name === name && version && GMInstance.options.version === version) {

package/dist/share.esm.js

@@ -148,7 +148,7 @@ function getGlobalFederationInstance(name, version) {
         if (buildId && GMInstance.options.id === getBuilderId()) {
             return true;
         }
-        if (GMInstance.options.name === name && !version) {
+        if (GMInstance.options.name === name && !GMInstance.options.version && !version) {
             return true;
         }
         if (GMInstance.options.name === name && version && GMInstance.options.version === version) {

package/dist/src/core.d.ts

@@ -1,5 +1,5 @@
 import type { ModuleInfo, GlobalModuleInfo } from '@module-federation/sdk';
-import { Options, PreloadAssets, PreloadOptions, PreloadRemoteArgs, Remote, Shared, ShareInfos, UserOptions, RemoteInfo } from './type';
+import { Options, PreloadAssets, PreloadOptions, PreloadRemoteArgs, RemoteEntryExports, Remote, Shared, ShareInfos, UserOptions, RemoteInfo, GlobalShareScope, InitScope, RemoteEntryInitOptions } from './type';
 import { Module, ModuleOptions } from './module';
 import { AsyncHook, AsyncWaterfallHook, PluginSystem, SyncHook, SyncWaterfallHook } from './utils/hooks';
 import { SnapshotHandler } from './plugins/snapshot/SnapshotHandler';
@@ -32,6 +32,21 @@ export declare class FederationHost {
             origin: FederationHost;
         }>;
         afterResolve: AsyncWaterfallHook<LoadRemoteMatch>;
+        beforeInitContainer: AsyncWaterfallHook<{
+            shareScope: GlobalShareScope[string];
+            initScope: InitScope;
+            remoteEntryInitOptions: RemoteEntryInitOptions;
+            remoteInfo: RemoteInfo;
+            origin: FederationHost;
+        }>;
+        initContainer: AsyncWaterfallHook<{
+            shareScope: GlobalShareScope[string];
+            initScope: InitScope;
+            remoteEntryInitOptions: RemoteEntryInitOptions;
+            remoteInfo: RemoteInfo;
+            remoteEntryExports: RemoteEntryExports;
+            origin: FederationHost;
+        }>;
         onLoad: AsyncHook<[{
             id: string;
             expose: string;

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

@@ -1,21 +1,15 @@
 import { FederationHost } from '../core';
-import { RemoteEntryExports, Options, Remote, ShareInfos, RemoteInfo } from '../type';
+import { RemoteEntryExports, RemoteInfo } from '../type';
 export type ModuleOptions = ConstructorParameters<typeof Module>[0];
-type HostInfo = Remote;
 declare class Module {
-    hostInfo: HostInfo;
     remoteInfo: RemoteInfo;
     inited: boolean;
-    shared: ShareInfos;
     remoteEntryExports?: RemoteEntryExports;
     lib: RemoteEntryExports | undefined;
-    loaderHook: FederationHost['loaderHook'];
-    constructor({ hostInfo, remoteInfo, shared, loaderHook, }: {
-        hostInfo: HostInfo;
+    host: FederationHost;
+    constructor({ remoteInfo, host, }: {
         remoteInfo: RemoteInfo;
-        shared: ShareInfos;
-        plugins: Options['plugins'];
-        loaderHook: FederationHost['loaderHook'];
+        host: FederationHost;
     });
     getEntry(): Promise<RemoteEntryExports>;
     get(expose: string, options?: {

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

@@ -87,8 +87,9 @@ export type LoadModuleOptions = {
 export type RemoteEntryInitOptions = {
     version: string;
 };
+export type InitScope = Array<Record<string, never>>;
 export type RemoteEntryExports = {
     get: (id: string) => () => Promise<Module>;
-    init: (shareScope: GlobalShareScope[string], initScope?: Array<Record<string, never>>, remoteEntryInitOPtions?: RemoteEntryInitOptions) => void;
+    init: (shareScope: GlobalShareScope[string], initScope?: InitScope, remoteEntryInitOPtions?: RemoteEntryInitOptions) => void;
 };
 export {};

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

@@ -9,7 +9,7 @@ type SnapshotLifeCycle = SnapshotHandler['hooks']['lifecycle'];
 type SnapshotLifeCycleCyclePartial = Partial<{
     [k in keyof SnapshotLifeCycle]: Parameters<SnapshotLifeCycle[k]['on']>[0];
 }>;
-type ModuleLifeCycle = Module['loaderHook']['lifecycle'];
+type ModuleLifeCycle = Module['host']['loaderHook']['lifecycle'];
 type ModuleLifeCycleCyclePartial = Partial<{
     [k in keyof ModuleLifeCycle]: Parameters<ModuleLifeCycle[k]['on']>[0];
 }>;

package/dist/src/utils/plugin.d.ts

@@ -1,4 +1,4 @@
 import { FederationHost } from '../core';
 import { UserOptions } from '../type';
 import { Module } from '../module';
-export declare function registerPlugins(plugins: UserOptions['plugins'], hookInstances: Array<FederationHost['hooks'] | FederationHost['snapshotHandler']['hooks'] | Module['loaderHook']>): void;
+export declare function registerPlugins(plugins: UserOptions['plugins'], hookInstances: Array<FederationHost['hooks'] | FederationHost['snapshotHandler']['hooks'] | Module['host']['loaderHook']>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.0.0-next-20240102023857",
+  "version": "0.0.0-next-20240103032717",
   "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-20240102023857"
+    "@module-federation/sdk": "0.0.0-next-20240103032717"
   }
 }