@sveltejs/adapter-vercel 2.1.1 → 2.2.1

package/index.js

@@ -6,6 +6,8 @@ import esbuild from 'esbuild';
 
 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';
@@ -39,6 +41,12 @@ const plugin = function (defaults = {}) {
 			builder.rimraf(dir);
 			builder.rimraf(tmp);
 
+			if (fs.existsSync('vercel.json')) {
+				const vercel_file = fs.readFileSync('vercel.json', 'utf-8');
+				const vercel_config = JSON.parse(vercel_file);
+				validate_vercel_json(builder, vercel_config);
+			}
+
 			const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
 			const dirs = {
@@ -208,7 +216,7 @@ const plugin = function (defaults = {}) {
 					group.config.runtime === 'edge' ? generate_edge_function : generate_serverless_function;
 
 				// generate one function for the group
-				const name = singular ? 'fn' : `fn-${group.i}`;
+				const name = singular ? DEFAULT_FUNCTION_NAME : `fn-${group.i}`;
 
 				await generate_function(
 					name,
@@ -281,12 +289,25 @@ const plugin = function (defaults = {}) {
 				}
 			}
 
-			if (singular) {
-				// Common case: One function for all routes
-				// Needs to happen after ISR or else regex swallows all other matches
-				static_config.routes.push({ src: '/.*', dest: `/fn` });
+			if (!singular) {
+				// we need to create a catch-all route so that 404s are handled
+				// by SvelteKit rather than Vercel
+
+				const runtime = defaults.runtime ?? get_default_runtime();
+				const generate_function =
+					runtime === 'edge' ? generate_edge_function : generate_serverless_function;
+
+				await generate_function(
+					DEFAULT_FUNCTION_NAME,
+					/** @type {any} */ ({ runtime, ...defaults }),
+					[]
+				);
 			}
 
+			// Catch-all route must come at the end, otherwise it will swallow all other routes,
+			// 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);
@@ -499,4 +520,57 @@ async function create_function_bundle(builder, entry, dir, config) {
 	write(`${dir}/package.json`, JSON.stringify({ type: 'module' }));
 }
 
+/**
+ *
+ * @param {import('@sveltejs/kit').Builder} builder
+ * @param {any} vercel_config
+ */
+function validate_vercel_json(builder, vercel_config) {
+	if (builder.routes.length > 0 && !builder.routes[0].api) {
+		// bail — we're on an older SvelteKit version that doesn't
+		// populate `route.api.methods`, so we can't check
+		// to see if cron paths are valid
+		return;
+	}
+
+	const crons = /** @type {Array<unknown>} */ (
+		Array.isArray(vercel_config?.crons) ? vercel_config.crons : []
+	);
+
+	/** For a route to be considered 'valid', it must be an API route with a GET handler */
+	const valid_routes = builder.routes.filter((route) => route.api.methods.includes('GET'));
+
+	/** @type {Array<string>} */
+	const unmatched_paths = [];
+
+	for (const cron of crons) {
+		if (typeof cron !== 'object' || cron === null || !('path' in cron)) {
+			continue;
+		}
+
+		const { path } = cron;
+		if (typeof path !== 'string') {
+			continue;
+		}
+
+		for (const route of valid_routes) {
+			if (route.pattern.test(path)) {
+				continue;
+			}
+		}
+
+		unmatched_paths.push(path);
+	}
+
+	builder.log.warn(
+		`\nvercel.json defines cron tasks that use paths that do not correspond to an API route with a GET handler (ignore this if the request is handled in your \`handle\` hook):`
+	);
+
+	for (const path of unmatched_paths) {
+		console.log(`    - ${path}`);
+	}
+
+	console.log('');
+}
+
 export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@types/node": "^16.18.6",
     "typescript": "^4.9.4",
-    "@sveltejs/kit": "^1.8.3"
+    "@sveltejs/kit": "^1.9.2"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"