always use 200 status for rsc redirect

gaojude · gaojude · commit 66466a5cea33 · 2025-06-19T17:41:31.000-04:00
diff --git a/packages/next/src/build/templates/app-page.ts b/packages/next/src/build/templates/app-page.ts
@@ -83,6 +83,7 @@ export const __next_app__ = {
 }
 
 import * as entryBase from '../../server/app-render/entry-base' with { 'turbopack-transition': 'next-server-utility' }
+import { RedirectStatusCode } from '../../client/components/redirect-status-code'
 
 export * from '../../server/app-render/entry-base' with { 'turbopack-transition': 'next-server-utility' }
 
@@ -999,6 +1000,16 @@ export async function handler(
         res.statusCode = cachedData.status
       }
 
+      // Redirect information is encoded in RSC payload, so we don't need to use redirect status codes
+      if (
+        !minimalMode &&
+        cachedData.status &&
+        RedirectStatusCode[cachedData.status] &&
+        isRSCRequest
+      ) {
+        res.statusCode = 200
+      }
+
       // Mark that the request did postpone.
       if (didPostpone) {
         res.setHeader(NEXT_DID_POSTPONE_HEADER, '1')
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -170,6 +170,7 @@ import { NoFallbackError } from '../shared/lib/no-fallback-error.external'
 import { getCacheHandlers } from './use-cache/handlers'
 import { fixMojibake } from './lib/fix-mojibake'
 import { computeCacheBustingSearchParam } from '../shared/lib/router/utils/cache-busting-search-param'
+import { RedirectStatusCode } from '../client/components/redirect-status-code'
 
 export type FindComponentsResult = {
   components: LoadComponentsReturnType
@@ -3505,6 +3506,16 @@ export default abstract class Server<
         res.statusCode = cachedData.status
       }
 
+      // Redirect information is encoded in RSC payload, so we don't need to use redirect status codes
+      if (
+        !this.minimalMode &&
+        cachedData.status &&
+        RedirectStatusCode[cachedData.status] &&
+        isRSCRequest
+      ) {
+        res.statusCode = 200
+      }
+
       // Mark that the request did postpone.
       if (didPostpone) {
         res.setHeader(NEXT_DID_POSTPONE_HEADER, '1')
diff --git a/test/e2e/app-dir/rsc-redirect/app/dest/page.tsx b/test/e2e/app-dir/rsc-redirect/app/dest/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default function Page() {
+  return (
+    <div>
+      <h1>Destination</h1>
+    </div>
+  )
+}
diff --git a/test/e2e/app-dir/rsc-redirect/app/layout.tsx b/test/e2e/app-dir/rsc-redirect/app/layout.tsx
@@ -0,0 +1,9 @@
+import React, { ReactNode } from 'react'
+
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/rsc-redirect/app/origin/page.tsx b/test/e2e/app-dir/rsc-redirect/app/origin/page.tsx
@@ -0,0 +1,5 @@
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  redirect('/dest')
+}
diff --git a/test/e2e/app-dir/rsc-redirect/app/page.tsx b/test/e2e/app-dir/rsc-redirect/app/page.tsx
@@ -0,0 +1,11 @@
+import React from 'react'
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <div>
+      <h1>Home</h1>
+      <Link href="/origin">Go to Origin</Link>
+    </div>
+  )
+}
diff --git a/test/e2e/app-dir/rsc-redirect/rsc-redirect.test.ts b/test/e2e/app-dir/rsc-redirect/rsc-redirect.test.ts
@@ -0,0 +1,26 @@
+import { nextTestSetup } from 'e2e-utils'
+import { fetchViaHTTP } from 'next-test-utils'
+
+describe('rsc-redirect', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should get 307 status code for document request', async () => {
+    const response = await fetchViaHTTP(next.url, '/origin', undefined, {
+      redirect: 'manual',
+    })
+    expect(response.status).toBe(307)
+  })
+
+  it('should get 200 status code for rsc request', async () => {
+    // TODO: add RSC cache busting query param
+    const response = await fetchViaHTTP(next.url, '/origin', undefined, {
+      redirect: 'manual',
+      headers: {
+        RSC: '1',
+      },
+    })
+    expect(response.status).toBe(200)
+  })
+})
