refactor: use render results for fallbacks

vercel · Jul 24, 2024 · 1b59a3b · 1b59a3b
1 parent 9cdd108
commit 1b59a3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -374,7 +374,7 @@ export default abstract class Server<
     req: ServerRequest,
     parsedUrl: NextUrlWithParsedQuery
   ): void
-  protected abstract getFallback(page: string): Promise<string>
+  protected abstract getFallback(page: string): Promise<RenderResult>
   protected abstract hasPage(pathname: string): Promise<boolean>
 
   protected abstract sendRenderResult(
@@ -2687,9 +2687,9 @@ export default abstract class Server<
         value: {
           kind: 'PAGE',
           html: result,
-          pageData: metadata.pageData ?? metadata.flightData,
+          pageData: metadata.pageData,
           headers,
-          status: isAppPath ? res.statusCode : undefined,
+          status: undefined,
         } satisfies CachedPageValue,
         revalidate: metadata.revalidate,
       }
@@ -2795,18 +2795,19 @@ export default abstract class Server<
         if (!isNextDataRequest) {
           // Production already emitted the fallback as static HTML.
           if (isProduction) {
-            const html = await this.getFallback(
+            const result = await this.getFallback(
               locale ? `/${locale}${pathname}` : pathname
             )
 
             return {
               value: {
                 kind: 'PAGE',
-                html: RenderResult.fromStatic(html),
+                html: result,
+                pageData: Object.create(null),
+                headers: result.metadata.headers,
                 status: undefined,
-                headers: undefined,
-                pageData: {},
-              },
+              } satisfies CachedPageValue,
+              revalidate: result.metadata.revalidate,
             }
           }
           // We need to generate the fallback on-demand for development.

diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -9,7 +9,7 @@ import {
   MiddlewareNotFoundError,
 } from '../shared/lib/utils'
 import type { MiddlewareManifest } from '../build/webpack/plugins/middleware-plugin'
-import type RenderResult from './render-result'
+import RenderResult from './render-result'
 import type { FetchEventResult } from './web/types'
 import type { PrerenderManifest } from '../build'
 import type { PagesManifest } from '../build/webpack/plugins/pages-manifest-plugin'
@@ -805,13 +805,14 @@ export default class NextNodeServer extends BaseServer<
     ) as NextFontManifest
   }
 
-  protected getFallback(page: string): Promise<string> {
+  protected async getFallback(page: string): Promise<RenderResult> {
     page = normalizePagePath(page)
     const cacheFs = this.getCacheFilesystem()
-    return cacheFs.readFile(
-      join(this.serverDistDir, 'pages', `${page}.html`),
-      'utf8'
-    )
+
+    // For Pages, we just have to return the fallback HTML.
+    const filename = join(this.serverDistDir, 'pages', page)
+    const html = await cacheFs.readFile(`${filename}.html`, 'utf8')
+    return RenderResult.fromStatic(html)
   }
 
   protected handleNextImageRequest: NodeRouteHandler = async (

diff --git a/packages/next/src/server/web-server.ts b/packages/next/src/server/web-server.ts
@@ -1,5 +1,5 @@
 import type { WebNextRequest, WebNextResponse } from './base-http/web'
-import type RenderResult from './render-result'
+import RenderResult from './render-result'
 import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta'
 import type { Params } from '../client/components/params'
 import type { LoadComponentsReturnType } from './load-components'
@@ -358,7 +358,7 @@ export default class NextWebServer extends BaseServer<
   }
 
   protected async getFallback() {
-    return ''
+    return RenderResult.fromStatic('')
   }
 
   protected getFontManifest() {