File tree Expand file tree Collapse file tree 4 files changed +78
-46
lines changed Expand file tree Collapse file tree 4 files changed +78
-46
lines changed Original file line number Diff line number Diff line change @@ -1636,21 +1636,32 @@ impl Endpoint for AppEndpoint {
1636
1636
. project ( )
1637
1637
. emit_all_output_assets ( Vc :: cell ( output_assets) ) ;
1638
1638
1639
- let node_root = this. app_project . project ( ) . node_root ( ) ;
1640
- let server_paths = all_server_paths ( output_assets, node_root)
1639
+ let ( server_paths, client_paths) = if this
1640
+ . app_project
1641
+ . project ( )
1642
+ . next_mode ( )
1641
1643
. await ?
1642
- . clone_value ( ) ;
1644
+ . is_development ( )
1645
+ {
1646
+ let node_root = this. app_project . project ( ) . node_root ( ) ;
1647
+ let server_paths = all_server_paths ( output_assets, node_root)
1648
+ . await ?
1649
+ . clone_value ( ) ;
1643
1650
1644
- let client_relative_root = this. app_project . project ( ) . client_relative_path ( ) ;
1645
- let client_paths = async {
1646
- anyhow:: Ok (
1647
- all_paths_in_root ( output_assets, client_relative_root)
1648
- . await ?
1649
- . clone_value ( ) ,
1650
- )
1651
- }
1652
- . instrument ( tracing:: info_span!( "client_paths" ) )
1653
- . await ?;
1651
+ let client_relative_root = this. app_project . project ( ) . client_relative_path ( ) ;
1652
+ let client_paths = async {
1653
+ anyhow:: Ok (
1654
+ all_paths_in_root ( output_assets, client_relative_root)
1655
+ . await ?
1656
+ . clone_value ( ) ,
1657
+ )
1658
+ }
1659
+ . instrument ( tracing:: info_span!( "client_paths" ) )
1660
+ . await ?;
1661
+ ( server_paths, client_paths)
1662
+ } else {
1663
+ ( vec ! [ ] , vec ! [ ] )
1664
+ } ;
1654
1665
1655
1666
let written_endpoint = match * output {
1656
1667
AppEndpointOutput :: NodeJs { rsc_chunk, .. } => WrittenEndpoint :: NodeJs {
Original file line number Diff line number Diff line change @@ -252,10 +252,14 @@ impl Endpoint for InstrumentationEndpoint {
252
252
let _ = output_assets. resolve ( ) . await ?;
253
253
let _ = this. project . emit_all_output_assets ( Vc :: cell ( output_assets) ) ;
254
254
255
- let node_root = this. project . node_root ( ) ;
256
- let server_paths = all_server_paths ( output_assets, node_root)
257
- . await ?
258
- . clone_value ( ) ;
255
+ let server_paths = if this. project . next_mode ( ) . await ?. is_development ( ) {
256
+ let node_root = this. project . node_root ( ) ;
257
+ all_server_paths ( output_assets, node_root)
258
+ . await ?
259
+ . clone_value ( )
260
+ } else {
261
+ vec ! [ ]
262
+ } ;
259
263
260
264
Ok ( WrittenEndpoint :: Edge {
261
265
server_paths,
Original file line number Diff line number Diff line change @@ -277,22 +277,27 @@ impl Endpoint for MiddlewareEndpoint {
277
277
let _ = output_assets. resolve ( ) . await ?;
278
278
let _ = this. project . emit_all_output_assets ( Vc :: cell ( output_assets) ) ;
279
279
280
- let node_root = this. project . node_root ( ) ;
281
- let server_paths = all_server_paths ( output_assets, node_root)
282
- . await ?
283
- . clone_value ( ) ;
284
-
285
- // Middleware could in theory have a client path (e.g. `new URL`).
286
- let client_relative_root = this. project . client_relative_path ( ) ;
287
- let client_paths = async {
288
- anyhow:: Ok (
289
- all_paths_in_root ( output_assets, client_relative_root)
290
- . await ?
291
- . clone_value ( ) ,
292
- )
293
- }
294
- . instrument ( tracing:: info_span!( "client_paths" ) )
295
- . await ?;
280
+ let ( server_paths, client_paths) = if this. project . next_mode ( ) . await ?. is_development ( ) {
281
+ let node_root = this. project . node_root ( ) ;
282
+ let server_paths = all_server_paths ( output_assets, node_root)
283
+ . await ?
284
+ . clone_value ( ) ;
285
+
286
+ // Middleware could in theory have a client path (e.g. `new URL`).
287
+ let client_relative_root = this. project . client_relative_path ( ) ;
288
+ let client_paths = async {
289
+ anyhow:: Ok (
290
+ all_paths_in_root ( output_assets, client_relative_root)
291
+ . await ?
292
+ . clone_value ( ) ,
293
+ )
294
+ }
295
+ . instrument ( tracing:: info_span!( "client_paths" ) )
296
+ . await ?;
297
+ ( server_paths, client_paths)
298
+ } else {
299
+ ( vec ! [ ] , vec ! [ ] )
300
+ } ;
296
301
297
302
Ok ( WrittenEndpoint :: Edge {
298
303
server_paths,
Original file line number Diff line number Diff line change @@ -1273,20 +1273,32 @@ impl Endpoint for PageEndpoint {
1273
1273
. emit_all_output_assets ( Vc :: cell ( output_assets) ) ;
1274
1274
1275
1275
let node_root = this. pages_project . project ( ) . node_root ( ) ;
1276
- let server_paths = all_server_paths ( output_assets, node_root)
1276
+
1277
+ let ( server_paths, client_paths) = if this
1278
+ . pages_project
1279
+ . project ( )
1280
+ . next_mode ( )
1277
1281
. await ?
1278
- . clone_value ( ) ;
1279
-
1280
- let client_relative_root = this. pages_project . project ( ) . client_relative_path ( ) ;
1281
- let client_paths = async {
1282
- anyhow:: Ok (
1283
- all_paths_in_root ( output_assets, client_relative_root)
1284
- . await ?
1285
- . clone_value ( ) ,
1286
- )
1287
- }
1288
- . instrument ( tracing:: info_span!( "client_paths" ) )
1289
- . await ?;
1282
+ . is_development ( )
1283
+ {
1284
+ let server_paths = all_server_paths ( output_assets, node_root)
1285
+ . await ?
1286
+ . clone_value ( ) ;
1287
+
1288
+ let client_relative_root = this. pages_project . project ( ) . client_relative_path ( ) ;
1289
+ let client_paths = async {
1290
+ anyhow:: Ok (
1291
+ all_paths_in_root ( output_assets, client_relative_root)
1292
+ . await ?
1293
+ . clone_value ( ) ,
1294
+ )
1295
+ }
1296
+ . instrument ( tracing:: info_span!( "client_paths" ) )
1297
+ . await ?;
1298
+ ( server_paths, client_paths)
1299
+ } else {
1300
+ ( vec ! [ ] , vec ! [ ] )
1301
+ } ;
1290
1302
1291
1303
let node_root = & node_root. await ?;
1292
1304
let written_endpoint = match * output {
You can’t perform that action at this time.
0 commit comments