Turbopack: ensure default layout is provided in default not-found entrypoint

crates/next-core/src/app_structure.rs

@@ -1245,6 +1245,43 @@ async fn directory_tree_to_entrypoints_internal_untraced(
             );
         }
 
+        let mut modules = directory_tree.modules.clone();
+
+        // fill in the default modules for the not-found entrypoint
+        if modules.layout.is_none() {
+            modules.layout = Some(
+                get_next_package(*app_dir)
+                    .join("dist/client/components/default-layout.js".into())
+                    .to_resolved()
+                    .await?,
+            );
+        }
+
+        if modules.not_found.is_none() {
+            modules.not_found = Some(
+                get_next_package(*app_dir)
+                    .join("dist/client/components/not-found-error.js".into())
+                    .to_resolved()
+                    .await?,
+            );
+        }
+        if modules.forbidden.is_none() {
+            modules.forbidden = Some(
+                get_next_package(*app_dir)
+                    .join("dist/client/components/forbidden-error.js".into())
+                    .to_resolved()
+                    .await?,
+            );
+        }
+        if modules.unauthorized.is_none() {
+            modules.unauthorized = Some(
+                get_next_package(*app_dir)
+                    .join("dist/client/components/unauthorized-error.js".into())
+                    .to_resolved()
+                    .await?,
+            );
+        }
+
         // Next.js has this logic in "collect-app-paths", where the root not-found page
         // is considered as its own entry point.
         let not_found_tree = AppPageLoaderTree {

test/e2e/app-dir/app-root-params/simple.test.ts

@@ -1,4 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
+import { assertNoRedbox } from 'next-test-utils'
 import { join } from 'path'
 
 describe('app-root-params - simple', () => {
@@ -17,6 +18,14 @@ describe('app-root-params - simple', () => {
     expect($('#root-params').text()).toBe('{"lang":"en","locale":"us"}')
   })
 
+  it('should render the not found page without errors', async () => {
+    const browser = await next.browser('/')
+    expect(await browser.elementByCss('h2').text()).toBe(
+      'This page could not be found.'
+    )
+    await assertNoRedbox(browser)
+  })
+
   // `next-types-plugin` currently only runs in Webpack.
   // We skip deployment mode since we don't care about the deploy, we just want to
   // check the file generated at build time.