@sveltejs/adapter-netlify 5.2.4 → 6.0.0

package/ambient.d.ts

@@ -0,0 +1,9 @@
+declare global {
+	namespace App {
+		export interface Platform {
+			context: import('@netlify/functions').Context;
+		}
+	}
+}
+
+export {};

package/files/serverless.js

@@ -6,273 +6,6 @@ import process from 'node:process';
 import 'node:buffer';
 import 'node:crypto';
 
-var setCookie = {exports: {}};
-
-var hasRequiredSetCookie;
-
-function requireSetCookie () {
-	if (hasRequiredSetCookie) return setCookie.exports;
-	hasRequiredSetCookie = 1;
-
-	var defaultParseOptions = {
-	  decodeValues: true,
-	  map: false,
-	  silent: false,
-	};
-
-	function isNonEmptyString(str) {
-	  return typeof str === "string" && !!str.trim();
-	}
-
-	function parseString(setCookieValue, options) {
-	  var parts = setCookieValue.split(";").filter(isNonEmptyString);
-
-	  var nameValuePairStr = parts.shift();
-	  var parsed = parseNameValuePair(nameValuePairStr);
-	  var name = parsed.name;
-	  var value = parsed.value;
-
-	  options = options
-	    ? Object.assign({}, defaultParseOptions, options)
-	    : defaultParseOptions;
-
-	  try {
-	    value = options.decodeValues ? decodeURIComponent(value) : value; // decode cookie value
-	  } catch (e) {
-	    console.error(
-	      "set-cookie-parser encountered an error while decoding a cookie with value '" +
-	        value +
-	        "'. Set options.decodeValues to false to disable this feature.",
-	      e
-	    );
-	  }
-
-	  var cookie = {
-	    name: name,
-	    value: value,
-	  };
-
-	  parts.forEach(function (part) {
-	    var sides = part.split("=");
-	    var key = sides.shift().trimLeft().toLowerCase();
-	    var value = sides.join("=");
-	    if (key === "expires") {
-	      cookie.expires = new Date(value);
-	    } else if (key === "max-age") {
-	      cookie.maxAge = parseInt(value, 10);
-	    } else if (key === "secure") {
-	      cookie.secure = true;
-	    } else if (key === "httponly") {
-	      cookie.httpOnly = true;
-	    } else if (key === "samesite") {
-	      cookie.sameSite = value;
-	    } else {
-	      cookie[key] = value;
-	    }
-	  });
-
-	  return cookie;
-	}
-
-	function parseNameValuePair(nameValuePairStr) {
-	  // Parses name-value-pair according to rfc6265bis draft
-
-	  var name = "";
-	  var value = "";
-	  var nameValueArr = nameValuePairStr.split("=");
-	  if (nameValueArr.length > 1) {
-	    name = nameValueArr.shift();
-	    value = nameValueArr.join("="); // everything after the first =, joined by a "=" if there was more than one part
-	  } else {
-	    value = nameValuePairStr;
-	  }
-
-	  return { name: name, value: value };
-	}
-
-	function parse(input, options) {
-	  options = options
-	    ? Object.assign({}, defaultParseOptions, options)
-	    : defaultParseOptions;
-
-	  if (!input) {
-	    if (!options.map) {
-	      return [];
-	    } else {
-	      return {};
-	    }
-	  }
-
-	  if (input.headers) {
-	    if (typeof input.headers.getSetCookie === "function") {
-	      // for fetch responses - they combine headers of the same type in the headers array,
-	      // but getSetCookie returns an uncombined array
-	      input = input.headers.getSetCookie();
-	    } else if (input.headers["set-cookie"]) {
-	      // fast-path for node.js (which automatically normalizes header names to lower-case
-	      input = input.headers["set-cookie"];
-	    } else {
-	      // slow-path for other environments - see #25
-	      var sch =
-	        input.headers[
-	          Object.keys(input.headers).find(function (key) {
-	            return key.toLowerCase() === "set-cookie";
-	          })
-	        ];
-	      // warn if called on a request-like object with a cookie header rather than a set-cookie header - see #34, 36
-	      if (!sch && input.headers.cookie && !options.silent) {
-	        console.warn(
-	          "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
-	        );
-	      }
-	      input = sch;
-	    }
-	  }
-	  if (!Array.isArray(input)) {
-	    input = [input];
-	  }
-
-	  options = options
-	    ? Object.assign({}, defaultParseOptions, options)
-	    : defaultParseOptions;
-
-	  if (!options.map) {
-	    return input.filter(isNonEmptyString).map(function (str) {
-	      return parseString(str, options);
-	    });
-	  } else {
-	    var cookies = {};
-	    return input.filter(isNonEmptyString).reduce(function (cookies, str) {
-	      var cookie = parseString(str, options);
-	      cookies[cookie.name] = cookie;
-	      return cookies;
-	    }, cookies);
-	  }
-	}
-
-	/*
-	  Set-Cookie header field-values are sometimes comma joined in one string. This splits them without choking on commas
-	  that are within a single set-cookie field-value, such as in the Expires portion.
-
-	  This is uncommon, but explicitly allowed - see https://tools.ietf.org/html/rfc2616#section-4.2
-	  Node.js does this for every header *except* set-cookie - see https://github.com/nodejs/node/blob/d5e363b77ebaf1caf67cd7528224b651c86815c1/lib/_http_incoming.js#L128
-	  React Native's fetch does this for *every* header, including set-cookie.
-
-	  Based on: https://github.com/google/j2objc/commit/16820fdbc8f76ca0c33472810ce0cb03d20efe25
-	  Credits to: https://github.com/tomball for original and https://github.com/chrusart for JavaScript implementation
-	*/
-	function splitCookiesString(cookiesString) {
-	  if (Array.isArray(cookiesString)) {
-	    return cookiesString;
-	  }
-	  if (typeof cookiesString !== "string") {
-	    return [];
-	  }
-
-	  var cookiesStrings = [];
-	  var pos = 0;
-	  var start;
-	  var ch;
-	  var lastComma;
-	  var nextStart;
-	  var cookiesSeparatorFound;
-
-	  function skipWhitespace() {
-	    while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
-	      pos += 1;
-	    }
-	    return pos < cookiesString.length;
-	  }
-
-	  function notSpecialChar() {
-	    ch = cookiesString.charAt(pos);
-
-	    return ch !== "=" && ch !== ";" && ch !== ",";
-	  }
-
-	  while (pos < cookiesString.length) {
-	    start = pos;
-	    cookiesSeparatorFound = false;
-
-	    while (skipWhitespace()) {
-	      ch = cookiesString.charAt(pos);
-	      if (ch === ",") {
-	        // ',' is a cookie separator if we have later first '=', not ';' or ','
-	        lastComma = pos;
-	        pos += 1;
-
-	        skipWhitespace();
-	        nextStart = pos;
-
-	        while (pos < cookiesString.length && notSpecialChar()) {
-	          pos += 1;
-	        }
-
-	        // currently special character
-	        if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
-	          // we found cookies separator
-	          cookiesSeparatorFound = true;
-	          // pos is inside the next cookie, so back up and return it.
-	          pos = nextStart;
-	          cookiesStrings.push(cookiesString.substring(start, lastComma));
-	          start = pos;
-	        } else {
-	          // in param ',' or param separator ';',
-	          // we continue from that comma
-	          pos = lastComma + 1;
-	        }
-	      } else {
-	        pos += 1;
-	      }
-	    }
-
-	    if (!cookiesSeparatorFound || pos >= cookiesString.length) {
-	      cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
-	    }
-	  }
-
-	  return cookiesStrings;
-	}
-
-	setCookie.exports = parse;
-	setCookie.exports.parse = parse;
-	setCookie.exports.parseString = parseString;
-	setCookie.exports.splitCookiesString = splitCookiesString;
-	return setCookie.exports;
-}
-
-var setCookieExports = /*@__PURE__*/ requireSetCookie();
-
-/**
- * Splits headers into two categories: single value and multi value
- * @param {Headers} headers
- * @returns {{
- *   headers: Record<string, string>,
- *   multiValueHeaders: Record<string, string[]>
- * }}
- */
-function split_headers(headers) {
-	/** @type {Record<string, string>} */
-	const h = {};
-
-	/** @type {Record<string, string[]>} */
-	const m = {};
-
-	headers.forEach((value, key) => {
-		if (key === 'set-cookie') {
-			if (!m[key]) m[key] = [];
-			m[key].push(...setCookieExports.splitCookiesString(value));
-		} else {
-			h[key] = value;
-		}
-	});
-
-	return {
-		headers: h,
-		multiValueHeaders: m
-	};
-}
-
 /**
  * Converts a file on disk to a readable stream
  * @param {string} file
@@ -285,7 +18,7 @@ function createReadableStream(file) {
 
 /**
  * @param {import('@sveltejs/kit').SSRManifest} manifest
- * @returns {import('@netlify/functions').Handler}
+ * @returns {(request: Request, context: import('@netlify/functions').Context) => Promise<Response>}
  */
 function init(manifest) {
 	const server = new Server(manifest);
@@ -296,79 +29,19 @@ function init(manifest) {
 		read: (file) => createReadableStream(`.netlify/server/${file}`)
 	});
 
-	return async (event, context) => {
+	return async (request, context) => {
 		if (init_promise !== null) {
 			await init_promise;
 			init_promise = null;
 		}
 
-		const response = await server.respond(to_request(event), {
+		return server.respond(request, {
 			platform: { context },
 			getClientAddress() {
-				return /** @type {string} */ (event.headers['x-nf-client-connection-ip']);
+				return context.ip;
 			}
 		});
-
-		const partial_response = {
-			statusCode: response.status,
-			...split_headers(response.headers)
-		};
-
-		if (!is_text(response.headers.get('content-type'))) {
-			// Function responses should be strings (or undefined), and responses with binary
-			// content should be base64 encoded and set isBase64Encoded to true.
-			// https://github.com/netlify/functions/blob/main/src/function/response.ts
-			return {
-				...partial_response,
-				isBase64Encoded: true,
-				body: Buffer.from(await response.arrayBuffer()).toString('base64')
-			};
-		}
-
-		return {
-			...partial_response,
-			body: await response.text()
-		};
-	};
-}
-
-/**
- * @param {import('@netlify/functions').HandlerEvent} event
- * @returns {Request}
- */
-function to_request({ httpMethod, headers, rawUrl, body, isBase64Encoded }) {
-	/** @type {RequestInit} */
-	const init = {
-		method: httpMethod,
-		headers: new Headers(/** @type {Record<string, string>} */ (headers))
 	};
-
-	if (httpMethod !== 'GET' && httpMethod !== 'HEAD') {
-		const encoding = isBase64Encoded ? 'base64' : 'utf-8';
-		init.body = typeof body === 'string' ? Buffer.from(body, encoding) : body;
-	}
-
-	return new Request(rawUrl, init);
-}
-
-const text_types = new Set([
-	'application/xml',
-	'application/json',
-	'application/x-www-form-urlencoded',
-	'multipart/form-data'
-]);
-
-/**
- * Decides how the body should be parsed based on its mime type
- *
- * @param {string | undefined | null} content_type The `content-type` header of a request/response.
- * @returns {boolean}
- */
-function is_text(content_type) {
-	if (!content_type) return true; // defaults to json
-	const type = content_type.split(';')[0].toLowerCase(); // get the mime type
-
-	return type.startsWith('text/') || type.endsWith('+xml') || text_types.has(type);
 }
 
 export { init };

package/index.d.ts

@@ -1,3 +1,4 @@
 import { Adapter } from '@sveltejs/kit';
+import './ambient.d.ts';
 
 export default function plugin(opts?: { split?: boolean; edge?: boolean }): Adapter;

package/index.js

@@ -1,14 +1,11 @@
 /** @import { BuildOptions } from 'esbuild' */
 import { appendFileSync, existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve, posix } from 'node:path';
+import { join, resolve, posix } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { builtinModules } from 'node:module';
 import process from 'node:process';
 import esbuild from 'esbuild';
 import toml from '@iarna/toml';
-import { VERSION } from '@sveltejs/kit';
-
-const [kit_major, kit_minor] = VERSION.split('.');
 
 /**
  * @typedef {{
@@ -17,17 +14,6 @@ const [kit_major, kit_minor] = VERSION.split('.');
  * } & toml.JsonMap} NetlifyConfig
  */
 
-/**
- * @template T
- * @template {keyof T} K
- * @typedef {Partial<Omit<T, K>> & Required<Pick<T, K>>} PartialExcept
- */
-
-/**
- * We use a custom `Builder` type here to support the minimum version of SvelteKit.
- * @typedef {PartialExcept<import('@sveltejs/kit').Builder, 'log' | 'rimraf' | 'mkdirp' | 'config' | 'prerendered' | 'routes' | 'createEntries' | 'findServerAssets' | 'generateFallback' | 'generateEnvModule' | 'generateManifest' | 'getBuildDirectory' | 'getClientDirectory' | 'getServerDirectory' | 'getAppPath' | 'writeClient' | 'writePrerendered' | 'writePrerendered' | 'writeServer' | 'copy' | 'compress'>} Builder2_4_0
- */
-
 const name = '@sveltejs/adapter-netlify';
 const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
@@ -41,7 +27,7 @@ const FUNCTION_PREFIX = 'sveltekit-';
 export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 	return {
 		name,
-		/** @param {Builder2_4_0} builder */
+		/** @param {import('@sveltejs/kit').Builder} builder */
 		async adapt(builder) {
 			if (!builder.routes) {
 				throw new Error(
@@ -109,23 +95,14 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 		},
 
 		supports: {
-			read: ({ route }) => {
-				// TODO bump peer dep in next adapter major to simplify this
-				if (edge && kit_major === '2' && kit_minor < '25') {
-					throw new Error(
-						`${name}: Cannot use \`read\` from \`$app/server\` in route \`${route.id}\` when using edge functions and SvelteKit < 2.25.0`
-					);
-				}
-
-				return true;
-			},
+			read: () => true,
 			instrumentation: () => true
 		}
 	};
 }
 /**
  * @param { object } params
- * @param {Builder2_4_0} params.builder
+ * @param {import('@sveltejs/kit').Builder} params.builder
  */
 async function generate_edge_functions({ builder }) {
 	const tmp = builder.getBuildDirectory('netlify-tmp');
@@ -234,25 +211,20 @@ async function generate_edge_functions({ builder }) {
 }
 /**
  * @param { object } params
- * @param {Builder2_4_0} params.builder
+ * @param {import('@sveltejs/kit').Builder} params.builder
  * @param { string } params.publish
  * @param { boolean } params.split
  */
 function generate_lambda_functions({ builder, publish, split }) {
 	builder.mkdirp('.netlify/functions-internal/.svelte-kit');
 
-	/** @type {string[]} */
-	const redirects = [];
 	builder.writeServer('.netlify/server');
 
 	const replace = {
 		'0SERVER': './server/index.js' // digit prefix prevents CJS build from using this as a variable name, which would also get replaced
 	};
 
-	builder.copy(files, '.netlify', { replace });
-
-	// Configuring the function to use ESM as the output format.
-	const fn_config = JSON.stringify({ config: { nodeModuleFormat: 'esm' }, version: 1 });
+	builder.copy(files, '.netlify', { replace, filter: (name) => !name.endsWith('edge.js') });
 
 	builder.log.minor('Generating serverless functions...');
 
@@ -302,33 +274,27 @@ function generate_lambda_functions({ builder, publish, split }) {
 				routes
 			});
 
-			const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
+			const fn = `import { init } from '../serverless.js';\n\nexport default init(${manifest});\n\nexport const config = {\n\tpath: "${pattern}",\n\texcludedPath: "/.netlify/*",\n\tpreferStatic: true\n};\n`;
 
 			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
-			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
 			if (builder.hasServerInstrumentationFile?.()) {
 				builder.instrument?.({
 					entrypoint: `.netlify/functions-internal/${name}.mjs`,
 					instrumentation: '.netlify/server/instrumentation.server.js',
 					start: `.netlify/functions-start/${name}.start.mjs`,
 					module: {
-						exports: ['handler']
+						exports: ['default']
 					}
 				});
 			}
-
-			const redirect = `/.netlify/functions/${name} 200`;
-			redirects.push(`${pattern} ${redirect}`);
-			redirects.push(`${pattern === '/' ? '' : pattern}/__data.json ${redirect}`);
 		}
 	} else {
 		const manifest = builder.generateManifest({
 			relativePath: '../server'
 		});
 
-		const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
+		const fn = `import { init } from '../serverless.js';\n\nexport default init(${manifest});\n\nexport const config = {\n\tpath: "/*",\n\texcludedPath: "/.netlify/*",\n\tpreferStatic: true\n};\n`;
 
-		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.json`, fn_config);
 		writeFileSync(`.netlify/functions-internal/${FUNCTION_PREFIX}render.mjs`, fn);
 		if (builder.hasServerInstrumentationFile?.()) {
 			builder.instrument?.({
@@ -336,24 +302,18 @@ function generate_lambda_functions({ builder, publish, split }) {
 				instrumentation: '.netlify/server/instrumentation.server.js',
 				start: `.netlify/functions-start/${FUNCTION_PREFIX}render.start.mjs`,
 				module: {
-					exports: ['handler']
+					exports: ['default']
 				}
 			});
 		}
-
-		redirects.push(`* /.netlify/functions/${FUNCTION_PREFIX}render 200`);
 	}
 
-	// this should happen at the end, after builder.writeClient(...),
-	// so that generated redirects are appended to custom redirects
-	// rather than replaced by them
-	builder.log.minor('Writing redirects...');
-	const redirects_file = join(publish, '_redirects');
+	// Copy user's custom _redirects file if it exists
 	if (existsSync('_redirects')) {
+		builder.log.minor('Copying user redirects...');
+		const redirects_file = join(publish, '_redirects');
 		builder.copy('_redirects', redirects_file);
 	}
-	builder.mkdirp(dirname(redirects_file));
-	appendFileSync(redirects_file, `\n\n${redirects.join('\n')}`);
 }
 
 function get_netlify_config() {
@@ -369,7 +329,7 @@ function get_netlify_config() {
 
 /**
  * @param {NetlifyConfig | null} netlify_config
- * @param {Builder2_4_0} builder
+ * @param {import('@sveltejs/kit').Builder} builder
  **/
 function get_publish_directory(netlify_config, builder) {
 	if (netlify_config) {
@@ -378,11 +338,6 @@ function get_publish_directory(netlify_config, builder) {
 			return;
 		}
 
-		if (netlify_config.redirects) {
-			throw new Error(
-				"Redirects are not supported in netlify.toml. Use _redirects instead. For more details consult the readme's troubleshooting section."
-			);
-		}
 		if (resolve(netlify_config.build.publish) === process.cwd()) {
 			throw new Error(
 				'The publish directory cannot be set to the site root. Please change it to another value such as "build" in netlify.toml.'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "5.2.4",
+  "version": "6.0.0",
   "description": "A SvelteKit adapter that creates a Netlify app",
   "keywords": [
     "adapter",
@@ -29,29 +29,31 @@
   "files": [
     "files",
     "index.js",
-    "index.d.ts"
+    "index.d.ts",
+    "ambient.d.ts"
   ],
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "esbuild": "^0.25.4",
-    "set-cookie-parser": "^2.6.0"
+    "esbuild": "^0.25.4"
   },
   "devDependencies": {
-    "@netlify/edge-functions": "^2.15.1",
-    "@netlify/functions": "^4.0.0",
-    "@rollup/plugin-commonjs": "^28.0.1",
+    "@netlify/dev": "^4.8.8",
+    "@netlify/edge-functions": "^3.0.0",
+    "@netlify/functions": "^5.0.0",
+    "@netlify/node-cookies": "^0.1.0",
+    "@netlify/types": "^2.1.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@sveltejs/vite-plugin-svelte": "^6.0.0-next.3",
     "@types/node": "^18.19.119",
-    "@types/set-cookie-parser": "^2.4.7",
     "rollup": "^4.14.2",
     "typescript": "^5.3.3",
-    "vitest": "^3.2.4",
-    "@sveltejs/kit": "^2.43.7"
+    "vitest": "^4.0.0",
+    "@sveltejs/kit": "^2.51.0"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^2.4.0"
+    "@sveltejs/kit": "^2.31.0"
   },
   "scripts": {
     "dev": "rollup -cw",
@@ -59,7 +61,7 @@
     "check": "tsc",
     "lint": "prettier --check .",
     "format": "pnpm lint --write",
-    "test": "pnpm test:unit && pnpm test:integration",
+    "test": "pnpm test:integration",
     "test:unit": "vitest run",
     "test:integration": "pnpm build && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test"
   }