Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
795e69ca
Unverified
Commit
795e69ca
authored
Oct 15, 2026
by
Niklas Mischkulnig
Committed by
GitHub
Oct 28, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explicit entry vs segment config
parent
fa15e6f1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
130 additions
and
95 deletions
+130
-95
app.rs
crates/next-api/src/app.rs
+4
-3
middleware.rs
crates/next-api/src/middleware.rs
+11
-7
pages.rs
crates/next-api/src/pages.rs
+3
-1
project.rs
crates/next-api/src/project.rs
+1
-1
app_page_entry.rs
crates/next-core/src/next_app/app_page_entry.rs
+1
-1
app_route_entry.rs
crates/next-core/src/next_app/app_route_entry.rs
+3
-2
segment_config.rs
crates/next-core/src/segment_config.rs
+107
-80
No files found.
crates/next-api/src/app.rs
View file @
795e69ca
...
...
@@ -1246,7 +1246,7 @@ impl AppEndpoint {
// assets to add to the middleware manifest (to be loaded in the edge runtime).
let
mut
middleware_assets
=
fxindexset!
[];
let
runtime
=
app_entry
.config.await
?
.runtime
.unwrap_or_default
();
let
runtime
=
app_entry
.config.await
?
.
entry.
runtime
.unwrap_or_default
();
let
rsc_entry
=
app_entry
.rsc_entry
;
...
...
@@ -1758,6 +1758,7 @@ impl AppEndpoint {
regions
:
app_entry
.config
.await
?
.entry
.preferred_region
.as_ref
()
.map
(|
region
|
Regions
::
Multiple
(
region
.to_vec
())),
...
...
@@ -1908,7 +1909,7 @@ impl AppEndpoint {
let
this
=
self
.await
?
;
let
project
=
this
.app_project
.project
();
let
app_entry
=
self
.app_endpoint_entry
()
.await
?
;
let
runtime
=
app_entry
.config.await
?
.runtime
.unwrap_or_default
();
let
runtime
=
app_entry
.config.await
?
.
entry.
runtime
.unwrap_or_default
();
let
chunking_context
=
project
.runtime_chunking_context
(
process_client_assets
,
runtime
);
...
...
@@ -2481,7 +2482,7 @@ impl Endpoint for AppEndpoint {
let
this
=
self
.await
?
;
let
app_entry
=
self
.app_endpoint_entry
()
.await
?
;
let
rsc_entry
=
app_entry
.rsc_entry
;
let
runtime
=
app_entry
.config.await
?
.runtime
.unwrap_or_default
();
let
runtime
=
app_entry
.config.await
?
.
entry.
runtime
.unwrap_or_default
();
let
actions
=
ServerActionsGraphs
::
new
(
graph
,
...
...
crates/next-api/src/middleware.rs
View file @
795e69ca
...
...
@@ -232,13 +232,17 @@ impl MiddlewareEndpoint {
let
all_assets
=
get_asset_paths_from_root
(
&
node_root_value
,
edge_all_assets
.await
?
)
.await
?
;
let
regions
=
config
.preferred_region
.as_ref
()
.map
(|
region
|
match
region
{
NextSegmentRegion
::
Single
(
region
)
=>
Regions
::
Single
(
region
.clone
()),
NextSegmentRegion
::
Multiple
(
regions
)
if
regions
.len
()
==
1
=>
{
Regions
::
Single
(
regions
[
0
]
.clone
())
}
NextSegmentRegion
::
Multiple
(
regions
)
=>
Regions
::
Multiple
(
regions
.clone
()),
});
let
regions
=
config
.entry
.preferred_region
.as_ref
()
.map
(|
region
|
match
region
{
NextSegmentRegion
::
Single
(
region
)
=>
Regions
::
Single
(
region
.clone
()),
NextSegmentRegion
::
Multiple
(
regions
)
if
regions
.len
()
==
1
=>
{
Regions
::
Single
(
regions
[
0
]
.clone
())
}
NextSegmentRegion
::
Multiple
(
regions
)
=>
Regions
::
Multiple
(
regions
.clone
()),
});
let
edge_function_definition
=
EdgeFunctionDefinition
{
files
:
file_paths_from_root
,
...
...
crates/next-api/src/pages.rs
View file @
795e69ca
...
...
@@ -1035,7 +1035,7 @@ impl PageEndpoint {
let
config
=
parse_segment_config_from_source
(
self
.source
(),
ParseSegmentMode
::
Base
)
.await
?
;
let
runtime
=
config
.runtime
.unwrap_or
(
NextRuntime
::
NodeJs
);
let
runtime
=
config
.
entry.
runtime
.unwrap_or
(
NextRuntime
::
NodeJs
);
Ok
(
// `/_app` and `/_document` never get rendered directly so they don't need to be
...
...
@@ -1053,6 +1053,7 @@ impl PageEndpoint {
// they're included in the page bundle.
runtime
:
NextRuntime
::
NodeJs
,
regions
:
config
.entry
.preferred_region
.as_ref
()
.map
(
NextSegmentRegion
::
to_vec
),
...
...
@@ -1081,6 +1082,7 @@ impl PageEndpoint {
document_module
:
modules
.document_module
,
runtime
,
regions
:
config
.entry
.preferred_region
.as_ref
()
.map
(
NextSegmentRegion
::
to_vec
),
...
...
crates/next-api/src/project.rs
View file @
795e69ca
...
...
@@ -2386,7 +2386,7 @@ impl Project {
ParseSegmentMode
::
Base
},
);
let
runtime
=
config
.await
?
.runtime
.unwrap_or
(
if
is_proxy
{
let
runtime
=
config
.await
?
.
entry.
runtime
.unwrap_or
(
if
is_proxy
{
NextRuntime
::
NodeJs
}
else
{
NextRuntime
::
Edge
...
...
crates/next-core/src/next_app/app_page_entry.rs
View file @
795e69ca
...
...
@@ -38,7 +38,7 @@ pub async fn get_app_page_entry(
next_config
:
Vc
<
NextConfig
>
,
)
->
Result
<
Vc
<
AppEntry
>>
{
let
config
=
parse_segment_config_from_loader_tree
(
loader_tree
,
page
.clone
());
let
is_edge
=
matches!
(
config
.await
?
.runtime
,
Some
(
NextRuntime
::
Edge
));
let
is_edge
=
matches!
(
config
.await
?
.
entry.
runtime
,
Some
(
NextRuntime
::
Edge
));
let
module_asset_context
=
if
is_edge
{
edge_context
}
else
{
...
...
crates/next-core/src/next_app/app_route_entry.rs
View file @
795e69ca
...
...
@@ -38,15 +38,16 @@ pub async fn get_app_route_entry(
next_config
:
Vc
<
NextConfig
>
,
)
->
Result
<
Vc
<
AppEntry
>>
{
let
segment_from_source
=
parse_segment_config_from_source
(
source
,
ParseSegmentMode
::
App
);
// TODO this merging seems wrong/unnnecessary
let
config
=
if
let
Some
(
original_segment_config
)
=
original_segment_config
{
let
mut
segment_config
=
segment_from_source
.owned
()
.await
?
;
segment_config
.apply_parent_config
(
&*
original_segment_config
.await
?
);
segment_config
.apply_parent_config
(
&*
original_segment_config
.await
?
,
true
);
segment_config
.cell
()
}
else
{
segment_from_source
};
let
is_edge
=
matches!
(
config
.await
?
.runtime
,
Some
(
NextRuntime
::
Edge
));
let
is_edge
=
matches!
(
config
.await
?
.
entry.
runtime
,
Some
(
NextRuntime
::
Edge
));
let
module_asset_context
=
if
is_edge
{
edge_context
}
else
{
...
...
crates/next-core/src/segment_config.rs
View file @
795e69ca
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment