@sveltejs/adapter-vercel 1.0.0-next.43 → 1.0.0-next.46

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/files/shims.js

@@ -1,2 +1,2 @@
-import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
-__fetch_polyfill();
+import { installFetch } from '@sveltejs/kit/install-fetch';
+installFetch();

package/index.js

@@ -1,4 +1,4 @@
-import { existsSync, writeFileSync } from 'fs';
+import { writeFileSync } from 'fs';
 import { posix } from 'path';
 import { fileURLToPath } from 'url';
 import esbuild from 'esbuild';
@@ -93,26 +93,20 @@ export default function ({ external = [] } = {}) {
 			builder.rimraf(dir);
 			builder.rimraf(tmp);
 
-			const files = fileURLToPath(new URL('./files', import.meta.url));
+			const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
 			const dirs = {
 				static: `${dir}/static`,
 				lambda: `${dir}/functions/node/render`
 			};
 
-			builder.log.minor('Prerendering static pages...');
-
-			const prerendered = await builder.prerender({
-				dest: `${dir}/static`
-			});
-
 			builder.log.minor('Generating serverless function...');
 
 			const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
 			builder.copy(files, tmp, {
 				replace: {
-					APP: `${relativePath}/app.js`,
+					SERVER: `${relativePath}/index.js`,
 					MANIFEST: './manifest.js'
 				}
 			});
@@ -139,34 +133,36 @@ export default function ({ external = [] } = {}) {
 
 			builder.writeStatic(dirs.static);
 			builder.writeClient(dirs.static);
+			builder.writePrerendered(dirs.static);
 
 			builder.log.minor('Writing routes...');
 
 			builder.mkdirp(`${dir}/config`);
 
-			const prerendered_routes = prerendered.paths
-				.map((path) => {
-					const file =
-						path === '/'
-							? '/index.html'
-							: path + (builder.trailingSlash === 'always' ? '/index.html' : '.html');
-
-					if (existsSync(`${dir}/static${file}`)) {
-						return {
-							src: path,
-							dest: file
-						};
-					}
+			const prerendered_pages = Array.from(builder.prerendered.pages, ([src, page]) => ({
+				src,
+				dest: page.file
+			}));
+
+			const prerendered_redirects = Array.from(
+				builder.prerendered.redirects,
+				([src, redirect]) => ({
+					src,
+					headers: {
+						Location: redirect.location
+					},
+					status: redirect.status
 				})
-				.filter(Boolean);
+			);
 
 			writeFileSync(
 				`${dir}/config/routes.json`,
 				JSON.stringify([
-					...redirects[builder.trailingSlash],
-					...prerendered_routes,
+					...redirects[builder.config.kit.trailingSlash],
+					...prerendered_pages,
+					...prerendered_redirects,
 					{
-						src: `/${builder.appDir}/.+`,
+						src: `/${builder.config.kit.appDir}/.+`,
 						headers: {
 							'cache-control': 'public, immutable, max-age=31536000'
 						}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "1.0.0-next.43",
+  "version": "1.0.0-next.46",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -25,11 +25,13 @@
     "esbuild": "^0.14.21"
   },
   "devDependencies": {
-    "@sveltejs/kit": "1.0.0-next.265"
+    "@sveltejs/kit": "1.0.0-next.293",
+    "typescript": "^4.6.2"
   },
   "scripts": {
     "lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
     "format": "npm run check-format -- --write",
-    "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
+    "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
+    "check": "tsc"
   }
 }

package/files/ambient.d.ts

@@ -1,8 +0,0 @@
-declare module 'APP' {
-	export { App } from '@sveltejs/kit';
-}
-
-declare module 'MANIFEST' {
-	import { SSRManifest } from '@sveltejs/kit';
-	export const manifest: SSRManifest;
-}