File tree Expand file tree Collapse file tree 3 files changed +20
-6
lines changed
modernjs/src/cli/mfRuntimePlugins Expand file tree Collapse file tree 3 files changed +20
-6
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ ' @module-federation/modern-js ' : patch
3
+ ---
4
+
5
+ fix(modern-js-plugin): adjust fetch type
Original file line number Diff line number Diff line change @@ -63,18 +63,26 @@ const autoFetchData: () => FederationRuntimePlugin = () => ({
63
63
}
64
64
65
65
const dataFetchMap = getDataFetchMap ( ) ;
66
- const downgradeType = remoteSnapshot . modules . find (
67
- ( module ) =>
68
- module . moduleName === `${ dataFetchName } ${ DATA_FETCH_CLIENT_SUFFIX } ` ,
69
- )
66
+ const hasSSRAsset = Boolean ( remoteSnapshot . ssrRemoteEntry ) ;
67
+ const hasDataFetchClient = Boolean (
68
+ remoteSnapshot . modules . find (
69
+ ( module ) =>
70
+ module . moduleName === `${ dataFetchName } ${ DATA_FETCH_CLIENT_SUFFIX } ` ,
71
+ ) ,
72
+ ) ;
73
+ const downgradeType = hasDataFetchClient
70
74
? MF_DATA_FETCH_TYPE . FETCH_CLIENT
71
- : MF_DATA_FETCH_TYPE . FETCH_SERVER ;
75
+ : hasSSRAsset
76
+ ? MF_DATA_FETCH_TYPE . FETCH_SERVER
77
+ : MF_DATA_FETCH_TYPE . FETCH_CLIENT ;
72
78
let finalDataFetchId = dataFetchId ;
73
79
74
80
if ( typeof window !== 'undefined' ) {
75
81
finalDataFetchId =
76
82
downgradeType === MF_DATA_FETCH_TYPE . FETCH_CLIENT
77
- ? `${ dataFetchId } ${ DATA_FETCH_CLIENT_SUFFIX } `
83
+ ? hasDataFetchClient
84
+ ? `${ dataFetchId } ${ DATA_FETCH_CLIENT_SUFFIX } `
85
+ : dataFetchId
78
86
: dataFetchId ;
79
87
}
80
88
Original file line number Diff line number Diff line change @@ -176,6 +176,7 @@ export const resolveUrl = (
176
176
} catch {
177
177
const entryUrl =
178
178
returnFromCache ( remoteName ) || returnFromGlobalInstances ( remoteName ) ;
179
+
179
180
if ( ! entryUrl ) return null ;
180
181
181
182
const url = new URL ( entryUrl ) ;
You can’t perform that action at this time.
0 commit comments