@sveltejs/adapter-netlify 2.0.3 → 2.0.5

package/files/esm/serverless.js

@@ -266,7 +266,8 @@ function split_headers(headers) {
 
 	headers.forEach((value, key) => {
 		if (key === 'set-cookie') {
-			m[key] = splitCookiesString_1(value);
+			if (!m[key]) m[key] = [];
+			m[key].push(...splitCookiesString_1(value));
 		} else {
 			h[key] = value;
 		}

package/files/esm/shims.js

@@ -510,25 +510,42 @@ function parseHeaders (headers, obj = {}) {
   for (let i = 0; i < headers.length; i += 2) {
     const key = headers[i].toString().toLowerCase();
     let val = obj[key];
+
+    const encoding = key.length === 19 && key === 'content-disposition'
+      ? 'latin1'
+      : 'utf8';
+
     if (!val) {
       if (Array.isArray(headers[i + 1])) {
         obj[key] = headers[i + 1];
       } else {
-        obj[key] = headers[i + 1].toString();
+        obj[key] = headers[i + 1].toString(encoding);
       }
     } else {
       if (!Array.isArray(val)) {
         val = [val];
         obj[key] = val;
       }
-      val.push(headers[i + 1].toString());
+      val.push(headers[i + 1].toString(encoding));
     }
   }
   return obj
 }
 
 function parseRawHeaders (headers) {
-  return headers.map(header => header.toString())
+  const ret = [];
+  for (let n = 0; n < headers.length; n += 2) {
+    const key = headers[n + 0].toString();
+
+    const encoding = key.length === 19 && key.toLowerCase() === 'content-disposition'
+      ? 'latin1'
+      : 'utf8';
+
+    const val = headers[n + 1].toString(encoding);
+
+    ret.push(key, val);
+  }
+  return ret
 }
 
 function isBuffer (buffer) {
@@ -6664,6 +6681,9 @@ function processHeader (request, key, val) {
     key.length === 4 &&
     key.toLowerCase() === 'host'
   ) {
+    if (headerCharRegex.exec(val) !== null) {
+      throw new InvalidArgumentError$i(`invalid ${key} header`)
+    }
     // Consumed by Client
     request.host = val;
   } else if (
@@ -11635,7 +11655,11 @@ function buildKey$1 (opts) {
 }
 
 function generateKeyValues (data) {
-  return Object.entries(data).reduce((keyValuePairs, [key, value]) => [...keyValuePairs, key, value], [])
+  return Object.entries(data).reduce((keyValuePairs, [key, value]) => [
+    ...keyValuePairs,
+    Buffer.from(`${key}`),
+    Array.isArray(value) ? value.map(x => Buffer.from(`${x}`)) : Buffer.from(`${value}`)
+  ], [])
 }
 
 /**
@@ -12610,6 +12634,7 @@ function requireHeaders () {
 	  isValidHeaderValue
 	} = requireUtil$3();
 	const { webidl } = requireWebidl();
+	const assert = require$$0$1;
 
 	const kHeadersMap = Symbol('headers map');
 	const kHeadersSortedMap = Symbol('headers map sorted');
@@ -12622,10 +12647,12 @@ function requireHeaders () {
 	  //  To normalize a byte sequence potentialValue, remove
 	  //  any leading and trailing HTTP whitespace bytes from
 	  //  potentialValue.
-	  return potentialValue.replace(
-	    /^[\r\n\t ]+|[\r\n\t ]+$/g,
-	    ''
-	  )
+
+	  // Trimming the end with `.replace()` and a RegExp is typically subject to
+	  // ReDoS. This is safer and faster.
+	  let i = potentialValue.length;
+	  while (/[\r\n\t ]/.test(potentialValue.charAt(--i)));
+	  return potentialValue.slice(0, i + 1).replace(/^[\r\n\t ]+/, '')
 	}
 
 	function fill (headers, object) {
@@ -12714,7 +12741,7 @@ function requireHeaders () {
 
 	    if (lowercaseName === 'set-cookie') {
 	      this.cookies ??= [];
-	      this.cookies.push([name, value]);
+	      this.cookies.push(value);
 	    }
 	  }
 
@@ -12724,7 +12751,7 @@ function requireHeaders () {
 	    const lowercaseName = name.toLowerCase();
 
 	    if (lowercaseName === 'set-cookie') {
-	      this.cookies = [[name, value]];
+	      this.cookies = [value];
 	    }
 
 	    // 1. If list contains name, then set the value of
@@ -12975,18 +13002,74 @@ function requireHeaders () {
 	    return this[kHeadersList].set(name, value)
 	  }
 
+	  // https://fetch.spec.whatwg.org/#dom-headers-getsetcookie
+	  getSetCookie () {
+	    webidl.brandCheck(this, Headers);
+
+	    // 1. If this’s header list does not contain `Set-Cookie`, then return « ».
+	    // 2. Return the values of all headers in this’s header list whose name is
+	    //    a byte-case-insensitive match for `Set-Cookie`, in order.
+
+	    const list = this[kHeadersList].cookies;
+
+	    if (list) {
+	      return [...list]
+	    }
+
+	    return []
+	  }
+
+	  // https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine
 	  get [kHeadersSortedMap] () {
-	    if (!this[kHeadersList][kHeadersSortedMap]) {
-	      this[kHeadersList][kHeadersSortedMap] = new Map([...this[kHeadersList]].sort((a, b) => a[0] < b[0] ? -1 : 1));
+	    if (this[kHeadersList][kHeadersSortedMap]) {
+	      return this[kHeadersList][kHeadersSortedMap]
+	    }
+
+	    // 1. Let headers be an empty list of headers with the key being the name
+	    //    and value the value.
+	    const headers = [];
+
+	    // 2. Let names be the result of convert header names to a sorted-lowercase
+	    //    set with all the names of the headers in list.
+	    const names = [...this[kHeadersList]].sort((a, b) => a[0] < b[0] ? -1 : 1);
+	    const cookies = this[kHeadersList].cookies;
+
+	    // 3. For each name of names:
+	    for (const [name, value] of names) {
+	      // 1. If name is `set-cookie`, then:
+	      if (name === 'set-cookie') {
+	        // 1. Let values be a list of all values of headers in list whose name
+	        //    is a byte-case-insensitive match for name, in order.
+
+	        // 2. For each value of values:
+	        // 1. Append (name, value) to headers.
+	        for (const value of cookies) {
+	          headers.push([name, value]);
+	        }
+	      } else {
+	        // 2. Otherwise:
+
+	        // 1. Let value be the result of getting name from list.
+
+	        // 2. Assert: value is non-null.
+	        assert(value !== null);
+
+	        // 3. Append (name, value) to headers.
+	        headers.push([name, value]);
+	      }
 	    }
-	    return this[kHeadersList][kHeadersSortedMap]
+
+	    this[kHeadersList][kHeadersSortedMap] = headers;
+
+	    // 4. Return headers.
+	    return headers
 	  }
 
 	  keys () {
 	    webidl.brandCheck(this, Headers);
 
 	    return makeIterator(
-	      () => [...this[kHeadersSortedMap].entries()],
+	      () => [...this[kHeadersSortedMap].values()],
 	      'Headers',
 	      'key'
 	    )
@@ -12996,7 +13079,7 @@ function requireHeaders () {
 	    webidl.brandCheck(this, Headers);
 
 	    return makeIterator(
-	      () => [...this[kHeadersSortedMap].entries()],
+	      () => [...this[kHeadersSortedMap].values()],
 	      'Headers',
 	      'value'
 	    )
@@ -13006,7 +13089,7 @@ function requireHeaders () {
 	    webidl.brandCheck(this, Headers);
 
 	    return makeIterator(
-	      () => [...this[kHeadersSortedMap].entries()],
+	      () => [...this[kHeadersSortedMap].values()],
 	      'Headers',
 	      'key+value'
 	    )
@@ -13756,6 +13839,7 @@ function requireRequest () {
 	const { URLSerializer } = requireDataURL();
 	const { kHeadersList } = symbols$3;
 	const assert = require$$0$1;
+	const { setMaxListeners, getEventListeners, defaultMaxListeners } = require$$0$4;
 
 	let TransformStream = globalThis.TransformStream;
 
@@ -14080,6 +14164,11 @@ function requireRequest () {
 	        const abort = function () {
 	          acRef.deref()?.abort(this.reason);
 	        };
+
+	        if (getEventListeners(signal, 'abort').length >= defaultMaxListeners) {
+	          setMaxListeners(100, signal);
+	        }
+
 	        signal.addEventListener('abort', abort, { once: true });
 	        requestFinalizer.register(this, { signal, abort });
 	      }
@@ -18563,7 +18652,8 @@ function requireCookies () {
 	    return []
 	  }
 
-	  return cookies.map((pair) => parseSetCookie(pair[1]))
+	  // In older versions of undici, cookies is a list of name:value.
+	  return cookies.map((pair) => parseSetCookie(Array.isArray(pair) ? pair[1] : pair))
 	}
 
 	/**

package/index.js

@@ -1,6 +1,6 @@
-import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'fs';
-import { dirname, join, resolve, posix } from 'path';
-import { fileURLToPath } from 'url';
+import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve, posix } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import esbuild from 'esbuild';
 import toml from '@iarna/toml';
 
@@ -231,8 +231,9 @@ async function generate_lambda_functions({ builder, publish, split }) {
 			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
 			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
 
-			redirects.push(`${pattern} /.netlify/functions/${name} 200`);
-			redirects.push(`${pattern}/__data.json /.netlify/functions/${name} 200`);
+			const redirect = `/.netlify/functions/${name} 200`;
+			redirects.push(`${pattern} ${redirect}`);
+			redirects.push(`${pattern === '/' ? '' : pattern}/__data.json ${redirect}`);
 		}
 	} else {
 		const manifest = builder.generateManifest({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -38,7 +38,7 @@
     "rollup": "^3.7.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
-    "@sveltejs/kit": "^1.5.3"
+    "@sveltejs/kit": "^1.7.1"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"