fix: use headers.entries() instead of headers.raw()

remix-run · Aug 15, 2023 · 2d2d2e2 · 2d2d2e2
1 parent ba67f42
commit 2d2d2e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/packages/remix-architect/__tests__/server-test.ts b/packages/remix-architect/__tests__/server-test.ts
@@ -201,7 +201,9 @@ describe("architect createRemixHeaders", () => {
   describe("creates fetch headers from architect headers", () => {
     it("handles empty headers", () => {
       let headers = createRemixHeaders({});
-      expect(headers.raw()).toMatchInlineSnapshot(`Object {}`);
+      expect(Object.fromEntries(headers.entries())).toMatchInlineSnapshot(
+        `Object {}`
+      );
     });
 
     it("handles simple headers", () => {

diff --git a/packages/remix-architect/server.ts b/packages/remix-architect/server.ts
@@ -106,13 +106,11 @@ export async function sendRemixResponse(
   let cookies: string[] = [];
 
   // Arc/AWS API Gateway will send back set-cookies outside of response headers.
-  for (let [key, values] of Object.entries(nodeResponse.headers.raw())) {
+  nodeResponse.headers.entries().forEach(([key, value]) => {
     if (key.toLowerCase() === "set-cookie") {
-      for (let value of values) {
-        cookies.push(value);
-      }
+      cookies.push(value);
     }
-  }
+  });
 
   if (cookies.length) {
     nodeResponse.headers.delete("Set-Cookie");

diff --git a/packages/remix-express/__tests__/server-test.ts b/packages/remix-express/__tests__/server-test.ts
@@ -158,7 +158,9 @@ describe("express createRemixHeaders", () => {
   describe("creates fetch headers from express headers", () => {
     it("handles empty headers", () => {
       let headers = createRemixHeaders({});
-      expect(headers.raw()).toMatchInlineSnapshot(`Object {}`);
+      expect(Object.fromEntries(headers.entries())).toMatchInlineSnapshot(
+        `Object {}`
+      );
     });
 
     it("handles simple headers", () => {

diff --git a/packages/remix-express/server.ts b/packages/remix-express/server.ts
@@ -118,11 +118,9 @@ export async function sendRemixResponse(
   res.statusMessage = nodeResponse.statusText;
   res.status(nodeResponse.status);
 
-  for (let [key, values] of Object.entries(nodeResponse.headers.raw())) {
-    for (let value of values) {
-      res.append(key, value);
-    }
-  }
+  nodeResponse.headers
+    .entries()
+    .forEach(([key, value]) => res.append(key, value));
 
   if (nodeResponse.body) {
     await writeReadableStreamToWritable(nodeResponse.body, res);