Merge branch 'canary' into opt-in-swc

vercel · May 10, 2022 · 6d7daec · 6d7daec
2 parents 53d1feb + 7d52589
commit 6d7daec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
@@ -1629,7 +1629,7 @@ export default abstract class Server<ServerOptions extends Options = Options> {
       return null
     }
 
-    if (isSSG) {
+    if (isSSG && !this.minimalMode) {
       // set x-nextjs-cache header to match the header
       // we set for the image-optimizer
       res.setHeader(

diff --git a/packages/next/server/view-render.tsx b/packages/next/server/view-render.tsx
@@ -216,16 +216,18 @@ export async function renderToHTML(
     ComponentMod,
   } = renderOpts
 
+  const isFlight = query.__flight__ !== undefined
+  const flightRouterPath = isFlight ? query.__flight_router_path__ : undefined
+
   const hasConcurrentFeatures = !!runtime
   const pageIsDynamic = isDynamicRoute(pathname)
   const components = Object.keys(ComponentMod.components)
     .filter((path) => {
-      const { __flight__, __flight_router_path__: routerPath } = query
       // Rendering part of the page is only allowed for flight data
-      if (__flight__ !== undefined && routerPath) {
+      if (flightRouterPath) {
         // TODO: check the actual path
         const pathLength = path.length
-        return pathLength >= routerPath.length
+        return pathLength >= flightRouterPath.length
       }
       return true
     })
@@ -343,9 +345,8 @@ export async function renderToHTML(
     // }
   }
 
+  // Fall back to default root layout that renders <html> / <head> / <body>
   if (!RootLayout) {
-    // TODO: fallback to our own root layout?
-    // throw new Error('invariant RootLayout not loaded')
     RootLayout = DefaultRootLayout
   }
 
@@ -412,7 +413,7 @@ export async function renderToHTML(
     </FlushEffectContainer>
   )
 
-  const renderServerComponentData = query.__flight__ !== undefined
+  const renderServerComponentData = isFlight
   if (renderServerComponentData) {
     return new RenderResult(
       renderToReadableStream(

diff --git a/test/production/required-server-files.test.ts b/test/production/required-server-files.test.ts
@@ -188,6 +188,7 @@ describe('should set-up next', () => {
       redirect: 'manual',
     })
     expect(res.status).toBe(200)
+    expect(res.headers.get('x-nextjs-cache')).toBeFalsy()
     const $ = cheerio.load(await res.text())
     const props = JSON.parse($('#props').text())
     expect(props.gspCalls).toBeDefined()
@@ -201,6 +202,7 @@ describe('should set-up next', () => {
       }
     )
     expect(res2.status).toBe(200)
+    expect(res2.headers.get('x-nextjs-cache')).toBeFalsy()
     const { pageProps: props2 } = await res2.json()
     expect(props2.gspCalls).toBe(props.gspCalls)