@sveltejs/adapter-netlify 1.0.4 → 2.0.0

package/files/esm/serverless.js

@@ -1,5 +1,7 @@
 import './shims.js';
 import { Server } from '0SERVER';
+import 'node:stream/web';
+import 'node:crypto';
 import 'assert';
 import 'net';
 import 'http';

package/files/esm/shims.js

@@ -1,3 +1,5 @@
+import { ReadableStream as ReadableStream$1, TransformStream, WritableStream } from 'node:stream/web';
+import { webcrypto } from 'node:crypto';
 import require$$0$1 from 'assert';
 import require$$4 from 'net';
 import require$$2 from 'http';
@@ -5,7 +7,7 @@ import require$$0$2 from 'stream';
 import require$$7 from 'buffer';
 import require$$0 from 'util';
 import require$$8 from 'querystring';
-import require$$13, { ReadableStream as ReadableStream$1, TransformStream, WritableStream } from 'stream/web';
+import require$$13 from 'stream/web';
 import require$$0$3 from 'worker_threads';
 import require$$1 from 'perf_hooks';
 import require$$4$1 from 'util/types';
@@ -16,7 +18,7 @@ import require$$3 from 'async_hooks';
 import require$$1$1 from 'console';
 import require$$3$1 from 'zlib';
 import require$$6 from 'string_decoder';
-import require$$0$5, { webcrypto } from 'crypto';
+import require$$0$5 from 'crypto';
 import require$$1$2 from 'diagnostics_channel';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -648,8 +650,23 @@ function ReadableStreamFrom$1 (iterable) {
   )
 }
 
+// The chunk should be a FormData instance and contains
+// all the required methods.
 function isFormDataLike (chunk) {
-  return chunk && chunk.constructor && chunk.constructor.name === 'FormData'
+  return (chunk &&
+    chunk.constructor && chunk.constructor.name === 'FormData' &&
+    typeof chunk === 'object' &&
+      (typeof chunk.append === 'function' &&
+        typeof chunk.delete === 'function' &&
+        typeof chunk.get === 'function' &&
+        typeof chunk.getAll === 'function' &&
+        typeof chunk.has === 'function' &&
+        typeof chunk.set === 'function' &&
+        typeof chunk.entries === 'function' &&
+        typeof chunk.keys === 'function' &&
+        typeof chunk.values === 'function' &&
+        typeof chunk.forEach === 'function')
+  )
 }
 
 const kEnumerableProperty = Object.create(null);
@@ -685,6 +702,94 @@ var util$g = {
   buildURL: buildURL$2
 };
 
+let fastNow = Date.now();
+let fastNowTimeout;
+
+const fastTimers = [];
+
+function onTimeout () {
+  fastNow = Date.now();
+
+  let len = fastTimers.length;
+  let idx = 0;
+  while (idx < len) {
+    const timer = fastTimers[idx];
+
+    if (timer.expires && fastNow >= timer.expires) {
+      timer.expires = 0;
+      timer.callback(timer.opaque);
+    }
+
+    if (timer.expires === 0) {
+      timer.active = false;
+      if (idx !== len - 1) {
+        fastTimers[idx] = fastTimers.pop();
+      } else {
+        fastTimers.pop();
+      }
+      len -= 1;
+    } else {
+      idx += 1;
+    }
+  }
+
+  if (fastTimers.length > 0) {
+    refreshTimeout();
+  }
+}
+
+function refreshTimeout () {
+  if (fastNowTimeout && fastNowTimeout.refresh) {
+    fastNowTimeout.refresh();
+  } else {
+    clearTimeout(fastNowTimeout);
+    fastNowTimeout = setTimeout(onTimeout, 1e3);
+    if (fastNowTimeout.unref) {
+      fastNowTimeout.unref();
+    }
+  }
+}
+
+class Timeout {
+  constructor (callback, delay, opaque) {
+    this.callback = callback;
+    this.delay = delay;
+    this.opaque = opaque;
+    this.expires = 0;
+    this.active = false;
+
+    this.refresh();
+  }
+
+  refresh () {
+    if (!this.active) {
+      this.active = true;
+      fastTimers.push(this);
+      if (!fastNowTimeout || fastTimers.length === 1) {
+        refreshTimeout();
+        fastNow = Date.now();
+      }
+    }
+
+    this.expires = fastNow + this.delay;
+  }
+
+  clear () {
+    this.expires = 0;
+  }
+}
+
+var timers$1 = {
+  setTimeout (callback, delay, opaque) {
+    return new Timeout(callback, delay, opaque)
+  },
+  clearTimeout (timeout) {
+    if (timeout && timeout.clear) {
+      timeout.clear();
+    }
+  }
+};
+
 var utils$1;
 var hasRequiredUtils$1;
 
@@ -4461,6 +4566,12 @@ function requireDataURL () {
 
 	const encoder = new TextEncoder();
 
+	// Regex
+	const HTTP_TOKEN_CODEPOINTS = /^[!#$%&'*+-.^_|~A-z0-9]+$/;
+	const HTTP_WHITESPACE_REGEX = /(\u000A|\u000D|\u0009|\u0020)/; // eslint-disable-line
+	// https://mimesniff.spec.whatwg.org/#http-quoted-string-token-code-point
+	const HTTP_QUOTED_STRING_TOKENS = /^(\u0009|\x{0020}-\x{007E}|\x{0080}-\x{00FF})+$/; // eslint-disable-line
+
 	// https://fetch.spec.whatwg.org/#data-url-processor
 	/** @param {URL} dataURL */
 	function dataURLProcessor (dataURL) {
@@ -4481,8 +4592,8 @@ function requireDataURL () {
 	  // 5. Let mimeType be the result of collecting a
 	  // sequence of code points that are not equal
 	  // to U+002C (,), given position.
-	  let mimeType = collectASequenceOfCodePoints(
-	    (char) => char !== ',',
+	  let mimeType = collectASequenceOfCodePointsFast(
+	    ',',
 	    input,
 	    position
 	  );
@@ -4595,6 +4706,25 @@ function requireDataURL () {
 	  return result
 	}
 
+	/**
+	 * A faster collectASequenceOfCodePoints that only works when comparing a single character.
+	 * @param {string} char
+	 * @param {string} input
+	 * @param {{ position: number }} position
+	 */
+	function collectASequenceOfCodePointsFast (char, input, position) {
+	  const idx = input.indexOf(char, position.position);
+	  const start = position.position;
+
+	  if (idx === -1) {
+	    position.position = input.length;
+	    return input.slice(start)
+	  }
+
+	  position.position = idx;
+	  return input.slice(start, position.position)
+	}
+
 	// https://url.spec.whatwg.org/#string-percent-decode
 	/** @param {string} input */
 	function stringPercentDecode (input) {
@@ -4664,8 +4794,8 @@ function requireDataURL () {
 	  // 3. Let type be the result of collecting a sequence
 	  // of code points that are not U+002F (/) from
 	  // input, given position.
-	  const type = collectASequenceOfCodePoints(
-	    (char) => char !== '/',
+	  const type = collectASequenceOfCodePointsFast(
+	    '/',
 	    input,
 	    position
 	  );
@@ -4673,7 +4803,7 @@ function requireDataURL () {
 	  // 4. If type is the empty string or does not solely
 	  // contain HTTP token code points, then return failure.
 	  // https://mimesniff.spec.whatwg.org/#http-token-code-point
-	  if (type.length === 0 || !/^[!#$%&'*+-.^_|~A-z0-9]+$/.test(type)) {
+	  if (type.length === 0 || !HTTP_TOKEN_CODEPOINTS.test(type)) {
 	    return 'failure'
 	  }
 
@@ -4689,8 +4819,8 @@ function requireDataURL () {
 	  // 7. Let subtype be the result of collecting a sequence of
 	  // code points that are not U+003B (;) from input, given
 	  // position.
-	  let subtype = collectASequenceOfCodePoints(
-	    (char) => char !== ';',
+	  let subtype = collectASequenceOfCodePointsFast(
+	    ';',
 	    input,
 	    position
 	  );
@@ -4700,7 +4830,7 @@ function requireDataURL () {
 
 	  // 9. If subtype is the empty string or does not solely
 	  // contain HTTP token code points, then return failure.
-	  if (subtype.length === 0 || !/^[!#$%&'*+-.^_|~A-z0-9]+$/.test(subtype)) {
+	  if (subtype.length === 0 || !HTTP_TOKEN_CODEPOINTS.test(subtype)) {
 	    return 'failure'
 	  }
 
@@ -4714,9 +4844,7 @@ function requireDataURL () {
 	    /** @type {Map<string, string>} */
 	    parameters: new Map(),
 	    // https://mimesniff.spec.whatwg.org/#mime-type-essence
-	    get essence () {
-	      return `${this.type}/${this.subtype}`
-	    }
+	    essence: `${type}/${subtype}`
 	  };
 
 	  // 11. While position is not past the end of input:
@@ -4728,7 +4856,7 @@ function requireDataURL () {
 	    // whitespace from input given position.
 	    collectASequenceOfCodePoints(
 	      // https://fetch.spec.whatwg.org/#http-whitespace
-	      (char) => /(\u000A|\u000D|\u0009|\u0020)/.test(char), // eslint-disable-line
+	      char => HTTP_WHITESPACE_REGEX.test(char),
 	      input,
 	      position
 	    );
@@ -4776,8 +4904,8 @@ function requireDataURL () {
 
 	      // 2. Collect a sequence of code points that are not
 	      // U+003B (;) from input, given position.
-	      collectASequenceOfCodePoints(
-	        (char) => char !== ';',
+	      collectASequenceOfCodePointsFast(
+	        ';',
 	        input,
 	        position
 	      );
@@ -4787,8 +4915,8 @@ function requireDataURL () {
 	      // 1. Set parameterValue to the result of collecting
 	      // a sequence of code points that are not U+003B (;)
 	      // from input, given position.
-	      parameterValue = collectASequenceOfCodePoints(
-	        (char) => char !== ';',
+	      parameterValue = collectASequenceOfCodePointsFast(
+	        ';',
 	        input,
 	        position
 	      );
@@ -4811,9 +4939,8 @@ function requireDataURL () {
 	    // then set mimeType’s parameters[parameterName] to parameterValue.
 	    if (
 	      parameterName.length !== 0 &&
-	      /^[!#$%&'*+-.^_|~A-z0-9]+$/.test(parameterName) &&
-	      // https://mimesniff.spec.whatwg.org/#http-quoted-string-token-code-point
-	      !/^(\u0009|\x{0020}-\x{007E}|\x{0080}-\x{00FF})+$/.test(parameterValue) &&  // eslint-disable-line
+	      HTTP_TOKEN_CODEPOINTS.test(parameterName) &&
+	      !HTTP_QUOTED_STRING_TOKENS.test(parameterValue) &&
 	      !mimeType.parameters.has(parameterName)
 	    ) {
 	      mimeType.parameters.set(parameterName, parameterValue);
@@ -5615,7 +5742,7 @@ function requireFormdata () {
 	        lastModified: value.lastModified
 	      };
 
-	      value = value instanceof File
+	      value = (NativeFile && value instanceof NativeFile) || value instanceof UndiciFile
 	        ? new File([value], filename, options)
 	        : new FileLike(value, filename, options);
 	    }
@@ -6376,7 +6503,7 @@ let Request$1 = class Request {
 
     this.blocking = blocking == null ? false : blocking;
 
-    this.reset = reset == null ? false : reset;
+    this.reset = reset == null ? null : reset;
 
     this.host = null;
 
@@ -6511,11 +6638,16 @@ let Request$1 = class Request {
 };
 
 function processHeaderValue (key, val) {
-  if (val && (typeof val === 'object' && !Array.isArray(val))) {
+  if (val && typeof val === 'object') {
     throw new InvalidArgumentError$i(`invalid ${key} header`)
-  } else if (headerCharRegex.exec(val) !== null) {
+  }
+
+  val = val != null ? `${val}` : '';
+
+  if (headerCharRegex.exec(val) !== null) {
     throw new InvalidArgumentError$i(`invalid ${key} header`)
   }
+
   return `${key}: ${val}\r\n`
 }
 
@@ -6545,11 +6677,10 @@ function processHeader (request, key, val) {
   } else if (
     request.contentType === null &&
     key.length === 12 &&
-    key.toLowerCase() === 'content-type' &&
-    headerCharRegex.exec(val) === null
+    key.toLowerCase() === 'content-type'
   ) {
     request.contentType = val;
-    request.headers += `${key}: ${val}\r\n`;
+    request.headers += processHeaderValue(key, val);
   } else if (
     key.length === 17 &&
     key.toLowerCase() === 'transfer-encoding'
@@ -6559,7 +6690,7 @@ function processHeader (request, key, val) {
     key.length === 10 &&
     key.toLowerCase() === 'connection'
   ) {
-    const value = val.toLowerCase();
+    const value = typeof val === 'string' ? val.toLowerCase() : null;
     if (value !== 'close' && value !== 'keep-alive') {
       throw new InvalidArgumentError$i('invalid connection header')
     } else if (value === 'close') {
@@ -6923,6 +7054,12 @@ function buildConnector$3 ({ maxCachedSessions, socketPath, timeout, ...opts })
       });
     }
 
+    // Set TCP keep alive options on the socket here instead of in connect() for the case of assigning the socket
+    if (options.keepAlive == null || options.keepAlive) {
+      const keepAliveInitialDelay = options.keepAliveInitialDelay === undefined ? 60e3 : options.keepAliveInitialDelay;
+      socket.setKeepAlive(true, keepAliveInitialDelay);
+    }
+
     const cancelTimeout = setupTimeout(() => onConnectTimeout(socket), timeout);
 
     socket
@@ -7530,6 +7667,7 @@ function requireLlhttp_simd_wasm () {
 const assert$3 = require$$0$1;
 const net = require$$4;
 const util$b = util$g;
+const timers = timers$1;
 const Request = request$2;
 const DispatcherBase$3 = dispatcherBase;
 const {
@@ -7590,6 +7728,7 @@ const {
   kLocalAddress,
   kMaxResponseSize
 } = symbols$3;
+const FastBuffer = Buffer[Symbol.species];
 
 const kClosedResolve$1 = Symbol('kClosedResolve');
 
@@ -7885,9 +8024,8 @@ async function lazyllhttp () {
       },
       wasm_on_status: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onStatus(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onStatus(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_message_begin: (p) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7895,15 +8033,13 @@ async function lazyllhttp () {
       },
       wasm_on_header_field: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onHeaderField(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onHeaderField(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_header_value: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onHeaderValue(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onHeaderValue(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_headers_complete: (p, statusCode, upgrade, shouldKeepAlive) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7911,9 +8047,8 @@ async function lazyllhttp () {
       },
       wasm_on_body: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onBody(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onBody(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_message_complete: (p) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7926,9 +8061,8 @@ async function lazyllhttp () {
 }
 
 let llhttpInstance = null;
-let llhttpPromise = lazyllhttp()
-  .catch(() => {
-  });
+let llhttpPromise = lazyllhttp();
+llhttpPromise.catch();
 
 let currentParser = null;
 let currentBufferRef = null;
@@ -7964,15 +8098,16 @@ class Parser {
 
     this.keepAlive = '';
     this.contentLength = '';
+    this.connection = '';
     this.maxResponseSize = client[kMaxResponseSize];
   }
 
   setTimeout (value, type) {
     this.timeoutType = type;
     if (value !== this.timeoutValue) {
-      clearTimeout(this.timeout);
+      timers.clearTimeout(this.timeout);
       if (value) {
-        this.timeout = setTimeout(onParserTimeout, value, this);
+        this.timeout = timers.setTimeout(onParserTimeout, value, this);
         // istanbul ignore else: only for jest
         if (this.timeout.unref) {
           this.timeout.unref();
@@ -8088,7 +8223,7 @@ class Parser {
     this.llhttp.llhttp_free(this.ptr);
     this.ptr = null;
 
-    clearTimeout(this.timeout);
+    timers.clearTimeout(this.timeout);
     this.timeout = null;
     this.timeoutValue = null;
     this.timeoutType = null;
@@ -8139,6 +8274,8 @@ class Parser {
     const key = this.headers[len - 2];
     if (key.length === 10 && key.toString().toLowerCase() === 'keep-alive') {
       this.keepAlive += buf.toString();
+    } else if (key.length === 10 && key.toString().toLowerCase() === 'connection') {
+      this.connection += buf.toString();
     } else if (key.length === 14 && key.toString().toLowerCase() === 'content-length') {
       this.contentLength += buf.toString();
     }
@@ -8232,7 +8369,11 @@ class Parser {
     assert$3.strictEqual(this.timeoutType, TIMEOUT_HEADERS);
 
     this.statusCode = statusCode;
-    this.shouldKeepAlive = shouldKeepAlive;
+    this.shouldKeepAlive = (
+      shouldKeepAlive ||
+      // Override llhttp value which does not allow keepAlive for HEAD.
+      (request.method === 'HEAD' && !socket[kReset] && this.connection.toLowerCase() === 'keep-alive')
+    );
 
     if (this.statusCode >= 200) {
       const bodyTimeout = request.bodyTimeout != null
@@ -8262,7 +8403,7 @@ class Parser {
     this.headers = [];
     this.headersSize = 0;
 
-    if (shouldKeepAlive && client[kPipelining]) {
+    if (this.shouldKeepAlive && client[kPipelining]) {
       const keepAliveTimeout = this.keepAlive ? util$b.parseKeepAliveTimeout(this.keepAlive) : null;
 
       if (keepAliveTimeout != null) {
@@ -8292,7 +8433,6 @@ class Parser {
     }
 
     if (request.method === 'HEAD') {
-      assert$3(socket[kReset]);
       return 1
     }
 
@@ -8366,6 +8506,7 @@ class Parser {
     this.bytesRead = 0;
     this.contentLength = '';
     this.keepAlive = '';
+    this.connection = '';
 
     assert$3(this.headers.length % 2 === 0);
     this.headers = [];
@@ -8590,8 +8731,6 @@ async function connect$1 (client) {
 
     assert$3(socket);
 
-    client[kSocket] = socket;
-
     socket[kNoRef] = false;
     socket[kWriting] = false;
     socket[kReset] = false;
@@ -8607,6 +8746,8 @@ async function connect$1 (client) {
       .on('end', onSocketEnd)
       .on('close', onSocketClose);
 
+    client[kSocket] = socket;
+
     if (channels.connected.hasSubscribers) {
       channels.connected.publish({
         connectParams: {
@@ -8692,7 +8833,7 @@ function _resume (client, sync) {
 
     const socket = client[kSocket];
 
-    if (socket) {
+    if (socket && !socket.destroyed) {
       if (client[kSize$4] === 0) {
         if (!socket[kNoRef] && socket.unref) {
           socket.unref();
@@ -8759,7 +8900,7 @@ function _resume (client, sync) {
 
     if (!socket) {
       connect$1(client);
-      continue
+      return
     }
 
     if (socket.destroyed || socket[kWriting] || socket[kReset] || socket[kBlocking]) {
@@ -8899,8 +9040,8 @@ function write (client, request) {
     socket[kReset] = true;
   }
 
-  if (reset) {
-    socket[kReset] = true;
+  if (reset != null) {
+    socket[kReset] = reset;
   }
 
   if (client[kMaxRequests] && socket[kCounter]++ >= client[kMaxRequests]) {
@@ -12264,7 +12405,7 @@ class ProxyAgent extends DispatcherBase {
 
     this[kRequestTls] = opts.requestTls;
     this[kProxyTls] = opts.proxyTls;
-    this[kProxyHeaders] = {};
+    this[kProxyHeaders] = opts.headers || {};
 
     if (opts.auth && opts.token) {
       throw new InvalidArgumentError$1('opts.auth cannot be used in combination with opts.token')
@@ -12561,7 +12702,11 @@ function requireHeaders () {
 
 	    // 2. Append (name, value) to list.
 	    if (exists) {
-	      this[kHeadersMap].set(lowercaseName, { name: exists.name, value: `${exists.value}, ${value}` });
+	      const delimiter = lowercaseName === 'cookie' ? '; ' : ', ';
+	      this[kHeadersMap].set(lowercaseName, {
+	        name: exists.name,
+	        value: `${exists.value}${delimiter}${value}`
+	      });
 	    } else {
 	      this[kHeadersMap].set(lowercaseName, { name, value });
 	    }
@@ -14554,7 +14699,7 @@ function requireFetch () {
 	const { isErrored, isReadable } = util$g;
 	const { dataURLProcessor, serializeAMimeType } = requireDataURL();
 	const { TransformStream } = require$$13;
-	const { getGlobalDispatcher } = requireUndici();
+	const { getGlobalDispatcher } = global$2;
 	const { webidl } = requireWebidl();
 	const { STATUS_CODES } = require$$2;
 
@@ -16375,8 +16520,6 @@ function requireFetch () {
 	        body: fetchParams.controller.dispatcher.isMockActive ? request.body && request.body.source : body,
 	        headers: request.headersList[kHeadersCaseInsensitive],
 	        maxRedirections: 0,
-	        bodyTimeout: 300_000,
-	        headersTimeout: 300_000,
 	        upgrade: request.mode === 'websocket' ? 'websocket' : undefined
 	      },
 	      {
@@ -19554,7 +19697,6 @@ function requireConnection () {
 	if (hasRequiredConnection) return connection;
 	hasRequiredConnection = 1;
 
-	// TODO: crypto isn't available in all environments
 	const { randomBytes, createHash } = require$$0$5;
 	const diagnosticsChannel = require$$1$2;
 	const { uid, states } = requireConstants();
@@ -20192,23 +20334,14 @@ function requireWebsocket () {
 	      // not throw an exception must increase the bufferedAmount attribute
 	      // by the length of data’s buffer in bytes.
 
-	      const ab = new ArrayBuffer(data.byteLength);
-
-	      if (Buffer.isBuffer(data)) {
-	        // new Buffer signature is deprecated
-	        Buffer.from(ab).set(data);
-	      } else {
-	        new data.constructor(ab).set(data);
-	      }
-
-	      const value = Buffer.from(ab);
+	      const ab = Buffer.from(data, data.byteOffset, data.byteLength);
 
-	      const frame = new WebsocketFrameSend(value);
+	      const frame = new WebsocketFrameSend(ab);
 	      const buffer = frame.createFrame(opcodes.BINARY);
 
-	      this.#bufferedAmount += value.byteLength;
+	      this.#bufferedAmount += ab.byteLength;
 	      socket.write(buffer, () => {
-	        this.#bufferedAmount -= value.byteLength;
+	        this.#bufferedAmount -= ab.byteLength;
 	      });
 	    } else if (isBlobLike(data)) {
 	      // If the WebSocket connection is established, and the WebSocket
@@ -20473,6 +20606,14 @@ function requireUndici () {
 	const nodeMajor = Number(nodeVersion[0]);
 	const nodeMinor = Number(nodeVersion[1]);
 
+	let hasCrypto;
+	try {
+	  require('crypto');
+	  hasCrypto = true;
+	} catch {
+	  hasCrypto = false;
+	}
+
 	Object.assign(Dispatcher.prototype, api$1);
 
 	undici.Dispatcher = Dispatcher;
@@ -20575,9 +20716,14 @@ function requireUndici () {
 	  undici.getCookies = getCookies;
 	  undici.getSetCookies = getSetCookies;
 	  undici.setCookie = setCookie;
+
+	  const { parseMIMEType, serializeAMimeType } = requireDataURL();
+
+	  undici.parseMIMEType = parseMIMEType;
+	  undici.serializeAMimeType = serializeAMimeType;
 	}
 
-	if (nodeMajor >= 18) {
+	if (nodeMajor >= 18 && hasCrypto) {
 	  const { WebSocket } = requireWebsocket();
 
 	  undici.WebSocket = WebSocket;

package/index.js

@@ -162,10 +162,17 @@ async function generate_lambda_functions({ builder, publish, split }) {
 	// Configuring the function to use ESM as the output format.
 	const fn_config = JSON.stringify({ config: { nodeModuleFormat: 'esm' }, version: 1 });
 
+	builder.log.minor('Generating serverless functions...');
+
 	if (split) {
-		builder.log.minor('Generating serverless functions...');
+		const seen = new Set();
+
+		for (let i = 0; i < builder.routes.length; i++) {
+			const route = builder.routes[i];
+			if (route.prerender === true) continue;
+
+			const routes = [route];
 
-		await builder.createEntries((route) => {
 			const parts = [];
 			// Netlify's syntax uses '*' and ':param' as "splats" and "placeholders"
 			// https://docs.netlify.com/routing/redirects/redirect-options/#splats
@@ -183,27 +190,33 @@ async function generate_lambda_functions({ builder, publish, split }) {
 			const pattern = `/${parts.join('/')}`;
 			const name = parts.join('-').replace(/[:.]/g, '_').replace('*', '__rest') || 'index';
 
-			return {
-				id: pattern,
-				filter: (other) => matches(route.segments, other.segments),
-				complete: (entry) => {
-					const manifest = entry.generateManifest({
-						relativePath: '../server'
-					});
+			// skip routes with identical patterns, they were already folded into another function
+			if (seen.has(pattern)) continue;
+			seen.add(pattern);
 
-					const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
+			// figure out which lower priority routes should be considered fallbacks
+			for (let j = i + 1; j < builder.routes.length; j += 1) {
+				if (routes[j].prerender === true) continue;
 
-					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`);
+				if (matches(route.segments, routes[j].segments)) {
+					routes.push(builder.routes[j]);
 				}
-			};
-		});
-	} else {
-		builder.log.minor('Generating serverless functions...');
+			}
+
+			const manifest = builder.generateManifest({
+				relativePath: '../server',
+				routes
+			});
+
+			const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
 
+			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`);
+		}
+	} else {
 		const manifest = builder.generateManifest({
 			relativePath: '../server'
 		});
@@ -263,7 +276,7 @@ function get_publish_directory(netlify_config, builder) {
 	}
 
 	builder.log.warn(
-		'No netlify.toml found. Using default publish directory. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration for more details '
+		'No netlify.toml found. Using default publish directory. Consult https://kit.svelte.dev/docs/adapter-netlify#usage for more details'
 	);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -38,10 +38,10 @@
     "rollup": "^3.7.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
-    "@sveltejs/kit": "^1.1.3"
+    "@sveltejs/kit": "^1.5.0"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^1.0.0"
+    "@sveltejs/kit": "^1.5.0"
   },
   "scripts": {
     "dev": "rimraf files && rollup -cw",