fix: redirect handling in dev

front-of-house · Mar 23, 2022 · f62bacf · f62bacf
1 parent 1c30258
commit f62bacf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.changeset/thick-dolphins-wonder.md b/.changeset/thick-dolphins-wonder.md
@@ -0,0 +1,5 @@
+---
+'presta': patch
+---
+
+Unset headers and body if response is a redirect
diff --git a/packages/presta/lib/normalizeResponse.ts b/packages/presta/lib/normalizeResponse.ts
@@ -36,6 +36,7 @@ export function normalizeResponse(response: Partial<Response> | string): LambdaR
         body: response,
       }
     : response
+  const redir = statusCode > 299 && statusCode < 399
 
   let contentType = 'text/html; charset=utf-8'
 
@@ -46,15 +47,16 @@ export function normalizeResponse(response: Partial<Response> | string): LambdaR
   }
 
   const normalizedIncomingHeaders = normalizeHeaders(headers as Headers)
-  const normalizedHeaders: LambdaResponse['headers'] = {
-    'content-type': contentType,
-    ...normalizedIncomingHeaders,
+  const normalizedHeaders: LambdaResponse['headers'] = {}
+
+  if (!redir) {
+    normalizedHeaders['content-type'] = contentType
   }
 
   return {
     isBase64Encoded,
     statusCode,
-    headers: normalizedHeaders,
+    headers: Object.assign({}, normalizedHeaders, normalizedIncomingHeaders),
     multiValueHeaders,
     body: stringify(body || html || json || xml || ''),
   }

diff --git a/packages/presta/lib/serve.ts b/packages/presta/lib/serve.ts
@@ -13,7 +13,7 @@ import { Handler, Event, Response, Context } from './lambda'
 import { Config } from './config'
 import { Hooks } from './createEmitter'
 import { normalizeResponse } from './normalizeResponse'
-import { getDynamicFilesFromManifest, Manifest, ManifestDynamicFile } from './manifest'
+import { getDynamicFilesFromManifest, Manifest } from './manifest'
 
 export interface HttpError extends Error {
   statusCode?: number
@@ -87,7 +87,7 @@ export function createRequestHandler({ port, config }: { port: number; config: C
     const lambda = loadLambdaFromManifest(event.path, manifest)
     const response = await processHandler(event, lambda)
     const redir = response.statusCode > 299 && response.statusCode < 399
-    const mime = getMimeType(response)
+    const mime = redir ? undefined : getMimeType(response)
 
     if (mime === 'html') {
       response.body = (response.body || '').split('</body>')[0] + createLiveReloadScript({ port })