get vercel adapter working (with v1 filesystem API)

packages/adapter-vercel/files/entry.js

@@ -1,9 +1,11 @@
+import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
 import { getRawBody } from '@sveltejs/kit/node';
+import { App } from 'APP';
+import { manifest } from 'MANIFEST';
 
-// TODO hardcoding the relative location makes this brittle
-import { init, render } from '../output/server/app.js';
+__fetch_polyfill();
 
-init();
+const app = new App(manifest);
 
 export default async (req, res) => {
 	const { pathname, searchParams } = new URL(req.url || '', 'http://localhost');
@@ -17,7 +19,7 @@ export default async (req, res) => {
 		return res.end(err.reason || 'Invalid request body');
 	}
 
-	const rendered = await render({
+	const rendered = await app.render({
 		method: req.method,
 		headers: req.headers,
 		path: pathname,

packages/adapter-vercel/index.d.ts

@@ -1,9 +1,4 @@
 import { Adapter } from '@sveltejs/kit';
-import { BuildOptions } from 'esbuild';
 
-interface AdapterOptions {
-	esbuild?: (options: BuildOptions) => Promise<BuildOptions> | BuildOptions;
-}
-
-declare function plugin(options?: AdapterOptions): Adapter;
+declare function plugin(): Adapter;
 export = plugin;

packages/adapter-vercel/index.js

@@ -8,56 +8,70 @@ import esbuild from 'esbuild';
  */
 
 /** @type {import('.')} **/
-export default function (options) {
+export default function () {
 	return {
 		name: '@sveltejs/adapter-vercel',
 
 		async adapt(utils) {
-			const dir = '.vercel_build_output';
+			const dir = '.output';
 			utils.rimraf(dir);
 
 			const files = fileURLToPath(new URL('./files', import.meta.url));
 
 			const dirs = {
 				static: join(dir, 'static'),
-				lambda: join(dir, 'functions/node/render')
+				lambda: join(dir, 'server/pages')
 			};
 
+			utils.log.minor('Prerendering static pages...');
+			await utils.prerender({
+				dest: dirs.static
+			});
+
 			// TODO ideally we'd have something like utils.tmpdir('vercel')
 			// rather than hardcoding '.svelte-kit/vercel/entry.js', and the
 			// relative import from that file to output/server/app.js
 			// would be controlled. at the moment we're exposing
 			// implementation details that could change
 			utils.log.minor('Generating serverless function...');
-			utils.copy(join(files, 'entry.js'), '.svelte-kit/vercel/entry.js');
+			utils.copy(files, '.svelte-kit/vercel', {
+				replace: {
+					APP: '../output/server/app.js',
+					MANIFEST: './manifest.js'
+				}
+			});
 
-			/** @type {BuildOptions} */
-			const default_options = {
+			writeFileSync(
+				'.svelte-kit/vercel/manifest.js',
+				`export const manifest = ${utils.generateManifest({ relativePath: '../output/server' })};\n`
+			);
+
+			await esbuild.build({
 				entryPoints: ['.svelte-kit/vercel/entry.js'],
-				outfile: join(dirs.lambda, 'index.js'),
+				outfile: join(dirs.lambda, '__render.js'),
 				bundle: true,
-				inject: [join(files, 'shims.js')],
 				platform: 'node'
-			};
-
-			const build_options =
-				options && options.esbuild ? await options.esbuild(default_options) : default_options;
-
-			await esbuild.build(build_options);
+			});
 
 			writeFileSync(join(dirs.lambda, 'package.json'), JSON.stringify({ type: 'commonjs' }));
 
-			utils.log.minor('Prerendering static pages...');
-			await utils.prerender({
-				dest: dirs.static
-			});
-
 			utils.log.minor('Copying assets...');
-			utils.copy_static_files(dirs.static);
-			utils.copy_client_files(dirs.static);
+			utils.writeClient(dirs.static);
+			utils.writeStatic(dirs.static);
 
-			utils.log.minor('Writing routes...');
-			utils.copy(join(files, 'routes.json'), join(dir, 'config/routes.json'));
+			utils.log.minor('Writing manifests...');
+			writeFileSync(
+				join(dir, 'routes-manifest.json'),
+				JSON.stringify({
+					version: 3,
+					dynamicRoutes: [
+						{
+							page: '/__render',
+							regex: '^/.*'
+						}
+					]
+				})
+			);
 		}
 	};
 }

packages/adapter-vercel/tsconfig.json

@@ -9,5 +9,5 @@
 		"moduleResolution": "node",
 		"allowSyntheticDefaultImports": true
 	},
-	"include": ["./index.js", "src"]
+	"include": ["./index.js", "files"]
 }