Clean up

vercel · Jul 20, 2021 · a67554d · a67554d
1 parent 5ced755
commit a67554d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
@@ -1335,11 +1335,13 @@ export default class Server {
       query: ParsedUrlQuery
     }
   ): Promise<void> {
+    // TODO: Determine when dynamic HTML is allowed
+    const requireStaticHTML = true
     const ctx = {
       ...partialContext,
       renderOpts: {
         ...this.renderOpts,
-        requireStaticHTML: false,
+        requireStaticHTML,
       },
     } as const
     const payload = await fn(ctx)
@@ -1357,7 +1359,9 @@ export default class Server {
       return sendRenderResult({
         req,
         res,
-        resultOrPayload: body,
+        resultOrPayload: requireStaticHTML
+          ? (await resultToChunks(body)).join('')
+          : body,
         type,
         generateEtags,
         poweredByHeader,

diff --git a/packages/next/server/send-payload.ts b/packages/next/server/send-payload.ts
@@ -112,8 +112,10 @@ export function sendRenderResult({
     setRevalidateHeaders(res, options)
   }
 
-  if (isPayload) {
-    res.end(req.method === 'HEAD' ? null : (resultOrPayload as string))
+  if (req.method === 'HEAD') {
+    res.end(null)
+  } else if (isPayload) {
+    res.end(resultOrPayload as string)
   } else {
     ;(resultOrPayload as RenderResult)({
       next: (chunk) => res.write(chunk),