fix(cookies): use Headers#getSetCookie when available (#540)

Co-authored-by: Kiko Beats <josefrancisco.verdu@gmail.com>
vercel · Sep 5, 2023 · fb34f31 · fb34f31 · vercel · Sep 5, 2023
1 parent 14c8a70
commit fb34f31
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/.changeset/unlucky-sloths-explode.md b/.changeset/unlucky-sloths-explode.md
@@ -0,0 +1,6 @@
+---
+'@edge-runtime/primitives': patch
+'@edge-runtime/cookies': patch
+---
+
+use `Headers#getSetCookie` when available
diff --git a/packages/cookies/src/response-cookies.ts b/packages/cookies/src/response-cookies.ts
@@ -19,15 +19,14 @@ export class ResponseCookies {
   constructor(responseHeaders: Headers) {
     this._headers = responseHeaders
 
-    const setCookie =
-      // @ts-expect-error See https://github.com/whatwg/fetch/issues/973
-      responseHeaders.getAll?.('set-cookie') ??
-      responseHeaders.get('set-cookie') ??
-      []
+    const setCookie = responseHeaders.getSetCookie?.()
+    responseHeaders.get('set-cookie') ?? []
 
     const cookieStrings = Array.isArray(setCookie)
       ? setCookie
-      : splitCookiesString(setCookie)
+      : // TODO: remove splitCookiesString when `getSetCookie` adoption is high enough in Node.js
+        // https://developer.mozilla.org/en-US/docs/Web/API/Headers/getSetCookie#browser_compatibility
+        splitCookiesString(setCookie)
 
     for (const cookieString of cookieStrings) {
       const parsed = parseSetCookie(cookieString)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml