Fix CI

remix-run · May 18, 2024 · 8d9ec2a · 8d9ec2a
1 parent 1e96906
commit 8d9ec2a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/packages/router/__tests__/utils/custom-matchers.ts b/packages/router/__tests__/utils/custom-matchers.ts
@@ -45,13 +45,23 @@ export function deferredData(received, done, status = 200, headers = {}) {
       `instead got done=${String(deferredData.done)}/status=${
         deferredData.init!.status || 200
       }/headers=${JSON.stringify(
-        Object.fromEntries(new Headers(deferredData.init!.headers ?? {}).entries())
+        Object.fromEntries(
+          (deferredData.init!.headers
+            ? new Headers(deferredData.init!.headers)
+            : new Headers()
+          ).entries()
+        )
       )}`,
     pass:
       deferredData.done === done &&
       (deferredData.init!.status || 200) === status &&
       JSON.stringify(
-        Object.fromEntries(new Headers(deferredData.init!.headers ?? {}).entries())
+        Object.fromEntries(
+          (deferredData.init!.headers
+            ? new Headers(deferredData.init!.headers)
+            : new Headers()
+          ).entries()
+        )
       ) === JSON.stringify(headers),
   };
 }

diff --git a/packages/router/utils.ts b/packages/router/utils.ts
@@ -1300,7 +1300,9 @@ export type JsonFunction = <Data>(
 export const json: JsonFunction = (data, init = {}) => {
   let responseInit = typeof init === "number" ? { status: init } : init;
 
-  let headers = new Headers(responseInit.headers ?? {});
+  let headers = responseInit.headers
+    ? new Headers(responseInit.headers)
+    : new Headers();
   if (!headers.has("Content-Type")) {
     headers.set("Content-Type", "application/json; charset=utf-8");
   }
@@ -1535,7 +1537,9 @@ export const redirect: RedirectFunction = (url, init = 302) => {
     responseInit.status = 302;
   }
 
-  let headers = new Headers(responseInit.headers ?? {});
+  let headers = responseInit.headers
+    ? new Headers(responseInit.headers)
+    : new Headers();
   headers.set("Location", url);
 
   return new Response(null, {