@@ -10,7 +10,7 @@ import type { ProviderParams } from '@module-federation/bridge-shared';
10
10
import { dispatchPopstateEnv } from '@module-federation/bridge-shared' ;
11
11
import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary' ;
12
12
import { LoggerInstance , pathJoin , getRootDomDefaultClassName } from '../utils' ;
13
- import { getInstance } from '@module-federation/runtime ' ;
13
+ import { federationRuntime } from '../plugin ' ;
14
14
15
15
declare const __APP_VERSION__ : string ;
16
16
export interface RenderFnParams extends ProviderParams {
@@ -53,15 +53,16 @@ const RemoteAppWrapper = forwardRef(function (
53
53
...resProps
54
54
} = props ;
55
55
56
+ const instance = federationRuntime . instance ;
56
57
const rootRef : React . MutableRefObject < HTMLDivElement | null > =
57
58
ref && 'current' in ref
58
59
? ( ref as React . MutableRefObject < HTMLDivElement | null > )
59
60
: useRef ( null ) ;
60
61
61
62
const renderDom : React . MutableRefObject < HTMLElement | null > = useRef ( null ) ;
62
63
const providerInfoRef = useRef < any > ( null ) ;
63
- const hostInstance = getInstance ( ) ;
64
- LoggerInstance . log ( `RemoteAppWrapper hostInstance >>>` , hostInstance ) ;
64
+
65
+ LoggerInstance . log ( `RemoteAppWrapper instance from props >>>` , instance ) ;
65
66
66
67
useEffect ( ( ) => {
67
68
const renderTimeout = setTimeout ( ( ) => {
@@ -84,18 +85,16 @@ const RemoteAppWrapper = forwardRef(function (
84
85
85
86
LoggerInstance . log (
86
87
`createRemoteComponent LazyComponent hostInstance >>>` ,
87
- hostInstance ,
88
+ instance ,
88
89
) ;
89
90
const beforeBridgeRenderRes =
90
- hostInstance ?. bridgeHook ?. lifecycle ?. beforeBridgeRender ?. emit (
91
+ instance ?. bridgeHook ?. lifecycle ?. beforeBridgeRender ?. emit (
91
92
renderProps ,
92
93
) || { } ;
93
94
// @ts -ignore
94
95
renderProps = { ...renderProps , ...beforeBridgeRenderRes . extraProps } ;
95
96
providerReturn . render ( renderProps ) ;
96
- hostInstance ?. bridgeHook ?. lifecycle ?. afterBridgeRender ?. emit (
97
- renderProps ,
98
- ) ;
97
+ instance ?. bridgeHook ?. lifecycle ?. afterBridgeRender ?. emit ( renderProps ) ;
99
98
} ) ;
100
99
101
100
return ( ) => {
@@ -107,7 +106,7 @@ const RemoteAppWrapper = forwardRef(function (
107
106
{ moduleName, basename, dom : renderDom . current } ,
108
107
) ;
109
108
110
- hostInstance ?. bridgeHook ?. lifecycle ?. beforeBridgeDestroy ?. emit ( {
109
+ instance ?. bridgeHook ?. lifecycle ?. beforeBridgeDestroy ?. emit ( {
111
110
moduleName,
112
111
dom : renderDom . current ,
113
112
basename,
@@ -121,7 +120,7 @@ const RemoteAppWrapper = forwardRef(function (
121
120
dom : renderDom . current ,
122
121
} ) ;
123
122
124
- hostInstance ?. bridgeHook ?. lifecycle ?. afterBridgeDestroy ?. emit ( {
123
+ instance ?. bridgeHook ?. lifecycle ?. afterBridgeDestroy ?. emit ( {
125
124
moduleName,
126
125
dom : renderDom . current ,
127
126
basename,
0 commit comments