overwrite redirect SSG meta.status to 200 for RSC requests

Author: gaojude

packages/next/src/build/templates/pages.ts

@@ -43,6 +43,7 @@ import { addPathPrefix } from '../../shared/lib/router/utils/add-path-prefix'
 import { removeTrailingSlash } from '../../shared/lib/router/utils/remove-trailing-slash'
 import { pathHasPrefix } from '../../shared/lib/router/utils/path-has-prefix'
 import { normalizeLocalePath } from '../../shared/lib/i18n/normalize-locale-path'
+import { RSC_HEADER } from '../../client/components/app-router-headers'
 
 // Re-export the component (should be the default export).
 export default hoist(userland, 'default')
@@ -499,6 +500,10 @@ export async function handler(
         }
 
         if (isIsrFallback) {
+          const isRSCRequest =
+            getRequestMeta(req, 'isRSCRequest') ??
+            Boolean(req.headers[RSC_HEADER])
+
           const fallbackResponse = await routeModule.getResponseCache(req).get(
             routeModule.isDev
               ? null
@@ -509,12 +514,15 @@ export async function handler(
               previousCacheEntry: previousFallbackCacheEntry = null,
             }) => {
               if (!routeModule.isDev) {
-                return toResponseCacheEntry(previousFallbackCacheEntry)
+                return toResponseCacheEntry(previousFallbackCacheEntry, {
+                  isRscRequest: isRSCRequest,
+                })
               }
               return doRender()
             },
             {
               routeKind: RouteKind.PAGES,
+              isRscRequest: isRSCRequest,
               isFallback: true,
               isRoutePPREnabled: false,
               isOnDemandRevalidate: false,

packages/next/src/server/base-server.ts

@@ -3030,7 +3030,9 @@ export default abstract class Server<
               // the previous fallback cache entry. This preserves the previous
               // behavior.
               if (isProduction) {
-                return toResponseCacheEntry(previousFallbackCacheEntry)
+                return toResponseCacheEntry(previousFallbackCacheEntry, {
+                  isRscRequest: isRSCRequest,
+                })
               }
 
               // We pass `undefined` and `null` as it doesn't apply to the pages
@@ -3046,6 +3048,7 @@ export default abstract class Server<
             },
             {
               routeKind: RouteKind.PAGES,
+              isRscRequest: isRSCRequest,
               incrementalCache,
               isRoutePPREnabled,
               isFallback: true,
@@ -3080,6 +3083,7 @@ export default abstract class Server<
               }),
             {
               routeKind: RouteKind.APP_PAGE,
+              isRscRequest: isRSCRequest,
               incrementalCache,
               isRoutePPREnabled,
               isFallback: true,
@@ -3180,6 +3184,7 @@ export default abstract class Server<
           // rendered and thus check isAppPath.
           routeModule?.definition.kind ??
           (isAppPath ? RouteKind.APP_PAGE : RouteKind.PAGES),
+        isRscRequest: isRSCRequest,
         incrementalCache,
         isOnDemandRevalidate,
         isPrefetch: req.headers.purpose === 'prefetch',

packages/next/src/server/next-server.ts

@@ -1049,6 +1049,7 @@ export default class NextNodeServer extends BaseServer<
           },
           {
             routeKind: RouteKind.IMAGE,
+            isRscRequest: false,
             incrementalCache: imageOptimizerCache,
             isFallback: false,
           }

packages/next/src/server/response-cache/index.ts

@@ -53,6 +53,7 @@ export default class ResponseCache implements ResponseCacheBase {
     responseGenerator: ResponseGenerator,
     context: {
       routeKind: RouteKind
+      isRscRequest: boolean
       isOnDemandRevalidate?: boolean
       isPrefetch?: boolean
       incrementalCache: IncrementalResponseCache
@@ -209,6 +210,8 @@ export default class ResponseCache implements ResponseCacheBase {
       }
     )
 
-    return toResponseCacheEntry(response)
+    return toResponseCacheEntry(response, {
+      isRscRequest: context.isRscRequest,
+    })
   }
 }

packages/next/src/server/response-cache/types.ts

@@ -17,6 +17,7 @@ export interface ResponseCacheBase {
        * provided it will test the filesystem to check.
        */
       routeKind: RouteKind
+      isRscRequest: boolean
 
       /**
        * True if this is a fallback request.

packages/next/src/server/response-cache/utils.ts

@@ -9,6 +9,7 @@ import {
 
 import RenderResult from '../render-result'
 import { RouteKind } from '../route-kind'
+import { RedirectStatusCode } from '../../client/components/redirect-status-code'
 
 export async function fromResponseCacheEntry(
   cacheEntry: ResponseCacheEntry
@@ -39,7 +40,8 @@ export async function fromResponseCacheEntry(
 }
 
 export async function toResponseCacheEntry(
-  response: IncrementalResponseCacheEntry | null
+  response: IncrementalResponseCacheEntry | null,
+  { isRscRequest }: { isRscRequest: boolean }
 ): Promise<ResponseCacheEntry | null> {
   if (!response) return null
 
@@ -62,7 +64,14 @@ export async function toResponseCacheEntry(
               html: RenderResult.fromStatic(response.value.html),
               rscData: response.value.rscData,
               headers: response.value.headers,
-              status: response.value.status,
+              status:
+                // RSC redirect is embedded in the payload itself and handled by client router directly
+                // This makes it consistent with how it's handled in minimalMode
+                isRscRequest &&
+                response.value.status &&
+                RedirectStatusCode[response.value.status]
+                  ? 200
+                  : response.value.status,
               postponed: response.value.postponed,
               segmentData: response.value.segmentData,
             } satisfies CachedAppPageValue)

packages/next/src/server/route-modules/route-module.ts

@@ -55,6 +55,7 @@ import {
   routerServerGlobal,
   type RouterServerContext,
 } from '../lib/router-utils/router-server-context'
+import { RSC_HEADER } from '../../client/components/app-router-headers'
 
 /**
  * RouteModuleOptions is the options that are passed to the route module, other
@@ -722,7 +723,10 @@ export abstract class RouteModule<
     waitUntil?: (prom: Promise<any>) => void
   }) {
     const responseCache = this.getResponseCache(req)
+    const isRSCRequest =
+      getRequestMeta(req, 'isRSCRequest') ?? Boolean(req.headers[RSC_HEADER])
     const cacheEntry = await responseCache.get(cacheKey, responseGenerator, {
+      isRscRequest: isRSCRequest,
       routeKind,
       isFallback,
       isRoutePPREnabled,