@sveltejs/adapter-vercel 5.1.0 → 5.2.0

package/files/edge.js

@@ -12,6 +12,7 @@ const initialized = server.init({
  */
 export default async (request, context) => {
 	await initialized;
+
 	return server.respond(request, {
 		getClientAddress() {
 			return /** @type {string} */ (request.headers.get('x-forwarded-for'));

package/index.js

@@ -3,7 +3,8 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { nodeFileTrace } from '@vercel/nft';
 import esbuild from 'esbuild';
-import { get_pathname } from './utils.js';
+import { get_pathname, pattern_to_src } from './utils.js';
+import { VERSION } from '@sveltejs/kit';
 
 const name = '@sveltejs/adapter-vercel';
 const DEFAULT_FUNCTION_NAME = 'fn';
@@ -57,7 +58,12 @@ const plugin = function (defaults = {}) {
 				functions: `${dir}/functions`
 			};
 
-			const static_config = static_vercel_config(builder, defaults);
+			builder.log.minor('Copying assets...');
+
+			builder.writeClient(dirs.static);
+			builder.writePrerendered(dirs.static);
+
+			const static_config = static_vercel_config(builder, defaults, dirs.static);
 
 			builder.log.minor('Generating serverless function...');
 
@@ -174,7 +180,11 @@ const plugin = function (defaults = {}) {
 						{
 							runtime: config.runtime,
 							regions: config.regions,
-							entrypoint: 'index.js'
+							entrypoint: 'index.js',
+							framework: {
+								slug: 'sveltekit',
+								version: VERSION
+							}
 						},
 						null,
 						'\t'
@@ -305,18 +315,7 @@ const plugin = function (defaults = {}) {
 				if (is_prerendered(route)) continue;
 
 				const pattern = route.pattern.toString();
-
-				let src = pattern
-					// remove leading / and trailing $/
-					.slice(1, -2)
-					// replace escaped \/ with /
-					.replace(/\\\//g, '/');
-
-				// replace the root route "^/" with "^/?"
-				if (src === '^/') {
-					src = '^/?';
-				}
-
+				const src = pattern_to_src(pattern);
 				const name = functions.get(pattern) ?? 'fn-0';
 
 				const isr = isr_config.get(route);
@@ -374,11 +373,6 @@ const plugin = function (defaults = {}) {
 			// including ISR aliases if there is only one function
 			static_config.routes.push({ src: '/.*', dest: `/${DEFAULT_FUNCTION_NAME}` });
 
-			builder.log.minor('Copying assets...');
-
-			builder.writeClient(dirs.static);
-			builder.writePrerendered(dirs.static);
-
 			builder.log.minor('Writing routes...');
 
 			write(`${dir}/config.json`, JSON.stringify(static_config, null, '\t'));
@@ -431,8 +425,9 @@ function write(file, data) {
 /**
  * @param {import('@sveltejs/kit').Builder} builder
  * @param {import('.').Config} config
+ * @param {string} dir
  */
-function static_vercel_config(builder, config) {
+function static_vercel_config(builder, config, dir) {
 	/** @type {any[]} */
 	const prerendered_redirects = [];
 
@@ -473,20 +468,60 @@ function static_vercel_config(builder, config) {
 		overrides[page.file] = { path: overrides_path };
 	}
 
-	return {
-		version: 3,
-		routes: [
-			...prerendered_redirects,
-			{
-				src: `/${builder.getAppPath()}/immutable/.+`,
-				headers: {
-					'cache-control': 'public, immutable, max-age=31536000'
+	const routes = [
+		...prerendered_redirects,
+		{
+			src: `/${builder.getAppPath()}/immutable/.+`,
+			headers: {
+				'cache-control': 'public, immutable, max-age=31536000'
+			}
+		}
+	];
+
+	// https://vercel.com/docs/deployments/skew-protection
+	if (process.env.VERCEL_SKEW_PROTECTION_ENABLED) {
+		routes.push({
+			src: '/.*',
+			has: [
+				{
+					type: 'header',
+					key: 'Sec-Fetch-Dest',
+					value: 'document'
 				}
+			],
+			headers: {
+				'Set-Cookie': `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${builder.config.kit.paths.base}/; SameSite=Strict; Secure; HttpOnly`
 			},
-			{
-				handle: 'filesystem'
-			}
-		],
+			continue: true
+		});
+
+		// this is a dreadful hack that is necessary until the Vercel Build Output API
+		// allows you to set multiple cookies for a single route. essentially, since we
+		// know that the entry file will be requested immediately, we can set the second
+		// cookie in _that_ response rather than the document response
+		const base = `${dir}/${builder.config.kit.appDir}/immutable/entry`;
+		const entry = fs.readdirSync(base).find((file) => file.startsWith('start.'));
+
+		if (!entry) {
+			throw new Error('Could not find entry point');
+		}
+
+		routes.splice(-2, 0, {
+			src: `/${builder.getAppPath()}/immutable/entry/${entry}`,
+			headers: {
+				'Set-Cookie': `__vdpl=; Path=/${builder.getAppPath()}/version.json; SameSite=Strict; Secure; HttpOnly`
+			},
+			continue: true
+		});
+	}
+
+	routes.push({
+		handle: 'filesystem'
+	});
+
+	return {
+		version: 3,
+		routes,
 		overrides,
 		images
 	};
@@ -599,7 +634,11 @@ async function create_function_bundle(builder, entry, dir, config) {
 				maxDuration: config.maxDuration,
 				handler: path.relative(base + ancestor, entry),
 				launcherType: 'Nodejs',
-				experimentalResponseStreaming: !config.isr
+				experimentalResponseStreaming: !config.isr,
+				framework: {
+					slug: 'sveltekit',
+					version: VERSION
+				}
 			},
 			null,
 			'\t'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "A SvelteKit adapter that creates a Vercel app",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@types/node": "^18.19.3",
     "typescript": "^5.3.3",
     "vitest": "^1.2.0",
-    "@sveltejs/kit": "^2.4.1"
+    "@sveltejs/kit": "^2.5.4"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^2.4.0"

package/utils.js

@@ -2,22 +2,68 @@
 export function get_pathname(route) {
 	let i = 1;
 
-	return route.segments
+	const pathname = route.segments
 		.map((segment) => {
 			if (!segment.dynamic) {
-				return segment.content;
+				return '/' + segment.content;
 			}
 
 			const parts = segment.content.split(/\[(.+?)\](?!\])/);
-			return parts
-				.map((content, j) => {
-					if (j % 2) {
-						return `$${i++}`;
-					} else {
-						return content;
-					}
-				})
-				.join('');
+			let result = '';
+
+			if (
+				parts.length === 3 &&
+				!parts[0] &&
+				!parts[2] &&
+				(parts[1].startsWith('...') || parts[1][0] === '[')
+			) {
+				// Special case: segment is a single optional or rest parameter.
+				// In that case we don't prepend a slash (also see comment in pattern_to_src).
+				result = `$${i++}`;
+			} else {
+				result =
+					'/' +
+					parts
+						.map((content, j) => {
+							if (j % 2) {
+								return `$${i++}`;
+							} else {
+								return content;
+							}
+						})
+						.join('');
+			}
+
+			return result;
 		})
-		.join('/');
+		.join('');
+
+	return pathname[0] === '/' ? pathname.slice(1) : pathname;
+}
+
+/**
+ * Adjusts the stringified route regex for Vercel's routing system
+ * @param {string} pattern stringified route regex
+ */
+export function pattern_to_src(pattern) {
+	let src = pattern
+		// remove leading / and trailing $/
+		.slice(1, -2)
+		// replace escaped \/ with /
+		.replace(/\\\//g, '/');
+
+	// replace the root route "^/" with "^/?"
+	if (src === '^/') {
+		src = '^/?';
+	}
+
+	// Move non-capturing groups that swallow slashes into their following capturing groups.
+	// This is necessary because during ISR we're using the regex to construct the __pathname
+	// query parameter: In case of a route like [required]/[...rest] we need to turn them
+	// into $1$2 and not $1/$2, because if [...rest] is empty, we don't want to have a trailing
+	// slash in the __pathname query parameter which wasn't there in the original URL, as that
+	// could result in a false trailing slash redirect in the SvelteKit runtime, leading to infinite redirects.
+	src = src.replace(/\(\?:\/\((.+?)\)\)/g, '(/$1)');
+
+	return src;
 }