Fixes the issue by ensuring that when building a loader tree for a specific route like /payment/whoops, only the exact matching page is included, not catch-all routes that happen to be in the same directory structure.

Cy-Tek · Cy-Tek · commit b8b9f67bb2a5 · 2025-07-16T13:49:27.000-04:00
diff --git a/crates/next-core/src/next_app/mod.rs b/crates/next-core/src/next_app/mod.rs
@@ -258,16 +258,19 @@ impl AppPage {
     }
 
     pub fn is_catchall(&self) -> bool {
-        let segment = if self.is_complete() {
-            // The `PageType` is the last segment for completed pages.
-            self.0.iter().nth_back(1)
-        } else {
-            self.0.last()
-        };
+        // The `PageType` is the last segment for completed pages. We need to find the last segment
+        // that is not a `PageType`, `Group`, or `Parallel` segment, because these are not leaf
+        // nodes.
+        let last_path_segment = self.0.iter().rev().find(|segment| {
+            !matches!(
+                segment,
+                PageSegment::PageType(_) | PageSegment::Group(_) | PageSegment::Parallel(_)
+            )
+        });
 
         matches!(
-            segment,
-            Some(PageSegment::CatchAll(..) | PageSegment::OptionalCatchAll(..))
+            last_path_segment,
+            Some(PageSegment::CatchAll(_)) | Some(PageSegment::OptionalCatchAll(_))
         )
     }
 
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/anotherRoute/[[...slug]]/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/anotherRoute/[[...slug]]/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page({ params }: { params: { slug: string[] } }) {
+  return <h1 id="catch-all">anotherRoute catch-all: {params.slug.join('/')}</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/anotherRoute/whoops/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/anotherRoute/whoops/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page() {
+  return <h1 id="specific-page">anotherRoute whoops</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/@parallel/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/@parallel/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page() {
+  return <h1 id="parallel-page">parallel page</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/layout.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/layout.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+
+export default function Layout({
+  children,
+  parallel,
+}: {
+  children: React.ReactNode
+  parallel: React.ReactNode
+}) {
+  return (
+    <>
+      {children}
+      {parallel}
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/[[...slug]]/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page({ params }: { params: { slug: string[] } }) {
+  return <h1 id="catch-all">payment catch-all: {params.slug.join('/')}</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/whoops/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/(someGroup)/payment/whoops/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page() {
+  return <h1 id="specific-page">payment whoops</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/layout.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/layout.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html>
+      <head>
+        <title>Test App</title>
+      </head>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/page.tsx b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/app/page.tsx
@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function Page() {
+  return <h1>Root Page</h1>
+}
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware-rewrite-catchall-priority-with-parallel-route.test.ts b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware-rewrite-catchall-priority-with-parallel-route.test.ts
@@ -0,0 +1,43 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('app-dir - middleware rewrite with catch-all and parallel routes', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  describe('payment route', () => {
+    it('should rewrite to the specific page instead of the catch-all with parallel route', async () => {
+      const browser = await next.browser('/payment/test')
+      const text = await browser.elementByCss('#specific-page').text()
+
+      expect(text).toBe('payment whoops')
+      expect(await browser.url()).toBe(next.url + '/payment/test')
+    })
+
+    it('should redirect to the specific page instead of the catch-all with parallel route', async () => {
+      const browser = await next.browser('/payment/test?redirect=true')
+      const text = await browser.elementByCss('#specific-page').text()
+
+      expect(text).toBe('payment whoops')
+      expect(await browser.url()).toBe(next.url + '/payment/whoops')
+    })
+  })
+
+  describe('anotherRoute', () => {
+    it('should rewrite to the specific page instead of the catch-all without parallel route', async () => {
+      const browser = await next.browser('/anotherRoute/test')
+      const text = await browser.elementByCss('#specific-page').text()
+
+      expect(text).toBe('anotherRoute whoops')
+      expect(await browser.url()).toBe(next.url + '/anotherRoute/test')
+    })
+
+    it('should redirect to the specific page instead of the catch-all without parallel route', async () => {
+      const browser = await next.browser('/anotherRoute/test?redirect=true')
+      const text = await browser.elementByCss('#specific-page').text()
+
+      expect(text).toBe('anotherRoute whoops')
+      expect(await browser.url()).toBe(next.url + '/anotherRoute/whoops')
+    })
+  })
+})
diff --git a/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware.ts b/test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware.ts
@@ -0,0 +1,35 @@
+import { NextResponse, type NextRequest } from 'next/server'
+
+export async function middleware(request: NextRequest) {
+  if (
+    request.nextUrl.pathname.includes('payment') &&
+    !request.nextUrl.pathname.includes('whoops')
+  ) {
+    if (request.nextUrl.searchParams.has('redirect')) {
+      return NextResponse.redirect(new URL('/payment/whoops', request.url))
+    }
+    return NextResponse.rewrite(new URL('/payment/whoops', request.url))
+  }
+  if (
+    request.nextUrl.pathname.includes('anotherRoute') &&
+    !request.nextUrl.pathname.includes('whoops')
+  ) {
+    if (request.nextUrl.searchParams.has('redirect')) {
+      return NextResponse.redirect(new URL('/anotherRoute/whoops', request.url))
+    }
+    return NextResponse.rewrite(new URL('/anotherRoute/whoops', request.url))
+  }
+}
+
+export const config = {
+  matcher: [
+    /*
+     * Match all request paths except for the ones starting with:
+     * - api (API routes)
+     * - _next/static (static files)
+     * - _next/image (image optimization files)
+     * - favicon.ico, sitemap.xml, robots.txt (metadata files)
+     */
+    '/((?!api|_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)',
+  ],
+}
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
@@ -3316,6 +3316,18 @@
     "flakey": [],
     "runtimeError": false
   },
+  "test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware-rewrite-catchall-priority-with-parallel-route.test.ts": {
+    "passed": [
+      "app-dir - middleware rewrite with catch-all and parallel routes should rewrite to the specific page instead of the catch-all with parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should redirect to the specific page instead of the catch-all with parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should rewrite to the specific page instead of the catch-all without parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should redirect to the specific page instead of the catch-all without parallel route"
+    ],
+    "failed": [],
+    "pending": [],
+    "flakey": [],
+    "runtimeError": false
+  },
   "test/e2e/app-dir/middleware-sitemap/matcher-exclude-sitemap/index.test.ts": {
     "passed": [
       "middleware-sitemap should not be affected by middleware if sitemap.xml is excluded from the matcher"
diff --git a/test/turbopack-dev-tests-manifest.json b/test/turbopack-dev-tests-manifest.json
@@ -7165,6 +7165,18 @@
     "flakey": [],
     "runtimeError": false
   },
+  "test/e2e/app-dir/middleware-rewrite-catchall-priority-with-parallel-route/middleware-rewrite-catchall-priority-with-parallel-route.test.ts": {
+    "passed": [
+      "app-dir - middleware rewrite with catch-all and parallel routes should rewrite to the specific page instead of the catch-all with parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should redirect to the specific page instead of the catch-all with parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should rewrite to the specific page instead of the catch-all without parallel route",
+      "app-dir - middleware rewrite with catch-all and parallel routes should redirect to the specific page instead of the catch-all without parallel route"
+    ],
+    "failed": [],
+    "pending": [],
+    "flakey": [],
+    "runtimeError": false
+  },
   "test/e2e/app-dir/middleware-sitemap/matcher-exclude-sitemap/index.test.ts": {
     "passed": [
       "middleware-sitemap should not be affected by middleware if sitemap.xml is excluded from the matcher"
