@sveltejs/adapter-vercel 5.0.0 → 5.1.1

package/index.js

@@ -3,7 +3,7 @@ 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';
 
 const name = '@sveltejs/adapter-vercel';
 const DEFAULT_FUNCTION_NAME = 'fn';
@@ -18,6 +18,9 @@ const get_default_runtime = () => {
 	);
 };
 
+// https://vercel.com/docs/functions/edge-functions/edge-runtime#compatible-node.js-modules
+const compatible_node_modules = ['async_hooks', 'events', 'buffer', 'assert', 'util'];
+
 /** @type {import('.').default} **/
 const plugin = function (defaults = {}) {
 	if ('edge' in defaults) {
@@ -109,20 +112,61 @@ const plugin = function (defaults = {}) {
 					`export const manifest = ${builder.generateManifest({ relativePath, routes })};\n`
 				);
 
-				await esbuild.build({
-					entryPoints: [`${tmp}/edge.js`],
-					outfile: `${dirs.functions}/${name}.func/index.js`,
-					target: 'es2020', // TODO verify what the edge runtime supports
-					bundle: true,
-					platform: 'browser',
-					format: 'esm',
-					external: config.external,
-					sourcemap: 'linked',
-					banner: { js: 'globalThis.global = globalThis;' },
-					loader: {
-						'.wasm': 'copy'
+				try {
+					const result = await esbuild.build({
+						entryPoints: [`${tmp}/edge.js`],
+						outfile: `${dirs.functions}/${name}.func/index.js`,
+						target: 'es2020', // TODO verify what the edge runtime supports
+						bundle: true,
+						platform: 'browser',
+						format: 'esm',
+						external: [
+							...compatible_node_modules,
+							...compatible_node_modules.map((id) => `node:${id}`),
+							...(config.external || [])
+						],
+						sourcemap: 'linked',
+						banner: { js: 'globalThis.global = globalThis;' },
+						loader: {
+							'.wasm': 'copy'
+						}
+					});
+
+					if (result.warnings.length > 0) {
+						const formatted = await esbuild.formatMessages(result.warnings, {
+							kind: 'warning',
+							color: true
+						});
+
+						console.error(formatted.join('\n'));
 					}
-				});
+				} catch (error) {
+					for (const e of error.errors) {
+						for (const node of e.notes) {
+							const match =
+								/The package "(.+)" wasn't found on the file system but is built into node/.exec(
+									node.text
+								);
+
+							if (match) {
+								node.text = `Cannot use "${match[1]}" when deploying to Vercel Edge Functions.`;
+							}
+						}
+					}
+
+					const formatted = await esbuild.formatMessages(error.errors, {
+						kind: 'error',
+						color: true
+					});
+
+					console.error(formatted.join('\n'));
+
+					throw new Error(
+						`Bundling with esbuild failed with ${error.errors.length} ${
+							error.errors.length === 1 ? 'error' : 'errors'
+						}`
+					);
+				}
 
 				write(
 					`${dirs.functions}/${name}.func/.vc-config.json`,
@@ -261,18 +305,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "5.0.0",
+  "version": "5.1.1",
   "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.0"
+    "@sveltejs/kit": "^2.5.3"
   },
   "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;
 }