@@ -10,7 +10,7 @@ import type { ProviderParams } from '@module-federation/bridge-shared';
1010import { dispatchPopstateEnv } from '@module-federation/bridge-shared' ;
1111import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary' ;
1212import { LoggerInstance , pathJoin , getRootDomDefaultClassName } from '../utils' ;
13- import { getInstance } from '@module-federation/runtime ' ;
13+ import { federationRuntime } from '../plugin ' ;
1414
1515declare const __APP_VERSION__ : string ;
1616export interface RenderFnParams extends ProviderParams {
@@ -53,15 +53,16 @@ const RemoteAppWrapper = forwardRef(function (
5353 ...resProps
5454 } = props ;
5555
56+ const instance = federationRuntime . instance ;
5657 const rootRef : React . MutableRefObject < HTMLDivElement | null > =
5758 ref && 'current' in ref
5859 ? ( ref as React . MutableRefObject < HTMLDivElement | null > )
5960 : useRef ( null ) ;
6061
6162 const renderDom : React . MutableRefObject < HTMLElement | null > = useRef ( null ) ;
6263 const providerInfoRef = useRef < any > ( null ) ;
63- const hostInstance = getInstance ( ) ;
64- LoggerInstance . log ( `RemoteAppWrapper hostInstance >>>` , hostInstance ) ;
64+
65+ LoggerInstance . log ( `RemoteAppWrapper instance from props >>>` , instance ) ;
6566
6667 useEffect ( ( ) => {
6768 const renderTimeout = setTimeout ( ( ) => {
@@ -84,18 +85,16 @@ const RemoteAppWrapper = forwardRef(function (
8485
8586 LoggerInstance . log (
8687 `createRemoteComponent LazyComponent hostInstance >>>` ,
87- hostInstance ,
88+ instance ,
8889 ) ;
8990 const beforeBridgeRenderRes =
90- hostInstance ?. bridgeHook ?. lifecycle ?. beforeBridgeRender ?. emit (
91+ instance ?. bridgeHook ?. lifecycle ?. beforeBridgeRender ?. emit (
9192 renderProps ,
9293 ) || { } ;
9394 // @ts -ignore
9495 renderProps = { ...renderProps , ...beforeBridgeRenderRes . extraProps } ;
9596 providerReturn . render ( renderProps ) ;
96- hostInstance ?. bridgeHook ?. lifecycle ?. afterBridgeRender ?. emit (
97- renderProps ,
98- ) ;
97+ instance ?. bridgeHook ?. lifecycle ?. afterBridgeRender ?. emit ( renderProps ) ;
9998 } ) ;
10099
101100 return ( ) => {
@@ -107,7 +106,7 @@ const RemoteAppWrapper = forwardRef(function (
107106 { moduleName, basename, dom : renderDom . current } ,
108107 ) ;
109108
110- hostInstance ?. bridgeHook ?. lifecycle ?. beforeBridgeDestroy ?. emit ( {
109+ instance ?. bridgeHook ?. lifecycle ?. beforeBridgeDestroy ?. emit ( {
111110 moduleName,
112111 dom : renderDom . current ,
113112 basename,
@@ -121,7 +120,7 @@ const RemoteAppWrapper = forwardRef(function (
121120 dom : renderDom . current ,
122121 } ) ;
123122
124- hostInstance ?. bridgeHook ?. lifecycle ?. afterBridgeDestroy ?. emit ( {
123+ instance ?. bridgeHook ?. lifecycle ?. afterBridgeDestroy ?. emit ( {
125124 moduleName,
126125 dom : renderDom . current ,
127126 basename,
0 commit comments