vercel · huozhi · Mar 27, 2024 · Mar 26, 2024 · Mar 26, 2024 · Mar 26, 2024
diff --git a/packages/next/src/export/routes/app-page.ts b/packages/next/src/export/routes/app-page.ts
@@ -128,12 +128,23 @@ export async function exportAppPage(
       'utf8'
     )
 
+    const isParallelRoute = /\/@\w+/.test(page)
+    const isNonSuccessfulStatusCode = res.statusCode > 300
+    // When PPR is enabled, we don't always send 200 for routes that have been
+    // pregenerated, so we should grab the status code from the mocked
+    // response.
+    let status: number | undefined = renderOpts.experimental.ppr
+      ? res.statusCode
+      : undefined
+
+    // If it's parallel route the status from mock response is 404
+    if (isNonSuccessfulStatusCode && !isParallelRoute) {
+      status = res.statusCode
+    }
+
     // Writing the request metadata to a file.
     const meta: RouteMetadata = {
-      // When PPR is enabled, we don't always send 200 for routes that have been
-      // pregenerated, so we should grab the status code from the mocked
-      // response.
-      status: renderOpts.experimental.ppr ? res.statusCode : undefined,
+      status,
       headers,
       postponed,
     }

diff --git a/test/e2e/app-dir/static-generation-status/app/layout.js b/test/e2e/app-dir/static-generation-status/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/static-generation-status/app/not-found-page/page.js b/test/e2e/app-dir/static-generation-status/app/not-found-page/page.js
@@ -0,0 +1,7 @@
+import { notFound } from 'next/navigation'
+
+export default function Page() {
+  notFound()
+}
+
+export const dynamic = 'force-static'
diff --git a/test/e2e/app-dir/static-generation-status/app/page.js b/test/e2e/app-dir/static-generation-status/app/page.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return 'home'
+}
diff --git a/test/e2e/app-dir/static-generation-status/app/redirect-page/page.js b/test/e2e/app-dir/static-generation-status/app/redirect-page/page.js
@@ -0,0 +1,7 @@
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  redirect('/')
+}
+
+export const dynamic = 'force-static'
diff --git a/test/e2e/app-dir/static-generation-status/index.test.ts b/test/e2e/app-dir/static-generation-status/index.test.ts
@@ -0,0 +1,25 @@
+import { createNextDescribe } from 'e2e-utils'
+
+createNextDescribe(
+  'app-dir static-generation-status',
+  {
+    files: __dirname,
+  },
+  ({ next }) => {
+    it('should render the page using notFound with status 404', async () => {
+      const { status } = await next.fetch('/not-found-page')
+      expect(status).toBe(404)
+    })
+
+    it('should render the page using redirect with status 307', async () => {
+      const { status } = await next.fetch('/redirect-page', {
+        redirect: 'manual',
+      })
+      expect(status).toBe(307)
+    })
+
+    it('should render the non existed route redirect with status 404', async () => {
+      expect((await next.fetch('/does-not-exist')).status).toBe(404)
+    })
+  }
+)