Unverified Commit a19b1ef7 authored by Leah's avatar Leah Committed by GitHub

fix(turbopack): make layout in group not cause a 404 (#57471)

### What?

Given the structure:
`/page.js`
`/(group)/layout.js`

Going to `/` would 404

Closes WEB-1878
parent c80fb274
...@@ -677,10 +677,14 @@ async fn directory_tree_to_loader_tree( ...@@ -677,10 +677,14 @@ async fn directory_tree_to_loader_tree(
tree.segment = "children".to_string(); tree.segment = "children".to_string();
} }
let mut has_page = false;
if let Some(page) = (app_path == for_app_path) if let Some(page) = (app_path == for_app_path)
.then_some(components.page) .then_some(components.page)
.flatten() .flatten()
{ {
has_page = true;
// When resolving metadata with corresponding module // When resolving metadata with corresponding module
// (https://github.com/vercel/next.js/blob/aa1ee5995cdd92cc9a2236ce4b6aa2b67c9d32b2/packages/next/src/lib/metadata/resolve-metadata.ts#L340) // (https://github.com/vercel/next.js/blob/aa1ee5995cdd92cc9a2236ce4b6aa2b67c9d32b2/packages/next/src/lib/metadata/resolve-metadata.ts#L340)
// layout takes precedence over page (https://github.com/vercel/next.js/blob/aa1ee5995cdd92cc9a2236ce4b6aa2b67c9d32b2/packages/next/src/server/lib/app-dir-module.ts#L22) // layout takes precedence over page (https://github.com/vercel/next.js/blob/aa1ee5995cdd92cc9a2236ce4b6aa2b67c9d32b2/packages/next/src/server/lib/app-dir-module.ts#L22)
...@@ -742,8 +746,15 @@ async fn directory_tree_to_loader_tree( ...@@ -742,8 +746,15 @@ async fn directory_tree_to_loader_tree(
} }
if let Some(subtree) = subtree { if let Some(subtree) = subtree {
let key = parallel_route_key.unwrap_or("children").to_string(); if let Some(key) = parallel_route_key {
tree.parallel_routes.insert(key, subtree); tree.parallel_routes.insert(key.to_string(), subtree);
continue;
}
// TODO: detect duplicate page in group segment
if !has_page {
tree.parallel_routes.insert("children".to_string(), subtree);
}
} else if let Some(key) = parallel_route_key { } else if let Some(key) = parallel_route_key {
bail!( bail!(
"missing page or default for parallel route `{}` (page: {})", "missing page or default for parallel route `{}` (page: {})",
......
export default function Layout({ children }) {
return children
}
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