Merge branch 'canary' into fix/imgix-no-double-querystrings

vercel · Jul 6, 2021 · 0d8173e · 0d8173e
2 parents 5299aef + 2795b79
commit 0d8173e
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 68 deletions.
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
@@ -30,6 +30,7 @@ import Server, {
   WrappedBuildError,
   ServerConstructor,
   FindComponentsResult,
+  ResponsePayload,
 } from '../next-server'
 import { normalizePagePath } from '../normalize-page-path'
 import Router, { Params, route } from '../router'
@@ -636,14 +637,14 @@ export default class DevServer extends Server {
     return await loadDefaultErrorComponents(this.distDir)
   }
 
-  sendHTML(
+  sendResponse(
     req: IncomingMessage,
     res: ServerResponse,
-    html: string
+    response: ResponsePayload
   ): Promise<void> {
     // In dev, we should not cache pages for any reason.
     res.setHeader('Cache-Control', 'no-store, must-revalidate')
-    return super.sendHTML(req, res, html)
+    return super.sendResponse(req, res, response)
   }
 
   protected setImmutableAssetCacheControl(res: ServerResponse): void {