prerendering overhaul (#3858)

* add new Prerendered interface * rendered -> response * rename path/decoded_path to encoded/decoded, for clarity * tidy up * add some failing tests * tidy up * keep track of encoded vs decoded paths a bit better * handle encoded dependency paths * tidy up a bit * DRY out saving logic * change return value of prerender * switch to using prerendered.pages * i bet eslint is fun at parties * robustify/simplify logic * lint * dry out path normalizing logic * fix logic for excluding prerendered pages from manifest * fix * add prerendered.paths array * simplify * lint * oops
sveltejs · Feb 12, 2022 · 8fe3ea3 · 8fe3ea3
1 parent c13e113
commit 8fe3ea3
Show file tree

Hide file tree

Showing 22 changed files with 346 additions and 199 deletions.
diff --git a/packages/adapter-cloudflare-workers/files/entry.d.ts b/packages/adapter-cloudflare-workers/files/entry.d.ts
@@ -8,3 +8,10 @@ declare module 'MANIFEST' {
 	export const manifest: SSRManifest;
 	export const prerendered: Set<string>;
 }
+
+declare abstract class FetchEvent extends Event {
+	readonly request: Request;
+	respondWith(promise: Response | Promise<Response>): void;
+	passThroughOnException(): void;
+	waitUntil(promise: Promise<any>): void;
+}
diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js
@@ -13,7 +13,10 @@ export default function () {
 		async adapt(builder) {
 			const { site } = validate_config(builder);
 
-			const bucket = site.bucket;
+			// @ts-ignore
+			const { bucket } = site;
+
+			// @ts-ignore
 			const entrypoint = site['entry-point'] || 'workers-site';
 
 			const files = fileURLToPath(new URL('./files', import.meta.url));
@@ -23,9 +26,7 @@ export default function () {
 			builder.rimraf(entrypoint);
 
 			builder.log.info('Prerendering static pages...');
-			const { paths } = await builder.prerender({
-				dest: bucket
-			});
+			const prerendered = await builder.prerender({ dest: bucket });
 
 			builder.log.info('Installing worker dependencies...');
 			builder.copy(`${files}/_package.json`, `${tmp}/package.json`);
@@ -48,7 +49,7 @@ export default function () {
 				`${tmp}/manifest.js`,
 				`export const manifest = ${builder.generateManifest({
 					relativePath
-				})};\n\nexport const prerendered = new Set(${JSON.stringify(paths)});\n`
+				})};\n\nexport const prerendered = new Set(${JSON.stringify(prerendered.paths)});\n`
 			);
 
 			await esbuild.build({
@@ -80,6 +81,7 @@ function validate_config(builder) {
 			throw err;
 		}
 
+		// @ts-ignore
 		if (!wrangler_config.site || !wrangler_config.site.bucket) {
 			throw new Error(
 				'You must specify site.bucket in wrangler.toml. Consult https://developers.cloudflare.com/workers/platform/sites/configuration'

diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -32,7 +32,6 @@
 	},
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
-		"@cloudflare/workers-types": "^3.3.0",
 		"@sveltejs/kit": "workspace:*"
 	}
 }
diff --git a/packages/adapter-cloudflare-workers/tsconfig.json b/packages/adapter-cloudflare-workers/tsconfig.json
@@ -7,8 +7,7 @@
 		"target": "es2020",
 		"module": "es2020",
 		"moduleResolution": "node",
-		"allowSyntheticDefaultImports": true,
-		"types": ["@cloudflare/workers-types"]
+		"allowSyntheticDefaultImports": true
 	},
 	"include": ["./index.js", "files"]
 }
diff --git a/packages/adapter-cloudflare/files/worker.js b/packages/adapter-cloudflare/files/worker.js
@@ -6,6 +6,10 @@ const app = new App(manifest);
 const prefix = `/${manifest.appDir}/`;
 
 export default {
+	/**
+	 * @param {Request} req
+	 * @param {any} env
+	 */
 	async fetch(req, env) {
 		const url = new URL(req.url);
 

diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js
@@ -19,15 +19,15 @@ export default function (options = {}) {
 			builder.writeStatic(dest);
 			builder.writeClient(dest);
 
-			const { paths } = await builder.prerender({ dest });
+			const prerendered = await builder.prerender({ dest });
 
 			const relativePath = posix.relative(tmp, builder.getServerDirectory());
 
 			writeFileSync(
 				`${tmp}/manifest.js`,
 				`export const manifest = ${builder.generateManifest({
 					relativePath
-				})};\n\nexport const prerendered = new Set(${JSON.stringify(paths)});\n`
+				})};\n\nexport const prerendered = new Set(${JSON.stringify(prerendered.paths)});\n`
 			);
 
 			builder.copy(`${files}/worker.js`, `${tmp}/_worker.js`, {

diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/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';
@@ -144,27 +144,25 @@ export default function ({ external = [] } = {}) {
 
 			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
-						};
-					}
-				})
-				.filter(Boolean);
+			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_routes,
+					...prerendered_pages,
+					...prerendered_redirects,
 					{
 						src: `/${builder.appDir}/.+`,
 						headers: {

diff --git a/packages/kit/src/core/adapt/builder.js b/packages/kit/src/core/adapt/builder.js
@@ -14,11 +14,14 @@ import { generate_manifest } from '../generate_manifest/index.js';
  */
 export function create_builder({ cwd, config, build_data, log }) {
 	/** @type {Set<string>} */
-	const prerendered_paths = new Set();
+	let prerendered_paths;
+
 	let generated_manifest = false;
 
 	/** @param {import('types/internal').RouteData} route */
 	function not_prerendered(route) {
+		if (!prerendered_paths) return true;
+
 		if (route.type === 'page' && route.path) {
 			return !prerendered_paths.has(route.path);
 		}
@@ -163,10 +166,7 @@ export function create_builder({ cwd, config, build_data, log }) {
 				log
 			});
 
-			prerendered.paths.forEach((path) => {
-				prerendered_paths.add(path);
-				prerendered_paths.add(path + '/');
-			});
+			prerendered_paths = new Set(prerendered.paths);
 
 			return prerendered;
 		}