Adapter bundle (#1091)

Rich Harris · web-flow · commit 7a4b3510f42e · 2021-04-18T10:37:54.000-04:00
* tinkering

* lint

* simplify vercel adapter

* note to self

* expose @sveltejs/kit/install-fetch for adapters

* use install-fetch in vercel adapter

* update netlify adapter

* ignore netlify folders

* lint

* lint

* use install-fetch in adapter-node

* changesets
diff --git a/.changeset/light-keys-mix.md b/.changeset/light-keys-mix.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-node': patch
+---
+
+Use install-fetch helper
diff --git a/.changeset/smart-mugs-chew.md b/.changeset/smart-mugs-chew.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Expose install-fetch subpackage for adapters to use
diff --git a/.changeset/smooth-shoes-mix.md b/.changeset/smooth-shoes-mix.md
@@ -0,0 +1,6 @@
+---
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Bundle serverless functions with esbuild
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ yarn.lock
 /packages/create-svelte/template/CHANGELOG.md
 .env
 .vercel_build_output
+.netlify
 .svelte
diff --git a/packages/adapter-netlify/files/_redirects b/packages/adapter-netlify/files/_redirects
@@ -0,0 +1 @@
+/* /.netlify/functions/render 200
diff --git a/packages/adapter-netlify/files/entry.js b/packages/adapter-netlify/files/entry.js
@@ -1,14 +1,7 @@
-'use strict';
+import '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
 
-import { URLSearchParams } from 'url';
-import { render } from './app.mjs'; // eslint-disable-line import/no-unresolved
-import fetch, { Response, Request, Headers } from 'node-fetch';
-
-// provide server-side fetch
-globalThis.fetch = fetch;
-globalThis.Response = Response;
-globalThis.Request = Request;
-globalThis.Headers = Headers;
+// TODO hardcoding the relative location makes this brittle
+import { render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
 
 export async function handler(event) {
 	const {
diff --git a/packages/adapter-netlify/files/index.cjs b/packages/adapter-netlify/files/index.cjs
diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js
@@ -1,5 +1,6 @@
-const { existsSync, readFileSync, copyFileSync, writeFileSync, renameSync } = require('fs');
-const { resolve } = require('path');
+const { existsSync, readFileSync, writeFileSync } = require('fs');
+const { join } = require('path');
+const esbuild = require('esbuild');
 const toml = require('toml');
 
 module.exports = function () {
@@ -8,58 +9,64 @@ module.exports = function () {
 		name: '@sveltejs/adapter-netlify',
 
 		async adapt(utils) {
-			let netlify_config;
-
-			if (existsSync('netlify.toml')) {
-				try {
-					netlify_config = toml.parse(readFileSync('netlify.toml', 'utf-8'));
-				} catch (err) {
-					err.message = `Error parsing netlify.toml: ${err.message}`;
-					throw err;
-				}
-			} else {
-				// TODO offer to create one?
-				throw new Error(
-					'Missing a netlify.toml file. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
-				);
-			}
-
-			if (
-				!netlify_config.build ||
-				!netlify_config.build.publish ||
-				!netlify_config.build.functions
-			) {
-				throw new Error(
-					'You must specify build.publish and build.functions in netlify.toml. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
-				);
-			}
-
-			const publish = resolve(netlify_config.build.publish);
-			const functions = resolve(netlify_config.build.functions);
+			const { publish, functions } = validate_config().build;
 
-			utils.copy_static_files(publish);
-			utils.copy_client_files(publish);
-			utils.copy_server_files(`${functions}/render`);
+			utils.rimraf(publish);
+			utils.rimraf(functions);
 
-			// rename app to .mjs
-			renameSync(`${functions}/render/app.js`, `${functions}/render/app.mjs`);
+			const files = join(__dirname, 'files');
 
-			// copy the renderer
-			copyFileSync(resolve(__dirname, 'files/render.js'), `${functions}/render/handler.mjs`);
+			utils.log.minor('Generating serverless function...');
+			utils.copy(join(files, 'entry.js'), '.svelte/netlify/entry.js');
 
-			// copy the entry point
-			copyFileSync(resolve(__dirname, 'files/index.cjs'), `${functions}/render/index.js`);
+			await esbuild.build({
+				entryPoints: ['.svelte/netlify/entry.js'],
+				outfile: join(functions, 'index.js'),
+				bundle: true,
+				platform: 'node'
+			});
 
-			// create _redirects
-			writeFileSync(`${publish}/_redirects`, '/* /.netlify/functions/render 200');
+			writeFileSync(join(functions, 'package.json'), JSON.stringify({ type: 'commonjs' }));
 
-			// prerender
 			utils.log.info('Prerendering static pages...');
 			await utils.prerender({
 				dest: publish
 			});
+
+			utils.log.minor('Copying assets...');
+			utils.copy_static_files(publish);
+			utils.copy_client_files(publish);
+
+			utils.log.minor('Writing redirects...');
+			utils.copy(`${files}/_redirects`, `${publish}/_redirects`);
 		}
 	};
 
 	return adapter;
 };
+
+function validate_config() {
+	if (existsSync('netlify.toml')) {
+		let netlify_config;
+
+		try {
+			netlify_config = toml.parse(readFileSync('netlify.toml', 'utf-8'));
+		} catch (err) {
+			err.message = `Error parsing netlify.toml: ${err.message}`;
+			throw err;
+		}
+
+		if (!netlify_config.build || !netlify_config.build.publish || !netlify_config.build.functions) {
+			throw new Error(
+				'You must specify build.publish and build.functions in netlify.toml. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
+			);
+		}
+
+		return netlify_config;
+	}
+
+	// TODO offer to create one?
+	throw new Error(
+		'Missing a netlify.toml file. Consult https://github.com/sveltejs/kit/tree/master/packages/adapter-netlify#configuration'
+	);
+}
diff --git a/packages/adapter-node/src/server.js b/packages/adapter-node/src/server.js
@@ -1,18 +1,11 @@
-import compression from 'compression';
 import fs from 'fs';
-import polka from 'polka';
 import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import compression from 'compression';
+import polka from 'polka';
 import sirv from 'sirv';
-import { URL, fileURLToPath } from 'url';
-// eslint-disable-next-line import/no-unresolved
-import { get_body } from '@sveltejs/kit/http';
-import fetch, { Response, Request, Headers } from 'node-fetch';
-
-// provide server-side fetch
-globalThis.fetch = fetch;
-globalThis.Response = Response;
-globalThis.Request = Request;
-globalThis.Headers = Headers;
+import { get_body } from '@sveltejs/kit/http'; // eslint-disable-line import/no-unresolved
+import '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
 
 // App is a dynamic file built from the application layer.
 
diff --git a/packages/adapter-vercel/.gitignore b/packages/adapter-vercel/.gitignore
@@ -1,3 +1,2 @@
 .DS_Store
-node_modules
-/files
+node_modules
diff --git a/packages/adapter-vercel/files/entry.js b/packages/adapter-vercel/files/entry.js
@@ -1,19 +1,12 @@
-import { URL } from 'url';
-// eslint-disable-next-line import/no-unresolved
-import { get_body } from '@sveltejs/kit/http';
-import fetch, { Response, Request, Headers } from 'node-fetch';
+import { get_body } from '@sveltejs/kit/http'; // eslint-disable-line import/no-unresolved
+import '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
 
-// provide server-side fetch
-globalThis.fetch = fetch;
-globalThis.Response = Response;
-globalThis.Request = Request;
-globalThis.Headers = Headers;
+// TODO hardcoding the relative location makes this brittle
+import { render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
 
 export default async (req, res) => {
 	const { pathname, searchParams } = new URL(req.url || '', 'http://localhost');
 
-	const { render } = await import('./server/app.mjs');
-
 	const rendered = await render({
 		method: req.method,
 		headers: req.headers,
diff --git a/packages/adapter-vercel/files/routes.json b/packages/adapter-vercel/files/routes.json
@@ -0,0 +1,9 @@
+[
+	{
+		"handle": "filesystem"
+	},
+	{
+		"src": "/.*",
+		"dest": ".vercel/functions/render"
+	}
+]
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
@@ -1,51 +1,51 @@
-const { writeFileSync, mkdirSync, renameSync } = require('fs');
-const { resolve, join } = require('path');
+const { writeFileSync } = require('fs');
+const { join } = require('path');
+const esbuild = require('esbuild');
 
 module.exports = function () {
 	/** @type {import('@sveltejs/kit').Adapter} */
 	const adapter = {
 		name: '@sveltejs/adapter-vercel',
 
 		async adapt(utils) {
-			const vercel_output_directory = resolve('.vercel_build_output');
-			const config_directory = join(vercel_output_directory, 'config');
-			const static_directory = join(vercel_output_directory, 'static');
-			const lambda_directory = join(vercel_output_directory, 'functions', 'node', 'render');
-			const server_directory = join(lambda_directory, 'server');
-
-			utils.log.minor('Writing client application...');
-			utils.copy_static_files(static_directory);
-			utils.copy_client_files(static_directory);
-
-			utils.log.minor('Building lambda...');
-			utils.copy_server_files(server_directory);
-			renameSync(join(server_directory, 'app.js'), join(server_directory, 'app.mjs'));
+			const dir = '.vercel_build_output';
+			utils.rimraf(dir);
+
+			const files = join(__dirname, 'files');
+
+			const dirs = {
+				static: join(dir, 'static'),
+				lambda: join(dir, 'functions/node/render')
+			};
+
+			// TODO ideally we'd have something like utils.tmpdir('vercel')
+			// rather than hardcoding '.svelte/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/vercel/entry.js');
+
+			await esbuild.build({
+				entryPoints: ['.svelte/vercel/entry.js'],
+				outfile: join(dirs.lambda, 'index.js'),
+				bundle: true,
+				platform: 'node'
+			});
 
-			utils.copy(join(__dirname, 'files'), lambda_directory);
+			writeFileSync(join(dirs.lambda, 'package.json'), JSON.stringify({ type: 'commonjs' }));
 
 			utils.log.minor('Prerendering static pages...');
 			await utils.prerender({
-				dest: static_directory
+				dest: dirs.static
 			});
 
+			utils.log.minor('Copying assets...');
+			utils.copy_static_files(dirs.static);
+			utils.copy_client_files(dirs.static);
+
 			utils.log.minor('Writing routes...');
-			try {
-				mkdirSync(config_directory);
-			} catch {
-				// directory already exists
-			}
-			writeFileSync(
-				join(config_directory, 'routes.json'),
-				JSON.stringify([
-					{
-						handle: 'filesystem'
-					},
-					{
-						src: '/.*',
-						dest: '.vercel/functions/render'
-					}
-				])
-			);
+			utils.copy(join(files, 'routes.json'), join(dir, 'config/routes.json'));
 		}
 	};
 
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -6,17 +6,13 @@
 		"files"
 	],
 	"scripts": {
-		"dev": "rollup -cw",
-		"build": "rollup -c",
 		"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
 		"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
-		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-		"prepublishOnly": "npm run build"
+		"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
-		"rollup": "^2.41.1",
-		"sirv": "^1.0.11",
+		"esbuild": "^0.11.12",
 		"typescript": "^4.2.3"
 	}
 }
diff --git a/packages/adapter-vercel/src/index.cjs b/packages/adapter-vercel/src/index.cjs
diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.1",
 	"scripts": {
 		"dev": "svelte-kit dev",
-		"build": "svelte-kit build",
+		"build": "svelte-kit build --verbose",
 		"start": "svelte-kit start"
 	},
 	"devDependencies": {
diff --git a/packages/create-svelte/templates/default/svelte.config.cjs b/packages/create-svelte/templates/default/svelte.config.cjs
@@ -12,13 +12,7 @@ const config = {
 
 	kit: {
 		// hydrate the <div id="svelte"> element in src/app.html
-		target: '#svelte',
-
-		vite: {
-			ssr: {
-				noExternal: Object.keys(pkg.dependencies || {})
-			}
-		}
+		target: '#svelte'
 	}
 };
 
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -67,6 +67,9 @@
 		"./http": {
 			"import": "./dist/http.js"
 		},
+		"./install-fetch": {
+			"import": "./dist/install-fetch.js"
+		},
 		"./types": "./types/index.d.ts"
 	},
 	"types": "types/index.d.ts",
diff --git a/packages/kit/rollup.config.js b/packages/kit/rollup.config.js
@@ -42,7 +42,8 @@ export default [
 		input: {
 			cli: 'src/cli.js',
 			ssr: 'src/runtime/server/index.js',
-			http: 'src/core/http/index.js'
+			http: 'src/core/http/index.js',
+			'install-fetch': 'src/install-fetch.js'
 		},
 		output: {
 			dir: 'dist',
diff --git a/packages/kit/src/core/adapt/prerender.js b/packages/kit/src/core/adapt/prerender.js
@@ -2,7 +2,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { dirname, join, resolve as resolve_path } from 'path';
 import { parse, pathToFileURL, resolve } from 'url';
 import { mkdirp } from '../filesystem/index.js';
-import '../node-fetch-global.js';
+import '../../install-fetch.js';
 
 /** @param {string} html */
 function clean_html(html) {
diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js
diff --git a/packages/kit/src/core/start/index.js b/packages/kit/src/core/start/index.js
diff --git a/packages/kit/src/install-fetch.js b/packages/kit/src/install-fetch.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@sveltejs/adapter-node': patch
 +---
++
 +Use install-fetch helper