@sveltejs/adapter-vercel 1.0.0-next.53 → 1.0.0-next.56

package/README.md

@@ -38,8 +38,16 @@ export default {
 
 ## Notes
 
+### Vercel functions
+
 Vercel functions contained in the `/api` directory at the project's root will _not_ be included in the deployment — these should be implemented as [endpoints](https://kit.svelte.dev/docs/routing#endpoints) in your SvelteKit app.
 
+### Node version
+
+Projects created before a certain date will default to using Node 14, while SvelteKit requires Node 16 or later. You can change that in your project settings:
+
+![Vercel project settings](settings.png)
+
 ## Changelog
 
 [The Changelog for this package is available on GitHub](https://github.com/sveltejs/kit/blob/master/packages/adapter-vercel/CHANGELOG.md).

package/files/serverless.js

@@ -1,9 +1,9 @@
-import { installFetch } from '@sveltejs/kit/install-fetch';
+import { installPolyfills } from '@sveltejs/kit/node/polyfills';
 import { getRequest, setResponse } from '@sveltejs/kit/node';
 import { Server } from 'SERVER';
 import { manifest } from 'MANIFEST';
 
-installFetch();
+installPolyfills();
 
 const server = new Server(manifest);
 

package/index.js

@@ -1,6 +1,7 @@
-import { mkdirSync, writeFileSync } from 'fs';
-import { dirname, posix } from 'path';
+import fs from 'fs';
+import path from 'path';
 import { fileURLToPath } from 'url';
+import { nodeFileTrace } from '@vercel/nft';
 import esbuild from 'esbuild';
 
 // rules for clean URLs and trailing slash handling,
@@ -80,6 +81,8 @@ const redirects = {
 	]
 };
 
+const files = fileURLToPath(new URL('./files', import.meta.url).href);
+
 /** @type {import('.')} **/
 export default function ({ external = [], edge, split } = {}) {
 	return {
@@ -113,8 +116,6 @@ async function v1(builder, external) {
 	builder.rimraf(dir);
 	builder.rimraf(tmp);
 
-	const files = fileURLToPath(new URL('./files', import.meta.url).href);
-
 	const dirs = {
 		static: `${dir}/static`,
 		lambda: `${dir}/functions/node/render`
@@ -122,7 +123,7 @@ async function v1(builder, external) {
 
 	builder.log.minor('Generating serverless function...');
 
-	const relativePath = posix.relative(tmp, builder.getServerDirectory());
+	const relativePath = path.posix.relative(tmp, builder.getServerDirectory());
 
 	builder.copy(`${files}/serverless.js`, `${tmp}/serverless.js`, {
 		replace: {
@@ -131,7 +132,7 @@ async function v1(builder, external) {
 		}
 	});
 
-	writeFileSync(
+	fs.writeFileSync(
 		`${tmp}/manifest.js`,
 		`export const manifest = ${builder.generateManifest({
 			relativePath
@@ -148,7 +149,7 @@ async function v1(builder, external) {
 		format: 'cjs'
 	});
 
-	writeFileSync(`${dirs.lambda}/package.json`, JSON.stringify({ type: 'commonjs' }));
+	fs.writeFileSync(`${dirs.lambda}/package.json`, JSON.stringify({ type: 'commonjs' }));
 
 	builder.log.minor('Copying assets...');
 
@@ -173,14 +174,14 @@ async function v1(builder, external) {
 		status: redirect.status
 	}));
 
-	writeFileSync(
+	fs.writeFileSync(
 		`${dir}/config/routes.json`,
 		JSON.stringify([
 			...redirects[builder.config.kit.trailingSlash],
 			...prerendered_pages,
 			...prerendered_redirects,
 			{
-				src: `/${builder.config.kit.appDir}/.+`,
+				src: `/${builder.config.kit.appDir}/immutable/.+`,
 				headers: {
 					'cache-control': 'public, immutable, max-age=31536000'
 				}
@@ -250,10 +251,9 @@ async function v3(builder, external, edge, split) {
 	 * @param {(options: { relativePath: string }) => string} generate_manifest
 	 */
 	async function generate_serverless_function(name, pattern, generate_manifest) {
-		const tmp = builder.getBuildDirectory(`vercel-tmp/${name}`);
-		const relativePath = posix.relative(tmp, builder.getServerDirectory());
+		const relativePath = path.posix.relative(tmp, builder.getServerDirectory());
 
-		builder.copy(`${files}/serverless.js`, `${tmp}/serverless.js`, {
+		builder.copy(`${files}/serverless.js`, `${tmp}/index.js`, {
 			replace: {
 				SERVER: `${relativePath}/index.js`,
 				MANIFEST: './manifest.js'
@@ -265,27 +265,12 @@ async function v3(builder, external, edge, split) {
 			`export const manifest = ${generate_manifest({ relativePath })};\n`
 		);
 
-		await esbuild.build({
-			entryPoints: [`${tmp}/serverless.js`],
-			outfile: `${dirs.functions}/${name}.func/index.js`,
-			target: `node${node_version.full}`,
-			bundle: true,
-			platform: 'node',
-			format: 'cjs',
-			external
-		});
-
-		write(
-			`${dirs.functions}/${name}.func/.vc-config.json`,
-			JSON.stringify({
-				runtime: `nodejs${node_version.major}.x`,
-				handler: 'index.js',
-				launcherType: 'Nodejs'
-			})
+		await create_function_bundle(
+			`${tmp}/index.js`,
+			`${dirs.functions}/${name}.func`,
+			`nodejs${node_version.major}.x`
 		);
 
-		write(`${dirs.functions}/${name}.func/package.json`, JSON.stringify({ type: 'commonjs' }));
-
 		routes.push({ src: pattern, dest: `/${name}` });
 	}
 
@@ -296,7 +281,7 @@ async function v3(builder, external, edge, split) {
 	 */
 	async function generate_edge_function(name, pattern, generate_manifest) {
 		const tmp = builder.getBuildDirectory(`vercel-tmp/${name}`);
-		const relativePath = posix.relative(tmp, builder.getServerDirectory());
+		const relativePath = path.posix.relative(tmp, builder.getServerDirectory());
 
 		builder.copy(`${files}/edge.js`, `${tmp}/edge.js`, {
 			replace: {
@@ -392,12 +377,12 @@ async function v3(builder, external, edge, split) {
  */
 function write(file, data) {
 	try {
-		mkdirSync(dirname(file), { recursive: true });
+		fs.mkdirSync(path.dirname(file), { recursive: true });
 	} catch {
 		// do nothing
 	}
 
-	writeFileSync(file, data);
+	fs.writeFileSync(file, data);
 }
 
 function get_node_version() {
@@ -412,3 +397,75 @@ function get_node_version() {
 
 	return { major, full };
 }
+
+/**
+ * @param {string} entry
+ * @param {string} dir
+ * @param {string} runtime
+ */
+async function create_function_bundle(entry, dir, runtime) {
+	let base = entry;
+	while (base !== (base = path.dirname(base)));
+
+	const traced = await nodeFileTrace([entry], { base });
+
+	traced.warnings.forEach((error) => {
+		// pending https://github.com/vercel/nft/issues/284
+		if (error.message.startsWith('Failed to resolve dependency node:')) return;
+		console.error(error);
+	});
+
+	// find common ancestor directory
+	let common_parts;
+
+	for (const file of traced.fileList) {
+		if (common_parts) {
+			const parts = file.split(path.sep);
+
+			for (let i = 0; i < common_parts.length; i += 1) {
+				if (parts[i] !== common_parts[i]) {
+					common_parts = common_parts.slice(0, i);
+					break;
+				}
+			}
+		} else {
+			common_parts = path.dirname(file).split(path.sep);
+		}
+	}
+
+	const ancestor = base + common_parts.join(path.sep);
+
+	for (const file of traced.fileList) {
+		const source = base + file;
+		const dest = path.join(dir, path.relative(ancestor, source));
+
+		const stats = fs.statSync(source);
+		const is_dir = stats.isDirectory();
+
+		const realpath = fs.realpathSync(source);
+
+		try {
+			fs.mkdirSync(path.dirname(dest), { recursive: true });
+		} catch {
+			// do nothing
+		}
+
+		if (source !== realpath) {
+			const realdest = path.join(dir, path.relative(ancestor, realpath));
+			fs.symlinkSync(path.relative(path.dirname(dest), realdest), dest, is_dir ? 'dir' : 'file');
+		} else if (!is_dir) {
+			fs.copyFileSync(source, dest);
+		}
+	}
+
+	write(
+		`${dir}/.vc-config.json`,
+		JSON.stringify({
+			runtime,
+			handler: path.relative(base + ancestor, entry),
+			launcherType: 'Nodejs'
+		})
+	);
+
+	write(`${dir}/package.json`, JSON.stringify({ type: 'module' }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "1.0.0-next.53",
+  "version": "1.0.0-next.56",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -11,6 +11,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./index.d.ts",
       "import": "./index.js"
     },
     "./package.json": "./package.json"
@@ -22,12 +23,11 @@
     "index.d.ts"
   ],
   "dependencies": {
+    "@vercel/nft": "^0.19.0",
     "esbuild": "^0.14.29"
   },
   "devDependencies": {
-    "@sveltejs/kit": "1.0.0-next.338",
-    "@types/node": "^14.14.20",
-    "typescript": "^4.6.2"
+    "@sveltejs/kit": "1.0.0-next.344"
   },
   "scripts": {
     "lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",