@sveltejs/kit 1.0.0-next.237 → 1.0.0-next.240

package/assets/server/index.js

@@ -686,6 +686,12 @@ async function render_response({
 
 	const inlined_style = Array.from(styles.values()).join('\n');
 
+	if (state.prerender) {
+		if (maxage) {
+			head += `<meta http-equiv="cache-control" content="max-age=${maxage}">`;
+		}
+	}
+
 	if (options.amp) {
 		head += `
 		<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style>
@@ -1704,7 +1710,7 @@ async function respond(request, options, state = {}) {
 	let ssr = true;
 
 	try {
-		return await options.hooks.handle({
+		const response = await options.hooks.handle({
 			event,
 			resolve: async (event, opts) => {
 				if (opts && 'ssr' in opts) ssr = /** @type {boolean} */ (opts.ssr);
@@ -1800,6 +1806,13 @@ async function respond(request, options, state = {}) {
 				throw new Error('request in handle has been replaced with event' + details);
 			}
 		});
+
+		// TODO for 1.0, change the error message to point to docs rather than PR
+		if (response && !(response instanceof Response)) {
+			throw new Error('handle must return a Response object' + details);
+		}
+
+		return response;
 	} catch (/** @type {unknown} */ e) {
 		const error = coalesce_to_error(e);
 

package/dist/chunks/{http.js → build.js}

@@ -655,26 +655,4 @@ function sirv (dir, opts={}) {
 	};
 }
 
-/** @param {Partial<import('types/helper').ResponseHeaders> | undefined} object */
-function to_headers(object) {
-	const headers = new Headers();
-
-	if (object) {
-		for (const key in object) {
-			const value = object[key];
-			if (!value) continue;
-
-			if (typeof value === 'string') {
-				headers.set(key, value);
-			} else {
-				value.forEach((value) => {
-					headers.append(key, value);
-				});
-			}
-		}
-	}
-
-	return headers;
-}
-
-export { sirv as s, to_headers as t };
+export { sirv as s };

package/dist/chunks/index.js

@@ -5,11 +5,11 @@ import { c as create_manifest_data, a as create_app, d as deep_merge } from './i
 import { c as coalesce_to_error, S as SVELTE_KIT_ASSETS, r as resolve_entry, $, a as SVELTE_KIT, b as runtime, l as load_template, g as get_mime_lookup, d as copy_assets, e as get_aliases, p as print_config_conflicts } from '../cli.js';
 import fs__default from 'fs';
 import { URL as URL$1 } from 'url';
-import { t as to_headers, s as sirv } from './http.js';
+import { s as sirv } from './build.js';
+import { e as escape_html_attr, r as resolve, i as is_root_relative, a as escape_json_string_in_html } from './url.js';
 import { s } from './misc.js';
-import { r as resolve, i as is_root_relative } from './url.js';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { getRawBody, setResponse } from '../node.js';
+import { getRequest, setResponse } from '../node.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -23,6 +23,28 @@ import 'node:util';
 import 'node:url';
 import 'stream';
 
+/** @param {Partial<import('types/helper').ResponseHeaders> | undefined} object */
+function to_headers(object) {
+	const headers = new Headers();
+
+	if (object) {
+		for (const key in object) {
+			const value = object[key];
+			if (!value) continue;
+
+			if (typeof value === 'string') {
+				headers.set(key, value);
+			} else {
+				value.forEach((value) => {
+					headers.append(key, value);
+				});
+			}
+		}
+	}
+
+	return headers;
+}
+
 /**
  * Hash using djb2
  * @param {import('types/hooks').StrictBody} value
@@ -463,85 +485,6 @@ function writable(value, start = noop) {
     return { set, update, subscribe };
 }
 
-/** @type {Record<string, string>} */
-const escape_json_string_in_html_dict = {
-	'"': '\\"',
-	'<': '\\u003C',
-	'>': '\\u003E',
-	'/': '\\u002F',
-	'\\': '\\\\',
-	'\b': '\\b',
-	'\f': '\\f',
-	'\n': '\\n',
-	'\r': '\\r',
-	'\t': '\\t',
-	'\0': '\\0',
-	'\u2028': '\\u2028',
-	'\u2029': '\\u2029'
-};
-
-/** @param {string} str */
-function escape_json_string_in_html(str) {
-	return escape(
-		str,
-		escape_json_string_in_html_dict,
-		(code) => `\\u${code.toString(16).toUpperCase()}`
-	);
-}
-
-/** @type {Record<string, string>} */
-const escape_html_attr_dict = {
-	'<': '&lt;',
-	'>': '&gt;',
-	'"': '&quot;'
-};
-
-/**
- * use for escaping string values to be used html attributes on the page
- * e.g.
- * <script data-url="here">
- *
- * @param {string} str
- * @returns string escaped string
- */
-function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
-}
-
-/**
- *
- * @param str {string} string to escape
- * @param dict {Record<string, string>} dictionary of character replacements
- * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
- * @returns {string}
- */
-function escape(str, dict, unicode_encoder) {
-	let result = '';
-
-	for (let i = 0; i < str.length; i += 1) {
-		const char = str.charAt(i);
-		const code = char.charCodeAt(0);
-
-		if (char in dict) {
-			result += dict[char];
-		} else if (code >= 0xd800 && code <= 0xdfff) {
-			const next = str.charCodeAt(i + 1);
-
-			// If this is the beginning of a [high, low] surrogate pair,
-			// add the next two characters, otherwise escape
-			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
-				result += char + str[++i];
-			} else {
-				result += unicode_encoder(code);
-			}
-		} else {
-			result += char;
-		}
-	}
-
-	return result;
-}
-
 /** @param {URL} url */
 function create_prerendering_url_proxy(url) {
 	return new Proxy(url, {
@@ -676,6 +619,12 @@ async function render_response({
 
 	const inlined_style = Array.from(styles.values()).join('\n');
 
+	if (state.prerender) {
+		if (maxage) {
+			head += `<meta http-equiv="cache-control" content="max-age=${maxage}">`;
+		}
+	}
+
 	if (options.amp) {
 		head += `
 		<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style>
@@ -1655,7 +1604,7 @@ async function respond(request, options, state = {}) {
 	let ssr = true;
 
 	try {
-		return await options.hooks.handle({
+		const response = await options.hooks.handle({
 			event,
 			resolve: async (event, opts) => {
 				if (opts && 'ssr' in opts) ssr = /** @type {boolean} */ (opts.ssr);
@@ -1751,6 +1700,13 @@ async function respond(request, options, state = {}) {
 				throw new Error('request in handle has been replaced with event' + details);
 			}
 		});
+
+		// TODO for 1.0, change the error message to point to docs rather than PR
+		if (response && !(response instanceof Response)) {
+			throw new Error('handle must return a Response object' + details);
+		}
+
+		return response;
 	} catch (/** @type {unknown} */ e) {
 		const error = coalesce_to_error(e);
 
@@ -1907,11 +1863,9 @@ async function create_plugin(config, cwd) {
 						if (!req.url || !req.method) throw new Error('Incomplete request');
 						if (req.url === '/favicon.ico') return not_found(res);
 
-						const url = new URL$1(
-							`${vite.config.server.https ? 'https' : 'http'}://${req.headers.host}${req.url}`
-						);
+						const base = `${vite.config.server.https ? 'https' : 'http'}://${req.headers.host}`;
 
-						const decoded = decodeURI(url.pathname);
+						const decoded = decodeURI(new URL$1(base + req.url).pathname);
 
 						if (decoded.startsWith(assets)) {
 							const pathname = decoded.slice(assets.length);
@@ -1971,75 +1925,70 @@ async function create_plugin(config, cwd) {
 							assets
 						});
 
-						let body;
+						let request;
 
 						try {
-							body = await getRawBody(req);
+							request = await getRequest(base, req);
 						} catch (/** @type {any} */ err) {
 							res.statusCode = err.status || 400;
 							return res.end(err.reason || 'Invalid request body');
 						}
 
-						const rendered = await respond(
-							new Request(url.href, {
-								headers: /** @type {Record<string, string>} */ (req.headers),
-								method: req.method,
-								body
-							}),
-							{
-								amp: config.kit.amp,
-								dev: true,
-								floc: config.kit.floc,
-								get_stack: (error) => {
-									vite.ssrFixStacktrace(error);
-									return error.stack;
-								},
-								handle_error: (error, event) => {
-									vite.ssrFixStacktrace(error);
-									hooks.handleError({
-										error,
-										event,
-
-										// TODO remove for 1.0
-										// @ts-expect-error
-										get request() {
-											throw new Error(
-												'request in handleError has been replaced with event. See https://github.com/sveltejs/kit/pull/3384 for details'
-											);
-										}
-									});
-								},
-								hooks,
-								hydrate: config.kit.hydrate,
-								manifest,
-								method_override: config.kit.methodOverride,
-								paths: {
-									base: config.kit.paths.base,
-									assets
-								},
-								prefix: '',
-								prerender: config.kit.prerender.enabled,
-								read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
-								root,
-								router: config.kit.router,
-								target: config.kit.target,
-								template: ({ head, body, assets }) => {
-									let rendered = load_template(cwd, config)
-										.replace('%svelte.head%', () => head)
-										.replace('%svelte.body%', () => body)
-										.replace(/%svelte\.assets%/g, assets);
-
-									if (amp) {
-										const result = amp.validateString(rendered);
-
-										if (result.status !== 'PASS') {
-											const lines = rendered.split('\n');
-
-											/** @param {string} str */
-											const escape = (str) =>
-												str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-											rendered = `<!doctype html>
+						const rendered = await respond(request, {
+							amp: config.kit.amp,
+							dev: true,
+							floc: config.kit.floc,
+							get_stack: (error) => {
+								vite.ssrFixStacktrace(error);
+								return error.stack;
+							},
+							handle_error: (error, event) => {
+								vite.ssrFixStacktrace(error);
+								hooks.handleError({
+									error,
+									event,
+
+									// TODO remove for 1.0
+									// @ts-expect-error
+									get request() {
+										throw new Error(
+											'request in handleError has been replaced with event. See https://github.com/sveltejs/kit/pull/3384 for details'
+										);
+									}
+								});
+							},
+							hooks,
+							hydrate: config.kit.hydrate,
+							manifest,
+							method_override: config.kit.methodOverride,
+							paths: {
+								base: config.kit.paths.base,
+								assets
+							},
+							prefix: '',
+							prerender: config.kit.prerender.enabled,
+							read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
+							root,
+							router: config.kit.router,
+							target: config.kit.target,
+							template: ({ head, body, assets }) => {
+								let rendered = load_template(cwd, config)
+									.replace(/%svelte\.assets%/g, assets)
+									// head and body must be replaced last, in case someone tries to sneak in %svelte.assets% etc
+									.replace('%svelte.head%', () => head)
+									.replace('%svelte.body%', () => body);
+
+								if (amp) {
+									const result = amp.validateString(rendered);
+
+									if (result.status !== 'PASS') {
+										const lines = rendered.split('\n');
+
+										/** @param {string} str */
+										const escape = (str) =>
+											str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+										rendered = `<!doctype html>
 										<head>
 											<meta charset="utf-8" />
 											<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -2070,14 +2019,13 @@ async function create_plugin(config, cwd) {
 											)
 											.join('\n\n')}
 									`;
-										}
 									}
+								}
 
-									return rendered;
-								},
-								trailing_slash: config.kit.trailingSlash
-							}
-						);
+								return rendered;
+							},
+							trailing_slash: config.kit.trailingSlash
+						});
 
 						if (rendered) {
 							setResponse(res, rendered);

package/dist/chunks/index5.js

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { r as resolve$1, i as is_root_relative } from './url.js';
+import { e as escape_html_attr, r as resolve$1, i as is_root_relative } from './url.js';
 import { g as generate_manifest } from './index4.js';
 import 'sade';
 import 'child_process';
@@ -414,8 +414,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	async function visit(path, decoded_path, referrer) {
 		/** @type {Map<string, Response>} */
 		const dependencies = new Map();
+		const render_path = config.kit.paths?.base
+			? `http://sveltekit-prerender${config.kit.paths.base}${path === '/' ? '' : path}`
+			: `http://sveltekit-prerender${path}`;
 
-		const rendered = await app.render(new Request(`http://sveltekit-prerender${path}`), {
+		const rendered = await app.render(new Request(render_path), {
 			prerender: {
 				all,
 				dependencies
@@ -441,7 +444,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 					mkdirp(dirname(file));
 
 					log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
-					writeFileSync(file, `<meta http-equiv="refresh" content="0;url=${encodeURI(location)}">`);
+
+					writeFileSync(
+						file,
+						`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
+					);
 
 					const resolved = resolve$1(path, location);
 					if (is_root_relative(resolved)) {

package/dist/chunks/index6.js

@@ -2,9 +2,9 @@ import fs__default from 'fs';
 import http from 'http';
 import https from 'https';
 import { resolve, join } from 'path';
-import { s as sirv, t as to_headers } from './http.js';
+import { s as sirv } from './build.js';
 import { pathToFileURL } from 'url';
-import { getRawBody } from '../node.js';
+import { getRequest, setResponse } from '../node.js';
 import { __fetch_polyfill } from '../install-fetch.js';
 import { a as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
 import 'querystring';
@@ -91,32 +91,21 @@ async function preview({
 		const initial_url = req.url;
 
 		const render_handler = async () => {
-			if (!req.method) throw new Error('Incomplete request');
-
-			let body;
-
-			try {
-				body = await getRawBody(req);
-			} catch (/** @type {any} */ err) {
-				res.statusCode = err.status || 400;
-				return res.end(err.reason || 'Invalid request body');
-			}
-
 			if (initial_url.startsWith(config.kit.paths.base)) {
 				const protocol = use_https ? 'https' : 'http';
 				const host = req.headers['host'];
 
-				const rendered = await app.render(
-					new Request(`${protocol}://${host}${initial_url}`, {
-						method: req.method,
-						headers: to_headers(req.headers),
-						body
-					})
-				);
-
-				res.writeHead(rendered.status, Object.fromEntries(rendered.headers));
-				if (rendered.body) res.write(new Uint8Array(await rendered.arrayBuffer()));
-				res.end();
+				let request;
+
+				try {
+					req.url = initial_url;
+					request = await getRequest(`${protocol}://${host}`, req);
+				} catch (/** @type {any} */ err) {
+					res.statusCode = err.status || 400;
+					return res.end(err.reason || 'Invalid request body');
+				}
+
+				setResponse(res, await app.render(request));
 			} else {
 				res.statusCode = 404;
 				res.end('Not found');

package/dist/chunks/url.js

@@ -1,3 +1,82 @@
+/** @type {Record<string, string>} */
+const escape_json_string_in_html_dict = {
+	'"': '\\"',
+	'<': '\\u003C',
+	'>': '\\u003E',
+	'/': '\\u002F',
+	'\\': '\\\\',
+	'\b': '\\b',
+	'\f': '\\f',
+	'\n': '\\n',
+	'\r': '\\r',
+	'\t': '\\t',
+	'\0': '\\0',
+	'\u2028': '\\u2028',
+	'\u2029': '\\u2029'
+};
+
+/** @param {string} str */
+function escape_json_string_in_html(str) {
+	return escape(
+		str,
+		escape_json_string_in_html_dict,
+		(code) => `\\u${code.toString(16).toUpperCase()}`
+	);
+}
+
+/** @type {Record<string, string>} */
+const escape_html_attr_dict = {
+	'<': '&lt;',
+	'>': '&gt;',
+	'"': '&quot;'
+};
+
+/**
+ * use for escaping string values to be used html attributes on the page
+ * e.g.
+ * <script data-url="here">
+ *
+ * @param {string} str
+ * @returns string escaped string
+ */
+function escape_html_attr(str) {
+	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+}
+
+/**
+ *
+ * @param str {string} string to escape
+ * @param dict {Record<string, string>} dictionary of character replacements
+ * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
+ * @returns {string}
+ */
+function escape(str, dict, unicode_encoder) {
+	let result = '';
+
+	for (let i = 0; i < str.length; i += 1) {
+		const char = str.charAt(i);
+		const code = char.charCodeAt(0);
+
+		if (char in dict) {
+			result += dict[char];
+		} else if (code >= 0xd800 && code <= 0xdfff) {
+			const next = str.charCodeAt(i + 1);
+
+			// If this is the beginning of a [high, low] surrogate pair,
+			// add the next two characters, otherwise escape
+			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
+				result += char + str[++i];
+			} else {
+				result += unicode_encoder(code);
+			}
+		} else {
+			result += char;
+		}
+	}
+
+	return result;
+}
+
 const absolute = /^([a-z]+:)?\/?\//;
 const scheme = /^[a-z]+:/;
 
@@ -37,4 +116,4 @@ function is_root_relative(path) {
 	return path[0] === '/' && path[1] !== '/';
 }
 
-export { is_root_relative as i, resolve as r };
+export { escape_json_string_in_html as a, escape_html_attr as e, is_root_relative as i, resolve as r };

package/dist/cli.js

@@ -933,7 +933,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.237');
+const prog = sade('svelte-kit').version('1.0.0-next.240');
 
 prog
 	.command('dev')
@@ -1085,7 +1085,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.237'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.240'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/node.js

@@ -1,7 +1,7 @@
 import { Readable } from 'stream';
 
 /** @type {import('@sveltejs/kit/node').GetRawBody} */
-function getRawBody(req) {
+function get_raw_body(req) {
 	return new Promise((fulfil, reject) => {
 		const h = req.headers;
 
@@ -55,13 +55,21 @@ async function getRequest(base, req) {
 	return new Request(base + req.url, {
 		method: req.method,
 		headers: /** @type {Record<string, string>} */ (req.headers),
-		body: await getRawBody(req)
+		body: await get_raw_body(req) // TODO stream rather than buffer
 	});
 }
 
 /** @type {import('@sveltejs/kit/node').SetResponse} */
 async function setResponse(res, response) {
-	res.writeHead(response.status, Object.fromEntries(response.headers));
+	/** @type {import('../types/helper').ResponseHeaders} */
+	const headers = Object.fromEntries(response.headers);
+
+	if (response.headers.has('set-cookie')) {
+		// @ts-expect-error (headers.raw() is non-standard)
+		headers['set-cookie'] = response.headers.raw()['set-cookie'];
+	}
+
+	res.writeHead(response.status, headers);
 
 	if (response.body instanceof Readable) {
 		response.body.pipe(res);
@@ -74,4 +82,4 @@ async function setResponse(res, response) {
 	}
 }
 
-export { getRawBody, getRequest, setResponse };
+export { getRequest, setResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.237",
+  "version": "1.0.0-next.240",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -79,11 +79,13 @@
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components",
     "dev": "rollup -cw",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
-    "check": "tsc && svelte-check --ignore \"src/packaging/test\"",
+    "check": "tsc && svelte-check --ignore test/prerendering,src/packaging/test",
     "format": "npm run check-format -- --write",
     "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-    "test": "npm run test:unit && npm run test:packaging && npm run test:integration",
+    "test": "npm run test:unit && npm run test:packaging && npm run test:prerendering && npm run test:integration",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
+    "test:prerendering": "pnpm test:prerendering:basics",
+    "test:prerendering:basics": "cd test/prerendering/basics && pnpm test",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
     "test:integration:amp": "cd test/apps/amp && pnpm test",