fix: multi-headers

front-of-house · Jan 22, 2022 · 0d77419 · 0d77419
1 parent 1b2cdbd
commit 0d77419
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/.changeset/wet-garlics-flow.md b/.changeset/wet-garlics-flow.md
@@ -0,0 +1,6 @@
+---
+'presta': patch
+'@presta/utils': patch
+---
+
+Fix multi-header setting, move default HTML response to utils
diff --git a/packages/presta/lib/serve.ts b/packages/presta/lib/serve.ts
@@ -5,10 +5,9 @@ import mime from 'mime-types'
 import toRegExp from 'regexparam'
 import status from 'statuses'
 import { WebSocketServer } from 'ws'
-import { timer, requestToEvent, requireFresh, sendServerlessResponse } from '@presta/utils'
+import { timer, requestToEvent, requireFresh, sendServerlessResponse, createDefaultHtmlResponse } from '@presta/utils'
 
 import * as logger from './log'
-import { createDefaultHtmlResponse } from './createDefaultHtmlResponse'
 import { createLiveReloadScript } from './utils'
 import { Handler, Event, Response, Context } from './lambda'
 import { Config } from './config'

diff --git a/packages/presta/package.json b/packages/presta/package.json
@@ -46,6 +46,7 @@
     "route-sort": "^1.0.0",
     "sade": "^1.7.3",
     "sirv": "^1.0.7",
+    "statues": "^1.0.0-alpha1",
     "statuses": "^2.0.1",
     "tiny-glob": "^0.2.9",
     "watch-dependency-graph": "^3.0.1",

diff --git a/packages/utils/.gitignore b/packages/utils/.gitignore
@@ -20,3 +20,5 @@ sendServerlessResponse.js
 sendServerlessResponse.d.ts
 timer.js
 timer.d.ts
+createDefaultHtmlResponse.js
+createDefaultHtmlResponse.d.ts
diff --git a/...s/presta/lib/createDefaultHtmlResponse.ts → ...es/utils/lib/createDefaultHtmlResponse.ts b/...s/presta/lib/createDefaultHtmlResponse.ts → ...es/utils/lib/createDefaultHtmlResponse.ts
diff --git a/packages/utils/lib/index.ts b/packages/utils/lib/index.ts
@@ -6,3 +6,4 @@ export { requireFresh } from './requireFresh'
 export { hashContent } from './hashContent'
 export { sendServerlessResponse } from './sendServerlessResponse'
 export { timer } from './timer'
+export { createDefaultHtmlResponse } from './createDefaultHtmlResponse'
diff --git a/packages/utils/lib/sendServerlessResponse.ts b/packages/utils/lib/sendServerlessResponse.ts
@@ -4,14 +4,17 @@ import { Response } from 'lambda-types'
 export function sendServerlessResponse(res: http.ServerResponse, response: Response) {
   // @see https://github.com/netlify/cli/blob/27bb7b9b30d465abe86f87f4274dd7a71b1b003b/src/utils/serve-functions.js#L73
   if (response.multiValueHeaders) {
-    for (const key of Object.keys(response.multiValueHeaders)) {
-      res.setHeader(key, String(response.multiValueHeaders[key]))
+    for (const header of Object.keys(response.multiValueHeaders)) {
+      res.setHeader(
+        header,
+        response.multiValueHeaders[header].map((v) => String(v))
+      )
     }
   }
 
   if (response.headers) {
-    for (const key of Object.keys(response.headers)) {
-      res.setHeader(key, String(response.headers[key]))
+    for (const header of Object.keys(response.headers)) {
+      res.setHeader(header, String(response.headers[header]))
     }
   }
 

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -21,7 +21,8 @@
   "dependencies": {
     "mime-types": "^2.1.31",
     "query-string": "^6.14.1",
-    "raw-body": "^2.4.1"
+    "raw-body": "^2.4.1",
+    "statuses": "^2.0.1"
   },
   "devDependencies": {
     "lambda-types": "^1.0.0"

diff --git a/packages/utils/scripts/build.js b/packages/utils/scripts/build.js
@@ -13,6 +13,7 @@ require('esbuild').buildSync({
     'lib/hashContent.ts',
     'lib/sendServerlessResponse.ts',
     'lib/timer.ts',
+    'lib/createDefaultHtmlResponse.ts',
   ],
   outdir: path.join(__dirname, '..'),
   bundle: true,