@sveltejs/adapter-vercel 1.0.0-next.32 → 1.0.0-next.36

package/README.md

@@ -19,37 +19,6 @@ export default {
 };
 ```
 
-## Advanced Configuration
-
-### esbuild
-
-As an escape hatch, you may optionally specify a function which will receive the final esbuild options generated by this adapter and returns a modified esbuild configuration. The result of this function will be passed as-is to esbuild. The function can be async.
-
-For example, you may wish to add a plugin:
-
-```js
-adapterVercel({
-	esbuild(defaultOptions) {
-		return {
-			...defaultOptions,
-			plugins: []
-		};
-	}
-});
-```
-
-The default options for this version are as follows:
-
-```js
-{
-	entryPoints: ['.svelte-kit/vercel/entry.js'],
-	outfile: `pathToLambdaFolder/index.js`,
-	bundle: true,
-	inject: ['pathTo/shims.js'],
-	platform: 'node'
-}
-```
-
 ## Changelog
 
 [The Changelog for this package is available on GitHub](https://github.com/sveltejs/kit/blob/master/packages/adapter-vercel/CHANGELOG.md).

package/files/entry.js

@@ -1,13 +1,13 @@
+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');
-
 	let body;
 
 	try {
@@ -17,11 +17,10 @@ export default async (req, res) => {
 		return res.end(err.reason || 'Invalid request body');
 	}
 
-	const rendered = await render({
+	const rendered = await app.render({
+		url: req.url,
 		method: req.method,
 		headers: req.headers,
-		path: pathname,
-		query: searchParams,
 		rawBody: body
 	});
 

package/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;

package/index.js

@@ -1,63 +1,88 @@
 import { writeFileSync } from 'fs';
-import { join } from 'path';
+import { posix } from 'path';
 import { fileURLToPath } from 'url';
 import esbuild from 'esbuild';
 
-/**
- * @typedef {import('esbuild').BuildOptions} BuildOptions
- */
+const dir = '.vercel_build_output';
 
 /** @type {import('.')} **/
-export default function (options) {
+export default function () {
 	return {
 		name: '@sveltejs/adapter-vercel',
 
-		async adapt({ utils }) {
-			const dir = '.vercel_build_output';
-			utils.rimraf(dir);
+		async adapt(builder) {
+			const tmp = builder.getBuildDirectory('vercel-tmp');
+
+			builder.rimraf(dir);
+			builder.rimraf(tmp);
 
 			const files = fileURLToPath(new URL('./files', import.meta.url));
 
 			const dirs = {
-				static: join(dir, 'static'),
-				lambda: join(dir, 'functions/node/render')
+				static: `${dir}/static`,
+				lambda: `${dir}/functions/node/render`
 			};
 
-			// 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');
-
-			/** @type {BuildOptions} */
-			const default_options = {
-				entryPoints: ['.svelte-kit/vercel/entry.js'],
-				outfile: join(dirs.lambda, 'index.js'),
-				bundle: true,
-				inject: [join(files, 'shims.js')],
-				platform: 'node'
-			};
+			builder.log.minor('Prerendering static pages...');
 
-			const build_options =
-				options && options.esbuild ? await options.esbuild(default_options) : default_options;
+			await builder.prerender({
+				dest: `${dir}/static`
+			});
 
-			await esbuild.build(build_options);
+			builder.log.minor('Generating serverless function...');
 
-			writeFileSync(join(dirs.lambda, 'package.json'), JSON.stringify({ type: 'commonjs' }));
+			const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
-			utils.log.minor('Prerendering static pages...');
-			await utils.prerender({
-				dest: dirs.static
+			builder.copy(files, tmp, {
+				replace: {
+					APP: `${relativePath}/app.js`,
+					MANIFEST: './manifest.js'
+				}
 			});
 
-			utils.log.minor('Copying assets...');
-			utils.copy_static_files(dirs.static);
-			utils.copy_client_files(dirs.static);
+			writeFileSync(
+				`${tmp}/manifest.js`,
+				`export const manifest = ${builder.generateManifest({
+					relativePath
+				})};\n`
+			);
+
+			await esbuild.build({
+				entryPoints: [`${tmp}/entry.js`],
+				outfile: `${dirs.lambda}/index.js`,
+				target: 'node14',
+				bundle: true,
+				platform: 'node'
+			});
+
+			writeFileSync(`${dirs.lambda}/package.json`, JSON.stringify({ type: 'commonjs' }));
+
+			builder.log.minor('Copying assets...');
+
+			builder.writeStatic(dirs.static);
+			builder.writeClient(dirs.static);
+
+			builder.log.minor('Writing routes...');
 
-			utils.log.minor('Writing routes...');
-			utils.copy(join(files, 'routes.json'), join(dir, 'config/routes.json'));
+			builder.mkdirp(`${dir}/config`);
+			writeFileSync(
+				`${dir}/config/routes.json`,
+				JSON.stringify([
+					{
+						src: `/${builder.appDir}/.+`,
+						headers: {
+							'cache-control': 'public, immutable, max-age=31536000'
+						}
+					},
+					{
+						handle: 'filesystem'
+					},
+					{
+						src: '/.*',
+						dest: '.vercel/functions/render'
+					}
+				])
+			);
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "1.0.0-next.32",
+  "version": "1.0.0-next.36",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -25,7 +25,7 @@
     "esbuild": "^0.13.15"
   },
   "devDependencies": {
-    "@sveltejs/kit": "1.0.0-next.202"
+    "@sveltejs/kit": "1.0.0-next.218"
   },
   "scripts": {
     "lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",

package/files/routes.json

@@ -1,9 +0,0 @@
-[
-	{
-		"handle": "filesystem"
-	},
-	{
-		"src": "/.*",
-		"dest": ".vercel/functions/render"
-	}
-]

package/files/shims.js

@@ -1 +0,0 @@
-export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';