@sveltejs/adapter-netlify 2.0.4 → 2.0.6

package/README.md

@@ -2,8 +2,6 @@
 
 A SvelteKit adapter that creates a Netlify app.
 
-If you're using [adapter-auto](https://kit.svelte.dev/docs/adapter-auto), you don't need to install this unless you need to specify Netlify-specific options, since it's already included.
-
 ## Docs
 
 [Docs](https://kit.svelte.dev/docs/adapter-netlify)

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

@@ -307,6 +307,8 @@ const { Blob: Blob$2 } = require$$7;
 const nodeUtil = require$$0;
 const { stringify } = require$$8;
 
+const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(v => Number(v));
+
 function nop$1 () {}
 
 function isStream (obj) {
@@ -510,25 +512,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) {
@@ -700,7 +719,10 @@ var util$g = {
   validateHandler,
   getSocketInfo,
   isFormDataLike,
-  buildURL: buildURL$2
+  buildURL: buildURL$2,
+  nodeMajor,
+  nodeMinor,
+  nodeHasAutoSelectFamily: nodeMajor > 18 || (nodeMajor === 18 && nodeMinor >= 13)
 };
 
 let fastNow = Date.now();
@@ -5118,6 +5140,7 @@ function requireDataURL () {
 	  dataURLProcessor,
 	  URLSerializer,
 	  collectASequenceOfCodePoints,
+	  collectASequenceOfCodePointsFast,
 	  stringPercentDecode,
 	  parseMIMEType,
 	  collectAnHTTPQuotedString,
@@ -6394,10 +6417,6 @@ const channels$1 = {};
 
 let extractBody;
 
-const nodeVersion = process.versions.node.split('.');
-const nodeMajor = Number(nodeVersion[0]);
-const nodeMinor = Number(nodeVersion[1]);
-
 try {
   const diagnosticsChannel = require('diagnostics_channel');
   channels$1.create = diagnosticsChannel.channel('undici:request:create');
@@ -6532,7 +6551,7 @@ let Request$1 = class Request {
     }
 
     if (util$e.isFormDataLike(this.body)) {
-      if (nodeMajor < 16 || (nodeMajor === 16 && nodeMinor < 8)) {
+      if (util$e.nodeMajor < 16 || (util$e.nodeMajor === 16 && util$e.nodeMinor < 8)) {
         throw new InvalidArgumentError$i('Form-Data bodies are only supported in node v16.8 and newer.')
       }
 
@@ -6664,6 +6683,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 (
@@ -7772,7 +7794,9 @@ let Client$4 = class Client extends DispatcherBase$3 {
     connect,
     maxRequestsPerClient,
     localAddress,
-    maxResponseSize
+    maxResponseSize,
+    autoSelectFamily,
+    autoSelectFamilyAttemptTimeout
   } = {}) {
     super();
 
@@ -7848,12 +7872,20 @@ let Client$4 = class Client extends DispatcherBase$3 {
       throw new InvalidArgumentError$e('maxResponseSize must be a positive number')
     }
 
+    if (
+      autoSelectFamilyAttemptTimeout != null &&
+      (!Number.isInteger(autoSelectFamilyAttemptTimeout) || autoSelectFamilyAttemptTimeout < -1)
+    ) {
+      throw new InvalidArgumentError$e('autoSelectFamilyAttemptTimeout must be a positive number')
+    }
+
     if (typeof connect !== 'function') {
       connect = buildConnector$2({
         ...tls,
         maxCachedSessions,
         socketPath,
         timeout: connectTimeout,
+        ...(util$b.nodeHasAutoSelectFamily && autoSelectFamily ? { autoSelectFamily, autoSelectFamilyAttemptTimeout } : undefined),
         ...connect
       });
     }
@@ -7875,8 +7907,8 @@ let Client$4 = class Client extends DispatcherBase$3 {
     this[kResuming] = 0; // 0, idle, 1, scheduled, 2 resuming
     this[kNeedDrain$3] = 0; // 0, idle, 1, scheduled, 2 resuming
     this[kHostHeader] = `host: ${this[kUrl$3].hostname}${this[kUrl$3].port ? `:${this[kUrl$3].port}` : ''}\r\n`;
-    this[kBodyTimeout] = bodyTimeout != null ? bodyTimeout : 30e3;
-    this[kHeadersTimeout] = headersTimeout != null ? headersTimeout : 30e3;
+    this[kBodyTimeout] = bodyTimeout != null ? bodyTimeout : 300e3;
+    this[kHeadersTimeout] = headersTimeout != null ? headersTimeout : 300e3;
     this[kStrictContentLength] = strictContentLength == null ? true : strictContentLength;
     this[kMaxRedirections$1] = maxRedirections;
     this[kMaxRequests] = maxRequestsPerClient;
@@ -9789,6 +9821,8 @@ let Pool$3 = class Pool extends PoolBase$1 {
     tls,
     maxCachedSessions,
     socketPath,
+    autoSelectFamily,
+    autoSelectFamilyAttemptTimeout,
     ...options
   } = {}) {
     super();
@@ -9811,6 +9845,7 @@ let Pool$3 = class Pool extends PoolBase$1 {
         maxCachedSessions,
         socketPath,
         timeout: connectTimeout == null ? 10e3 : connectTimeout,
+        ...(util$a.nodeHasAutoSelectFamily && autoSelectFamily ? { autoSelectFamily, autoSelectFamilyAttemptTimeout } : undefined),
         ...connect
       });
     }
@@ -11635,7 +11670,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 +12649,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 +12662,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) {
@@ -12671,6 +12713,7 @@ function requireHeaders () {
 	    if (init instanceof HeadersList) {
 	      this[kHeadersMap] = new Map(init[kHeadersMap]);
 	      this[kHeadersSortedMap] = init[kHeadersSortedMap];
+	      this.cookies = init.cookies;
 	    } else {
 	      this[kHeadersMap] = new Map(init);
 	      this[kHeadersSortedMap] = null;
@@ -12714,7 +12757,7 @@ function requireHeaders () {
 
 	    if (lowercaseName === 'set-cookie') {
 	      this.cookies ??= [];
-	      this.cookies.push([name, value]);
+	      this.cookies.push(value);
 	    }
 	  }
 
@@ -12724,7 +12767,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 +13018,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 +13095,7 @@ function requireHeaders () {
 	    webidl.brandCheck(this, Headers);
 
 	    return makeIterator(
-	      () => [...this[kHeadersSortedMap].entries()],
+	      () => [...this[kHeadersSortedMap].values()],
 	      'Headers',
 	      'value'
 	    )
@@ -13006,7 +13105,7 @@ function requireHeaders () {
 	    webidl.brandCheck(this, Headers);
 
 	    return makeIterator(
-	      () => [...this[kHeadersSortedMap].entries()],
+	      () => [...this[kHeadersSortedMap].values()],
 	      'Headers',
 	      'key+value'
 	    )
@@ -13756,6 +13855,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 +14180,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 });
 	      }
@@ -14697,7 +14802,7 @@ function requireFetch () {
 	const { kHeadersList } = symbols$3;
 	const EE = require$$0$4;
 	const { Readable, pipeline } = require$$0$2;
-	const { isErrored, isReadable } = util$g;
+	const { isErrored, isReadable, nodeMajor, nodeMinor } = util$g;
 	const { dataURLProcessor, serializeAMimeType } = requireDataURL();
 	const { TransformStream } = require$$13;
 	const { getGlobalDispatcher } = global$2;
@@ -14708,10 +14813,6 @@ function requireFetch () {
 	let resolveObjectURL;
 	let ReadableStream = globalThis.ReadableStream;
 
-	const nodeVersion = process.versions.node.split('.');
-	const nodeMajor = Number(nodeVersion[0]);
-	const nodeMinor = Number(nodeVersion[1]);
-
 	class Fetch extends EE {
 	  constructor (dispatcher) {
 	    super();
@@ -18157,7 +18258,7 @@ function requireParse () {
 
 	const { maxNameValuePairSize, maxAttributeValueSize } = requireConstants$1();
 	const { isCTLExcludingHtab } = requireUtil$1();
-	const { collectASequenceOfCodePoints } = requireDataURL();
+	const { collectASequenceOfCodePointsFast } = requireDataURL();
 	const assert = require$$0$1;
 
 	/**
@@ -18187,7 +18288,7 @@ function requireParse () {
 	    //    (including the %x3B (";") in question).
 	    const position = { position: 0 };
 
-	    nameValuePair = collectASequenceOfCodePoints((char) => char !== ';', header, position);
+	    nameValuePair = collectASequenceOfCodePointsFast(';', header, position);
 	    unparsedAttributes = header.slice(position.position);
 	  } else {
 	    // Otherwise:
@@ -18209,8 +18310,8 @@ function requireParse () {
 	    //    empty) value string consists of the characters after the first
 	    //    %x3D ("=") character.
 	    const position = { position: 0 };
-	    name = collectASequenceOfCodePoints(
-	      (char) => char !== '=',
+	    name = collectASequenceOfCodePointsFast(
+	      '=',
 	      nameValuePair,
 	      position
 	    );
@@ -18261,8 +18362,8 @@ function requireParse () {
 	  if (unparsedAttributes.includes(';')) {
 	    // 1. Consume the characters of the unparsed-attributes up to, but
 	    //    not including, the first %x3B (";") character.
-	    cookieAv = collectASequenceOfCodePoints(
-	      (char) => char !== ';',
+	    cookieAv = collectASequenceOfCodePointsFast(
+	      ';',
 	      unparsedAttributes,
 	      { position: 0 }
 	    );
@@ -18289,8 +18390,8 @@ function requireParse () {
 	    //    character.
 	    const position = { position: 0 };
 
-	    attributeName = collectASequenceOfCodePoints(
-	      (char) => char !== '=',
+	    attributeName = collectASequenceOfCodePointsFast(
+	      '=',
 	      cookieAv,
 	      position
 	    );
@@ -18563,7 +18664,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))
 	}
 
 	/**
@@ -20603,10 +20705,6 @@ function requireUndici () {
 	const RedirectHandler = RedirectHandler_1;
 	const createRedirectInterceptor = redirectInterceptor;
 
-	const nodeVersion = process.versions.node.split('.');
-	const nodeMajor = Number(nodeVersion[0]);
-	const nodeMinor = Number(nodeVersion[1]);
-
 	let hasCrypto;
 	try {
 	  require('crypto');
@@ -20683,7 +20781,7 @@ function requireUndici () {
 	undici.setGlobalDispatcher = setGlobalDispatcher;
 	undici.getGlobalDispatcher = getGlobalDispatcher;
 
-	if (nodeMajor > 16 || (nodeMajor === 16 && nodeMinor >= 8)) {
+	if (util.nodeMajor > 16 || (util.nodeMajor === 16 && util.nodeMinor >= 8)) {
 	  let fetchImpl = null;
 	  undici.fetch = async function fetch (resource) {
 	    if (!fetchImpl) {
@@ -20710,7 +20808,7 @@ function requireUndici () {
 	  undici.getGlobalOrigin = getGlobalOrigin;
 	}
 
-	if (nodeMajor >= 16) {
+	if (util.nodeMajor >= 16) {
 	  const { deleteCookie, getCookies, getSetCookies, setCookie } = requireCookies();
 
 	  undici.deleteCookie = deleteCookie;
@@ -20724,7 +20822,7 @@ function requireUndici () {
 	  undici.serializeAMimeType = serializeAMimeType;
 	}
 
-	if (nodeMajor >= 18 && hasCrypto) {
+	if (util.nodeMajor >= 18 && hasCrypto) {
 	  const { WebSocket } = requireWebsocket();
 
 	  undici.WebSocket = WebSocket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "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.6"
+    "@sveltejs/kit": "^1.11.0"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"