Revert "fix(next): global not-found not working on multi-root layouts" (

#64601) Reverts #63053. Closes NEXT-3135
vercel · Apr 17, 2024 · 754fada · 754fada
1 parent bc1d190
commit 754fada
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 104 deletions.
diff --git a/packages/next/src/build/webpack/loaders/next-app-loader.ts b/packages/next/src/build/webpack/loaders/next-app-loader.ts
@@ -200,10 +200,9 @@ async function createTreeCodeFromPath(
 
   const isDefaultNotFound = isAppBuiltinNotFoundPage(pagePath)
   const appDirPrefix = isDefaultNotFound ? APP_DIR_ALIAS : splittedPath[0]
-  const rootNotFound = await resolver(
+  const hasRootNotFound = await resolver(
     `${appDirPrefix}/${FILE_TYPES['not-found']}`
   )
-  const hasRootNotFound = Boolean(rootNotFound)
   const pages: string[] = []
 
   let rootLayout: string | undefined
@@ -383,8 +382,7 @@ async function createTreeCodeFromPath(
         )?.[1]
         rootLayout = layoutPath
 
-        const isRootNotFound = hasRootNotFound && isRootLayer && isNotFoundRoute
-        if ((isRootNotFound || isDefaultNotFound) && !layoutPath) {
+        if (isDefaultNotFound && !layoutPath && !rootLayout) {
           rootLayout = defaultLayoutPath
           definedFilePaths.push(['layout', rootLayout])
         }

diff --git a/test/development/app-dir/root-not-found-missing-root-layout/app/not-found.tsx b/test/development/app-dir/root-not-found-missing-root-layout/app/not-found.tsx
diff --git a/test/development/app-dir/root-not-found-missing-root-layout/app/page.tsx b/test/development/app-dir/root-not-found-missing-root-layout/app/page.tsx
diff --git a/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts b/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/layout.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/layout.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/not-found.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/not-found.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/page.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(main)/page.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/layout.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/layout.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/not-found.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/not-found.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/sub/page.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/(sub)/sub/page.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/app/not-found.tsx b/test/e2e/app-dir/not-found/multi-root-layout/app/not-found.tsx
diff --git a/test/e2e/app-dir/not-found/multi-root-layout/index.test.ts b/test/e2e/app-dir/not-found/multi-root-layout/index.test.ts
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
@@ -2164,18 +2164,6 @@
       "flakey": [],
       "runtimeError": false
     },
-    "test/e2e/app-dir/not-found/multi-root-layout/index.test.ts": {
-      "passed": [
-        "not-found-multi-root-layout should render main not-found",
-        "not-found-multi-root-layout should render sub not-found"
-      ],
-      "failed": [
-        "not-found-multi-root-layout should render root not-found for uncaught routes"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
     "test/e2e/app-dir/pages-to-app-routing/pages-to-app-routing.test.ts": {
       "passed": ["pages-to-app-routing should work using browser"],
       "failed": [],

diff --git a/test/turbopack-dev-tests-manifest.json b/test/turbopack-dev-tests-manifest.json
@@ -1531,15 +1531,6 @@
     "flakey": [],
     "runtimeError": false
   },
-  "test/development/app-dir/root-not-found-missing-root-layout/index.test.ts": {
-    "passed": [],
-    "failed": [
-      "root-not-found-missing-root-layout should not conflict with generated layout on dev server"
-    ],
-    "pending": [],
-    "flakey": [],
-    "runtimeError": false
-  },
   "test/development/app-dir/strict-mode-enabled-by-default/strict-mode-enabled-by-default.test.ts": {
     "passed": ["Strict Mode enabled by default should work using browser"],
     "failed": [],