Unverified Commit 795e69ca authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

explicit entry vs segment config

parent fa15e6f1
...@@ -1246,7 +1246,7 @@ impl AppEndpoint { ...@@ -1246,7 +1246,7 @@ impl AppEndpoint {
// assets to add to the middleware manifest (to be loaded in the edge runtime). // assets to add to the middleware manifest (to be loaded in the edge runtime).
let mut middleware_assets = fxindexset![]; 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; let rsc_entry = app_entry.rsc_entry;
...@@ -1758,6 +1758,7 @@ impl AppEndpoint { ...@@ -1758,6 +1758,7 @@ impl AppEndpoint {
regions: app_entry regions: app_entry
.config .config
.await? .await?
.entry
.preferred_region .preferred_region
.as_ref() .as_ref()
.map(|region| Regions::Multiple(region.to_vec())), .map(|region| Regions::Multiple(region.to_vec())),
...@@ -1908,7 +1909,7 @@ impl AppEndpoint { ...@@ -1908,7 +1909,7 @@ impl AppEndpoint {
let this = self.await?; let this = self.await?;
let project = this.app_project.project(); let project = this.app_project.project();
let app_entry = self.app_endpoint_entry().await?; 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); let chunking_context = project.runtime_chunking_context(process_client_assets, runtime);
...@@ -2481,7 +2482,7 @@ impl Endpoint for AppEndpoint { ...@@ -2481,7 +2482,7 @@ impl Endpoint for AppEndpoint {
let this = self.await?; let this = self.await?;
let app_entry = self.app_endpoint_entry().await?; let app_entry = self.app_endpoint_entry().await?;
let rsc_entry = app_entry.rsc_entry; 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( let actions = ServerActionsGraphs::new(
graph, graph,
......
...@@ -232,13 +232,17 @@ impl MiddlewareEndpoint { ...@@ -232,13 +232,17 @@ impl MiddlewareEndpoint {
let all_assets = let all_assets =
get_asset_paths_from_root(&node_root_value, edge_all_assets.await?).await?; get_asset_paths_from_root(&node_root_value, edge_all_assets.await?).await?;
let regions = config.preferred_region.as_ref().map(|region| match region { let regions = config
NextSegmentRegion::Single(region) => Regions::Single(region.clone()), .entry
NextSegmentRegion::Multiple(regions) if regions.len() == 1 => { .preferred_region
Regions::Single(regions[0].clone()) .as_ref()
} .map(|region| match region {
NextSegmentRegion::Multiple(regions) => Regions::Multiple(regions.clone()), 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 { let edge_function_definition = EdgeFunctionDefinition {
files: file_paths_from_root, files: file_paths_from_root,
......
...@@ -1035,7 +1035,7 @@ impl PageEndpoint { ...@@ -1035,7 +1035,7 @@ impl PageEndpoint {
let config = let config =
parse_segment_config_from_source(self.source(), ParseSegmentMode::Base).await?; 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( Ok(
// `/_app` and `/_document` never get rendered directly so they don't need to be // `/_app` and `/_document` never get rendered directly so they don't need to be
...@@ -1053,6 +1053,7 @@ impl PageEndpoint { ...@@ -1053,6 +1053,7 @@ impl PageEndpoint {
// they're included in the page bundle. // they're included in the page bundle.
runtime: NextRuntime::NodeJs, runtime: NextRuntime::NodeJs,
regions: config regions: config
.entry
.preferred_region .preferred_region
.as_ref() .as_ref()
.map(NextSegmentRegion::to_vec), .map(NextSegmentRegion::to_vec),
...@@ -1081,6 +1082,7 @@ impl PageEndpoint { ...@@ -1081,6 +1082,7 @@ impl PageEndpoint {
document_module: modules.document_module, document_module: modules.document_module,
runtime, runtime,
regions: config regions: config
.entry
.preferred_region .preferred_region
.as_ref() .as_ref()
.map(NextSegmentRegion::to_vec), .map(NextSegmentRegion::to_vec),
......
...@@ -2386,7 +2386,7 @@ impl Project { ...@@ -2386,7 +2386,7 @@ impl Project {
ParseSegmentMode::Base 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 NextRuntime::NodeJs
} else { } else {
NextRuntime::Edge NextRuntime::Edge
......
...@@ -38,7 +38,7 @@ pub async fn get_app_page_entry( ...@@ -38,7 +38,7 @@ pub async fn get_app_page_entry(
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
) -> Result<Vc<AppEntry>> { ) -> Result<Vc<AppEntry>> {
let config = parse_segment_config_from_loader_tree(loader_tree, page.clone()); 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 { let module_asset_context = if is_edge {
edge_context edge_context
} else { } else {
......
...@@ -38,15 +38,16 @@ pub async fn get_app_route_entry( ...@@ -38,15 +38,16 @@ pub async fn get_app_route_entry(
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
) -> Result<Vc<AppEntry>> { ) -> Result<Vc<AppEntry>> {
let segment_from_source = parse_segment_config_from_source(source, ParseSegmentMode::App); 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 config = if let Some(original_segment_config) = original_segment_config {
let mut segment_config = segment_from_source.owned().await?; 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() segment_config.cell()
} else { } else {
segment_from_source 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 { let module_asset_context = if is_edge {
edge_context edge_context
} else { } else {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment