@sveltejs/adapter-vercel 3.0.3 → 4.0.0

package/files/serverless.js

@@ -32,15 +32,7 @@ export default async (req, res) => {
 		}
 	}
 
-	/** @type {Request} */
-	let request;
-
-	try {
-		request = await getRequest({ base: `https://${req.headers.host}`, request: req });
-	} catch (err) {
-		res.statusCode = /** @type {any} */ (err).status || 400;
-		return res.end('Invalid request body');
-	}
+	const request = await getRequest({ base: `https://${req.headers.host}`, request: req });
 
 	setResponse(
 		res,

package/index.d.ts

@@ -5,10 +5,10 @@ export default function plugin(config?: Config): Adapter;
 
 export interface ServerlessConfig {
 	/**
-	 * Whether to use [Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions) or [Serverless Functions](https://vercel.com/docs/concepts/functions/serverless-functions)
+	 * Whether to use [Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions) (`'edge'`) or [Serverless Functions](https://vercel.com/docs/concepts/functions/serverless-functions) (`'nodejs18.x'`, `'nodejs20.x'` etc).
 	 * @default 'nodejs18.x'
 	 */
-	runtime?: 'nodejs16.x' | 'nodejs18.x';
+	runtime?: `nodejs${number}.x`;
 	/**
 	 * To which regions to deploy the app. A list of regions.
 	 * More info: https://vercel.com/docs/concepts/edge-network/regions
@@ -28,6 +28,12 @@ export interface ServerlessConfig {
 	 * If `true`, this route will always be deployed as its own separate function
 	 */
 	split?: boolean;
+
+	/**
+	 * https://vercel.com/docs/build-output-api/v3/configuration#images
+	 */
+	images?: ImagesConfig;
+
 	/**
 	 * [Incremental Static Regeneration](https://vercel.com/docs/concepts/incremental-static-regeneration/overview) configuration.
 	 * Serverless only.
@@ -53,9 +59,29 @@ export interface ServerlessConfig {
 		| false;
 }
 
+type ImageFormat = 'image/avif' | 'image/webp';
+
+type RemotePattern = {
+	protocol?: 'http' | 'https';
+	hostname: string;
+	port?: string;
+	pathname?: string;
+};
+
+type ImagesConfig = {
+	sizes: number[];
+	domains: string[];
+	remotePatterns?: RemotePattern[];
+	minimumCacheTTL?: number; // seconds
+	formats?: ImageFormat[];
+	dangerouslyAllowSVG?: boolean;
+	contentSecurityPolicy?: string;
+	contentDispositionType?: string;
+};
+
 export interface EdgeConfig {
 	/**
-	 * Whether to use [Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions) or [Serverless Functions](https://vercel.com/docs/concepts/functions/serverless-functions)
+	 * Whether to use [Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions) (`'edge'`) or [Serverless Functions](https://vercel.com/docs/concepts/functions/serverless-functions) (`'nodejs18.x'`, `'nodejs20.x'` etc).
 	 */
 	runtime?: 'edge';
 	/**

package/index.js

@@ -5,17 +5,16 @@ import { nodeFileTrace } from '@vercel/nft';
 import esbuild from 'esbuild';
 import { get_pathname } from './utils.js';
 
-const VALID_RUNTIMES = ['edge', 'nodejs16.x', 'nodejs18.x'];
-
 const DEFAULT_FUNCTION_NAME = 'fn';
 
 const get_default_runtime = () => {
 	const major = process.version.slice(1).split('.')[0];
 	if (major === '16') return 'nodejs16.x';
 	if (major === '18') return 'nodejs18.x';
+	if (major === '20') return 'nodejs20.x';
 
 	throw new Error(
-		`Unsupported Node.js version: ${process.version}. Please use Node 16 or Node 18 to build your project, or explicitly specify a runtime in your adapter configuration.`
+		`Unsupported Node.js version: ${process.version}. Please use Node 16, Node 18 or Node 20 to build your project, or explicitly specify a runtime in your adapter configuration.`
 	);
 };
 
@@ -55,7 +54,7 @@ const plugin = function (defaults = {}) {
 				functions: `${dir}/functions`
 			};
 
-			const static_config = static_vercel_config(builder);
+			const static_config = static_vercel_config(builder, defaults);
 
 			builder.log.minor('Generating serverless function...');
 
@@ -164,20 +163,20 @@ const plugin = function (defaults = {}) {
 					continue;
 				}
 
-				if (runtime && !VALID_RUNTIMES.includes(runtime)) {
+				const node_runtime = /nodejs([0-9]+)\.x/.exec(runtime);
+				if (runtime !== 'edge' && (!node_runtime || node_runtime[1] < 16)) {
 					throw new Error(
-						`Invalid runtime '${runtime}' for route ${
-							route.id
-						}. Valid runtimes are ${VALID_RUNTIMES.join(', ')}`
+						`Invalid runtime '${runtime}' for route ${route.id}. Valid runtimes are 'edge' and 'nodejs16.x' or higher ` +
+							'(see the Node.js Version section in your Vercel project settings for info on the currently supported versions).'
 					);
 				}
 
 				if (config.isr) {
 					const directory = path.relative('.', builder.config.kit.files.routes + route.id);
 
-					if (runtime !== 'nodejs16.x' && runtime !== 'nodejs18.x') {
+					if (!runtime.startsWith('nodejs')) {
 						throw new Error(
-							`${directory}: Routes using \`isr\` must use either \`runtime: 'nodejs16.x'\` or \`runtime: 'nodejs18.x'\``
+							`${directory}: Routes using \`isr\` must use a Node.js runtime (for example 'nodejs20.x')`
 						);
 					}
 
@@ -368,14 +367,20 @@ function write(file, data) {
 }
 
 // This function is duplicated in adapter-static
-/** @param {import('@sveltejs/kit').Builder} builder */
-function static_vercel_config(builder) {
+/**
+ * @param {import('@sveltejs/kit').Builder} builder
+ * @param {import('.').Config} config
+ */
+function static_vercel_config(builder, config) {
 	/** @type {any[]} */
 	const prerendered_redirects = [];
 
 	/** @type {Record<string, { path: string }>} */
 	const overrides = {};
 
+	/** @type {import('./index').ImagesConfig} */
+	const images = config.images;
+
 	for (const [src, redirect] of builder.prerendered.redirects) {
 		prerendered_redirects.push({
 			src,
@@ -421,7 +426,8 @@ function static_vercel_config(builder) {
 				handle: 'filesystem'
 			}
 		],
-		overrides
+		overrides,
+		images
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "description": "A SvelteKit adapter that creates a Vercel app",
   "repository": {
     "type": "git",
@@ -25,20 +25,21 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@vercel/nft": "^0.23.0",
-    "esbuild": "^0.18.11"
+    "@vercel/nft": "^0.24.4",
+    "esbuild": "^0.19.9"
   },
   "devDependencies": {
-    "@types/node": "^16.18.6",
-    "typescript": "^4.9.4",
-    "vitest": "^0.33.0",
-    "@sveltejs/kit": "^1.22.4"
+    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@types/node": "^18.19.3",
+    "typescript": "^5.3.3",
+    "vitest": "^1.0.4",
+    "@sveltejs/kit": "^2.0.0"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^1.5.0"
+    "@sveltejs/kit": "^2.0.0"
   },
   "scripts": {
-    "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
+    "lint": "prettier --check .",
     "format": "pnpm lint --write",
     "check": "tsc",
     "test": "vitest run"