@@ -4245,20 +4245,8 @@ export function writePreamble(
42454245 resources . scripts . forEach ( flushResourceInPreamble , destination ) ;
42464246 resources . scripts . clear ( ) ;
42474247
4248- resources . explicitStylesheetPreloads . forEach (
4249- flushResourceInPreamble ,
4250- destination ,
4251- ) ;
4252- resources . explicitStylesheetPreloads . clear ( ) ;
4253-
4254- resources . explicitScriptPreloads . forEach (
4255- flushResourceInPreamble ,
4256- destination ,
4257- ) ;
4258- resources . explicitScriptPreloads . clear ( ) ;
4259-
4260- resources . explicitOtherPreloads . forEach ( flushResourceInPreamble , destination ) ;
4261- resources . explicitOtherPreloads . clear ( ) ;
4248+ resources . explicitPreloads . forEach ( flushResourceInPreamble , destination ) ;
4249+ resources . explicitPreloads . clear ( ) ;
42624250
42634251 // Write embedding preloadChunks
42644252 const preloadChunks = responseState . preloadChunks ;
@@ -4322,14 +4310,8 @@ export function writeHoistables(
43224310 resources . scripts . forEach ( flushResourceLate , destination ) ;
43234311 resources . scripts . clear ( ) ;
43244312
4325- resources . explicitStylesheetPreloads . forEach ( flushResourceLate , destination ) ;
4326- resources . explicitStylesheetPreloads . clear ( ) ;
4327-
4328- resources . explicitScriptPreloads . forEach ( flushResourceLate , destination ) ;
4329- resources . explicitScriptPreloads . clear ( ) ;
4330-
4331- resources . explicitOtherPreloads . forEach ( flushResourceLate , destination ) ;
4332- resources . explicitOtherPreloads . clear ( ) ;
4313+ resources . explicitPreloads . forEach ( flushResourceLate , destination ) ;
4314+ resources . explicitPreloads . clear ( ) ;
43334315
43344316 // Write embedding preloadChunks
43354317 const preloadChunks = responseState . preloadChunks ;
@@ -4873,10 +4855,7 @@ export type Resources = {
48734855 precedences : Map < string , Set < StyleResource> > ,
48744856 stylePrecedences : Map < string , StyleTagResource> ,
48754857 scripts : Set < ScriptResource > ,
4876- explicitStylesheetPreloads : Set < PreloadResource > ,
4877- // explicitImagePreloads: Set<PreloadResource>,
4878- explicitScriptPreloads : Set < PreloadResource > ,
4879- explicitOtherPreloads : Set < PreloadResource > ,
4858+ explicitPreloads : Set < PreloadResource > ,
48804859
48814860 // Module-global-like reference for current boundary resources
48824861 boundaryResources : ?BoundaryResources ,
@@ -4899,10 +4878,7 @@ export function createResources(): Resources {
48994878 precedences : new Map ( ) ,
49004879 stylePrecedences : new Map ( ) ,
49014880 scripts : new Set ( ) ,
4902- explicitStylesheetPreloads : new Set ( ) ,
4903- // explicitImagePreloads: new Set(),
4904- explicitScriptPreloads : new Set ( ) ,
4905- explicitOtherPreloads : new Set ( ) ,
4881+ explicitPreloads : new Set ( ) ,
49064882
49074883 // like a module global for currently rendering boundary
49084884 boundaryResources : null ,
@@ -5189,22 +5165,10 @@ export function preload(href: string, options: PreloadOptions) {
51895165
51905166 pushLinkImpl ( resource . chunks , resource . props ) ;
51915167 }
5192- switch ( as ) {
5193- case 'font' : {
5194- resources . fontPreloads . add ( resource ) ;
5195- break ;
5196- }
5197- case 'style' : {
5198- resources . explicitStylesheetPreloads . add ( resource ) ;
5199- break ;
5200- }
5201- case 'script' : {
5202- resources . explicitScriptPreloads . add ( resource ) ;
5203- break ;
5204- }
5205- default : {
5206- resources . explicitOtherPreloads . add ( resource ) ;
5207- }
5168+ if ( as === 'font' ) {
5169+ resources . fontPreloads . add ( resource ) ;
5170+ } else {
5171+ resources . explicitPreloads . add ( resource ) ;
52085172 }
52095173 flushResources ( request ) ;
52105174 }
@@ -5479,7 +5443,7 @@ function preloadBootstrapScript(
54795443 props,
54805444 } ;
54815445 resources . preloadsMap . set ( key , resource ) ;
5482- resources . explicitScriptPreloads . add ( resource ) ;
5446+ resources . explicitPreloads . add ( resource ) ;
54835447 pushLinkImpl ( resource . chunks , props ) ;
54845448}
54855449
@@ -5521,7 +5485,7 @@ function preloadBootstrapModule(
55215485 props,
55225486 } ;
55235487 resources . preloadsMap . set ( key , resource ) ;
5524- resources . explicitScriptPreloads . add ( resource ) ;
5488+ resources . explicitPreloads . add ( resource ) ;
55255489 pushLinkImpl ( resource . chunks , props ) ;
55265490 return ;
55275491}
0 commit comments