@sveltejs/adapter-vercel 1.0.0-next.40 → 1.0.0-next.44

package/README.md

@@ -1,6 +1,8 @@
 # adapter-vercel
 
-Adapter for Svelte apps that creates a Vercel app, using a function for dynamic server rendering.
+A SvelteKit adapter that creates a Vercel app.
+
+If you're using [adapter-auto](../adapter-auto), you don't need to install this unless you need to specify Vercel-specific options, since it's already included.
 
 ## Usage
 

package/files/ambient.d.ts

@@ -1,5 +1,5 @@
-declare module 'APP' {
-	export { App } from '@sveltejs/kit';
+declare module 'SERVER' {
+	export { Server } from '@sveltejs/kit';
 }
 
 declare module 'MANIFEST' {

package/files/entry.js

@@ -1,9 +1,9 @@
 import './shims';
 import { getRequest, setResponse } from '@sveltejs/kit/node';
-import { App } from 'APP';
+import { Server } from 'SERVER';
 import { manifest } from 'MANIFEST';
 
-const app = new App(manifest);
+const server = new Server(manifest);
 
 /**
  * @param {import('http').IncomingMessage} req
@@ -19,5 +19,5 @@ export default async (req, res) => {
 		return res.end(err.reason || 'Invalid request body');
 	}
 
-	setResponse(res, await app.render(request));
+	setResponse(res, await server.respond(request));
 };

package/index.js

@@ -5,6 +5,83 @@ import esbuild from 'esbuild';
 
 const dir = '.vercel_build_output';
 
+// rules for clean URLs and trailing slash handling,
+// generated with @vercel/routing-utils
+const redirects = {
+	always: [
+		{
+			src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
+			headers: {
+				Location: '/$1/'
+			},
+			status: 308
+		},
+		{
+			src: '^/(.*)\\.html/?$',
+			headers: {
+				Location: '/$1/'
+			},
+			status: 308
+		},
+		{
+			src: '^/\\.well-known(?:/.*)?$'
+		},
+		{
+			src: '^/((?:[^/]+/)*[^/\\.]+)$',
+			headers: {
+				Location: '/$1/'
+			},
+			status: 308
+		},
+		{
+			src: '^/((?:[^/]+/)*[^/]+\\.\\w+)/$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		}
+	],
+	never: [
+		{
+			src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		},
+		{
+			src: '^/(.*)\\.html/?$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		},
+		{
+			src: '^/(.*)/$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		}
+	],
+	ignore: [
+		{
+			src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		},
+		{
+			src: '^/(.*)\\.html/?$',
+			headers: {
+				Location: '/$1'
+			},
+			status: 308
+		}
+	]
+};
+
 /** @type {import('.')} **/
 export default function ({ external = [] } = {}) {
 	return {
@@ -25,7 +102,7 @@ export default function ({ external = [] } = {}) {
 
 			builder.log.minor('Prerendering static pages...');
 
-			await builder.prerender({
+			const prerendered = await builder.prerender({
 				dest: `${dir}/static`
 			});
 
@@ -35,7 +112,7 @@ export default function ({ external = [] } = {}) {
 
 			builder.copy(files, tmp, {
 				replace: {
-					APP: `${relativePath}/app.js`,
+					SERVER: `${relativePath}/index.js`,
 					MANIFEST: './manifest.js'
 				}
 			});
@@ -66,9 +143,26 @@ export default function ({ external = [] } = {}) {
 			builder.log.minor('Writing routes...');
 
 			builder.mkdirp(`${dir}/config`);
+
+			const prerendered_pages = Array.from(prerendered.pages, ([src, page]) => ({
+				src,
+				dest: page.file
+			}));
+
+			const prerendered_redirects = Array.from(prerendered.redirects, ([src, redirect]) => ({
+				src,
+				headers: {
+					Location: redirect.location
+				},
+				status: redirect.status
+			}));
+
 			writeFileSync(
 				`${dir}/config/routes.json`,
 				JSON.stringify([
+					...redirects[builder.trailingSlash],
+					...prerendered_pages,
+					...prerendered_redirects,
 					{
 						src: `/${builder.appDir}/.+`,
 						headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "1.0.0-next.40",
+  "version": "1.0.0-next.44",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -22,10 +22,10 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "esbuild": "^0.13.15"
+    "esbuild": "^0.14.21"
   },
   "devDependencies": {
-    "@sveltejs/kit": "1.0.0-next.251"
+    "@sveltejs/kit": "1.0.0-next.280"
   },
   "scripts": {
     "lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",