@sveltejs/kit 1.0.0-next.230 → 1.0.0-next.234

package/dist/chunks/index2.js

@@ -1,7 +1,7 @@
 import fs__default from 'fs';
 import path__default from 'path';
 import { s } from './misc.js';
-import { m as mkdirp, a as runtime, f as posixify } from '../cli.js';
+import { m as mkdirp, b as runtime, f as posixify } from '../cli.js';
 
 /**
  * Takes zero or more objects and returns a new object that has all the values

package/dist/chunks/index3.js

@@ -1,6 +1,6 @@
 import fs__default from 'fs';
 import path__default from 'path';
-import { p as print_config_conflicts, S as SVELTE_KIT, d as copy_assets, f as posixify, e as get_aliases, r as resolve_entry, a as runtime, l as load_template, m as mkdirp, h as rimraf } from '../cli.js';
+import { p as print_config_conflicts, a as SVELTE_KIT, d as copy_assets, f as posixify, e as get_aliases, r as resolve_entry, b as runtime, l as load_template, m as mkdirp, h as rimraf } from '../cli.js';
 import { d as deep_merge, a as create_app, c as create_manifest_data } from './index2.js';
 import { g as generate_manifest } from './index4.js';
 import vite from 'vite';
@@ -268,7 +268,7 @@ set_paths(${s(config.kit.paths)});
 // named imports without triggering Rollup's missing import detection
 const get_hooks = hooks => ({
 	getSession: hooks.getSession || (() => ({})),
-	handle: hooks.handle || (({ request, resolve }) => resolve(request)),
+	handle: hooks.handle || (({ event, resolve }) => resolve(event)),
 	handleError: hooks.handleError || (({ error }) => console.error(error.stack)),
 	externalFetch: hooks.externalFetch || fetch
 });
@@ -293,8 +293,17 @@ export class App {
 			dev: false,
 			floc: ${config.kit.floc},
 			get_stack: error => String(error), // for security
-			handle_error: (error, request) => {
-				hooks.handleError({ error, request });
+			handle_error: (error, event) => {
+				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');
+					}
+				});
 				error.stack = this.options.get_stack(error);
 			},
 			hooks,
@@ -317,25 +326,11 @@ export class App {
 	render(request, {
 		prerender
 	} = {}) {
-		// TODO remove this for 1.0
-		if (Object.keys(request).sort().join() !== 'headers,method,rawBody,url') {
-			throw new Error('Adapters should call app.render({ url, method, headers, rawBody })');
+		if (!(request instanceof Request)) {
+			throw new Error('The first argument to app.render must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
 		}
 
-		const host = ${
-			config.kit.host
-				? s(config.kit.host)
-				: `request.headers[${s(config.kit.headers.host || 'host')}]`
-		};
-		const protocol = ${
-			config.kit.protocol
-				? s(config.kit.protocol)
-				: config.kit.headers.protocol
-				? `request.headers[${s(config.kit.headers.protocol)}] || default_protocol`
-				: 'default_protocol'
-		};
-
-		return respond({ ...request, url: new URL(request.url, protocol + '://' + host) }, this.options, { prerender });
+		return respond(request, this.options, { prerender });
 	}
 }
 `;

package/dist/chunks/index5.js

@@ -1,9 +1,9 @@
-import { m as mkdirp, S as SVELTE_KIT, h as rimraf, i as copy, $, j as logger } from '../cli.js';
+import { m as mkdirp, a as SVELTE_KIT, h as rimraf, i as copy, $, j as logger } from '../cli.js';
 import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { g as get_single_valued_header, r as resolve$1, i as is_root_relative } from './url.js';
+import { 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';
@@ -412,28 +412,19 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	 * @param {string?} referrer
 	 */
 	async function visit(path, decoded_path, referrer) {
-		/** @type {Map<string, import('types/hooks').ServerResponse>} */
+		/** @type {Map<string, Response>} */
 		const dependencies = new Map();
 
-		const rendered = await app.render(
-			{
-				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}${path}`,
-				method: 'GET',
-				headers: {},
-				rawBody: null
-			},
-			{
-				prerender: {
-					all,
-					dependencies
-				}
+		const rendered = await app.render(new Request(`http://sveltekit-prerender${path}`), {
+			prerender: {
+				all,
+				dependencies
 			}
-		);
+		});
 
 		if (rendered) {
 			const response_type = Math.floor(rendered.status / 100);
-			const headers = rendered.headers;
-			const type = headers && headers['content-type'];
+			const type = rendered.headers.get('content-type');
 			const is_html = response_type === REDIRECT || type === 'text/html';
 
 			const parts = decoded_path.split('/');
@@ -444,7 +435,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			const file = `${out}${parts.join('/')}`;
 
 			if (response_type === REDIRECT) {
-				const location = get_single_valued_header(headers, 'location');
+				const location = rendered.headers.get('location');
 
 				if (location) {
 					mkdirp(dirname(file));
@@ -463,20 +454,22 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				return;
 			}
 
+			const text = await rendered.text();
+
 			if (rendered.status === 200) {
 				mkdirp(dirname(file));
 
 				log.info(`${rendered.status} ${decoded_path}`);
-				writeFileSync(file, rendered.body || '');
+				writeFileSync(file, text);
 				paths.push(normalize(decoded_path));
 			} else if (response_type !== OK) {
 				error({ status: rendered.status, path, referrer, referenceType: 'linked' });
 			}
 
-			dependencies.forEach((result, dependency_path) => {
+			for (const [dependency_path, result] of dependencies) {
 				const response_type = Math.floor(result.status / 100);
 
-				const is_html = result.headers['content-type'] === 'text/html';
+				const is_html = result.headers.get('content-type') === 'text/html';
 
 				const parts = dependency_path.split('/');
 				if (is_html && parts[parts.length - 1] !== 'index.html') {
@@ -487,7 +480,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				mkdirp(dirname(file));
 
 				if (result.body) {
-					writeFileSync(file, result.body);
+					writeFileSync(file, await result.text());
 					paths.push(dependency_path);
 				}
 
@@ -501,17 +494,23 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 						referenceType: 'fetched'
 					});
 				}
-			});
+			}
 
 			if (is_html && config.kit.prerender.crawl) {
-				for (const href of crawl(/** @type {string} */ (rendered.body))) {
-					if (href.startsWith('data:')) continue;
+				for (const href of crawl(text)) {
+					if (href.startsWith('data:') || href.startsWith('#')) continue;
 
 					const resolved = resolve$1(path, href);
 					if (!is_root_relative(resolved)) continue;
 
 					const parsed = new URL(resolved, 'http://localhost');
-					const pathname = decodeURI(parsed.pathname).replace(config.kit.paths.base, '');
+
+					let pathname = decodeURI(parsed.pathname);
+
+					if (config.kit.paths.base) {
+						if (!pathname.startsWith(config.kit.paths.base)) continue;
+						pathname = pathname.slice(config.kit.paths.base.length) || '/';
+					}
 
 					const file = pathname.slice(1);
 					if (files.has(file)) continue;
@@ -539,25 +538,17 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	}
 
 	if (fallback) {
-		const rendered = await app.render(
-			{
-				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}/[fallback]`,
-				method: 'GET',
-				headers: {},
-				rawBody: null
-			},
-			{
-				prerender: {
-					fallback,
-					all: false,
-					dependencies: new Map()
-				}
+		const rendered = await app.render(new Request('http://sveltekit-prerender/[fallback]'), {
+			prerender: {
+				fallback,
+				all: false,
+				dependencies: new Map()
 			}
-		);
+		});
 
 		const file = join(out, fallback);
 		mkdirp(dirname(file));
-		writeFileSync(file, rendered.body || '');
+		writeFileSync(file, await rendered.text());
 	}
 
 	return {