@sveltejs/kit 1.0.0-next.260 → 1.0.0-next.264

package/assets/client/start.js

@@ -189,8 +189,11 @@ class Router {
 			// Ignore if <a> has a target
 			if (a instanceof SVGAElement ? a.target.baseVal : a.target) return;
 
-			// Check if new url only differs by hash
-			if (url.href.split('#')[0] === location.href.split('#')[0]) {
+			// Check if new url only differs by hash and use the browser default behavior in that case
+			// This will ensure the `hashchange` event is fired
+			// Removing the hash does a full page navigation in the browser, so make sure a hash is present
+			const [base, hash] = url.href.split('#');
+			if (hash !== undefined && base === location.href.split('#')[0]) {
 				// Call `pushState` to add url to history so going back works.
 				// Also make a delay, otherwise the browser default behaviour would not kick in
 				setTimeout(() => history.pushState({}, '', url.href));
@@ -1266,11 +1269,14 @@ class Renderer {
 					let props = {};
 
 					if (has_shadow && i === a.length - 1) {
-						const res = await fetch(`${url.pathname}/__data.json`, {
-							headers: {
-								'x-sveltekit-noredirect': 'true'
+						const res = await fetch(
+							`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json`,
+							{
+								headers: {
+									'x-sveltekit-noredirect': 'true'
+								}
 							}
-						});
+						);
 
 						if (res.ok) {
 							const redirect = res.headers.get('x-sveltekit-location');
@@ -1458,10 +1464,6 @@ class Renderer {
  * }} opts
  */
 async function start({ paths, target, session, route, spa, trailing_slash, hydrate }) {
-	if (import.meta.env.DEV && !target) {
-		throw new Error('Missing target element. See https://kit.svelte.dev/docs#configuration-target');
-	}
-
 	const renderer = new Renderer({
 		Root,
 		fallback,

package/assets/server/index.js

@@ -7,12 +7,12 @@ function to_headers(object) {
 			const value = object[key];
 			if (!value) continue;
 
-			if (typeof value === 'string') {
-				headers.set(key, value);
-			} else {
+			if (Array.isArray(value)) {
 				value.forEach((value) => {
-					headers.append(key, value);
+					headers.append(key, /** @type {string} */ (value));
 				});
+			} else {
+				headers.set(key, /** @type {string} */ (value));
 			}
 		}
 	}
@@ -38,6 +38,16 @@ function hash(value) {
 }
 
 /** @param {Record<string, any>} obj */
+function lowercase_keys(obj) {
+	/** @type {Record<string, any>} */
+	const clone = {};
+
+	for (const key in obj) {
+		clone[key.toLowerCase()] = obj[key];
+	}
+
+	return clone;
+}
 
 /** @param {Record<string, string>} params */
 function decode_params(params) {
@@ -474,7 +484,16 @@ function coalesce_to_error(err) {
 }
 
 /** @type {Record<string, string>} */
-const escape_json_string_in_html_dict = {
+const escape_json_in_html_dict = {
+	'&': '\\u0026',
+	'>': '\\u003e',
+	'<': '\\u003c',
+	'\u2028': '\\u2028',
+	'\u2029': '\\u2029'
+};
+
+/** @type {Record<string, string>} */
+const escape_json_value_in_html_dict = {
 	'"': '\\"',
 	'<': '\\u003C',
 	'>': '\\u003E',
@@ -490,36 +509,30 @@ const escape_json_string_in_html_dict = {
 	'\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()}`
-	);
+/**
+ * Escape a stringified JSON object that's going to be embedded in a `<script>` tag
+ * @param {string} str
+ */
+function escape_json_in_html(str) {
+	// adapted from https://github.com/vercel/next.js/blob/694407450638b037673c6d714bfe4126aeded740/packages/next/server/htmlescape.ts
+	// based on https://github.com/zertosh/htmlescape
+	// License: https://github.com/zertosh/htmlescape/blob/0527ca7156a524d256101bb310a9f970f63078ad/LICENSE
+	return str.replace(/[&><\u2028\u2029]/g, (match) => escape_json_in_html_dict[match]);
 }
 
-/** @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">
- *
+ * Escape a string JSON value to be embedded into a `<script>` tag
  * @param {string} str
- * @returns string escaped string
  */
-function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+function escape_json_value_in_html(str) {
+	return escape(
+		str,
+		escape_json_value_in_html_dict,
+		(code) => `\\u${code.toString(16).toUpperCase()}`
+	);
 }
 
 /**
- *
  * @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
@@ -552,6 +565,25 @@ function escape(str, dict, unicode_encoder) {
 	return result;
 }
 
+/** @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};`) + '"';
+}
+
 const s = JSON.stringify;
 
 /** @param {URL} url */
@@ -1269,7 +1301,7 @@ async function render_response({
 
 			if (shadow_props) {
 				// prettier-ignore
-				body += `<script type="application/json" data-type="svelte-props">${s(shadow_props)}</script>`;
+				body += `<script type="application/json" data-type="svelte-props">${escape_json_in_html(s(shadow_props))}</script>`;
 			}
 		}
 
@@ -1714,7 +1746,7 @@ async function load_node({
 								fetched.push({
 									url: requested,
 									body: /** @type {string} */ (opts.body),
-									json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
+									json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_value_in_html(body)}"}`
 								});
 							}
 
@@ -1854,13 +1886,8 @@ async function load_shadow_data(route, event, prerender) {
 
 			if (result.fallthrough) return result;
 
-			const { status = 200, headers = {}, body = {} } = result;
-
-			validate_shadow_output(headers, body);
-
-			if (headers['set-cookie']) {
-				/** @type {string[]} */ (data.cookies).push(...headers['set-cookie']);
-			}
+			const { status, headers, body } = validate_shadow_output(result);
+			add_cookies(/** @type {string[]} */ (data.cookies), headers);
 
 			// Redirects are respected...
 			if (status >= 300 && status < 400) {
@@ -1884,13 +1911,8 @@ async function load_shadow_data(route, event, prerender) {
 
 			if (result.fallthrough) return result;
 
-			const { status = 200, headers = {}, body = {} } = result;
-
-			validate_shadow_output(headers, body);
-
-			if (headers['set-cookie']) {
-				/** @type {string[]} */ (data.cookies).push(...headers['set-cookie']);
-			}
+			const { status, headers, body } = validate_shadow_output(result);
+			add_cookies(/** @type {string[]} */ (data.cookies), headers);
 
 			if (status >= 400) {
 				return {
@@ -1921,19 +1943,42 @@ async function load_shadow_data(route, event, prerender) {
 }
 
 /**
- * @param {Headers | Partial<import('types/helper').ResponseHeaders>} headers
- * @param {import('types/helper').JSONValue} body
+ * @param {string[]} target
+ * @param {Partial<import('types/helper').ResponseHeaders>} headers
  */
-function validate_shadow_output(headers, body) {
-	if (headers instanceof Headers && headers.has('set-cookie')) {
-		throw new Error(
-			'Shadow endpoint request handler cannot use Headers interface with Set-Cookie headers'
-		);
+function add_cookies(target, headers) {
+	const cookies = headers['set-cookie'];
+	if (cookies) {
+		if (Array.isArray(cookies)) {
+			target.push(...cookies);
+		} else {
+			target.push(/** @type {string} */ (cookies));
+		}
+	}
+}
+
+/**
+ * @param {import('types/endpoint').ShadowEndpointOutput} result
+ */
+function validate_shadow_output(result) {
+	const { status = 200, body = {} } = result;
+	let headers = result.headers || {};
+
+	if (headers instanceof Headers) {
+		if (headers.has('set-cookie')) {
+			throw new Error(
+				'Shadow endpoint request handler cannot use Headers interface with Set-Cookie headers'
+			);
+		}
+	} else {
+		headers = lowercase_keys(/** @type {Record<string, string>} */ (headers));
 	}
 
 	if (!is_pojo(body)) {
 		throw new Error('Body returned from shadow endpoint request handler must be a plain object');
 	}
+
+	return { status, headers, body };
 }
 
 /**
@@ -2266,7 +2311,7 @@ function get_page_config(leaf, options) {
 	// TODO remove for 1.0
 	if ('ssr' in leaf) {
 		throw new Error(
-			'`export const ssr` has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'
+			'`export const ssr` has been removed — use the handle hook instead: https://kit.svelte.dev/docs/hooks#handle'
 		);
 	}
 
@@ -2437,7 +2482,7 @@ async function respond(request, options, state = {}) {
 				});
 			} else {
 				const verb = allowed.length === 0 ? 'enabled' : 'allowed';
-				const body = `${parameter}=${method_override} is not ${verb}. See https://kit.svelte.dev/docs#configuration-methodoverride`;
+				const body = `${parameter}=${method_override} is not ${verb}. See https://kit.svelte.dev/docs/configuration#methodoverride`;
 
 				return new Response(body, {
 					status: 400

package/dist/chunks/index.js

@@ -211,7 +211,7 @@ async function create_plugin(config, cwd) {
 						if (/** @type {any} */ (hooks).getContext) {
 							// TODO remove this for 1.0
 							throw new Error(
-								'The getContext hook has been removed. See https://kit.svelte.dev/docs#hooks'
+								'The getContext hook has been removed. See https://kit.svelte.dev/docs/hooks'
 							);
 						}
 

package/dist/chunks/index5.js

@@ -333,27 +333,7 @@ function crawl(html) {
 
 /** @type {Record<string, string>} */
 
-/** @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
@@ -386,6 +366,25 @@ function escape(str, dict, unicode_encoder) {
 	return result;
 }
 
+/** @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};`) + '"';
+}
+
 /**
  * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
  * @typedef {import('types/config').PrerenderOnErrorValue} OnError

package/dist/chunks/index7.js

@@ -15296,14 +15296,16 @@ async function make_package(config, cwd = process.cwd()) {
 		const svelte_ext = config.extensions.find((ext) => file.endsWith(ext)); // unlike `ext`, could be e.g. `.svelte.md`
 
 		if (!config.kit.package.files(normalized)) {
-			const dts_file = (svelte_ext ? file : file.slice(0, -ext.length)) + '.d.ts';
-			const dts_path = path.join(package_dir, dts_file);
-			if (fs.existsSync(dts_path)) {
-				fs.unlinkSync(dts_path);
-
-				const dir = path.dirname(dts_path);
-				if (fs.readdirSync(dir).length === 0) {
-					fs.rmdirSync(dir);
+			const base = svelte_ext ? file : file.slice(0, -ext.length);
+			for (const e of ['.d.ts', '.d.mts', '.d.cts']) {
+				const dts_path = path.join(package_dir, base + e);
+				if (fs.existsSync(dts_path)) {
+					fs.unlinkSync(dts_path);
+
+					const dir = path.dirname(dts_path);
+					if (fs.readdirSync(dir).length === 0) {
+						fs.rmdirSync(dir);
+					}
 				}
 			}
 			continue;
@@ -15573,7 +15575,7 @@ async function try_load_svelte2tsx() {
 			return await import('svelte2tsx');
 		} catch (e) {
 			throw new Error(
-				'You need svelte2tsx and typescript if you want to generate type definitions. Install it through your package manager, or disable generation which is highly discouraged. See https://kit.svelte.dev/docs#packaging'
+				'You need svelte2tsx and typescript if you want to generate type definitions. Install it through your package manager, or disable generation which is highly discouraged. See https://kit.svelte.dev/docs/packaging'
 			);
 		}
 	}

package/dist/cli.js

@@ -466,7 +466,7 @@ const options = object(
 						message += ', rather than the name of an adapter';
 					}
 
-					throw new Error(`${message}. See https://kit.svelte.dev/docs#adapters`);
+					throw new Error(`${message}. See https://kit.svelte.dev/docs/adapters`);
 				}
 
 				return input;
@@ -480,7 +480,7 @@ const options = object(
 				if (input) {
 					if (input.startsWith('/') || input.endsWith('/')) {
 						throw new Error(
-							"config.kit.appDir cannot start or end with '/'. See https://kit.svelte.dev/docs#configuration"
+							"config.kit.appDir cannot start or end with '/'. See https://kit.svelte.dev/docs/configuration"
 						);
 					}
 				} else {
@@ -589,7 +589,7 @@ const options = object(
 
 					if (input !== '' && (input.endsWith('/') || !input.startsWith('/'))) {
 						throw new Error(
-							`${keypath} option must be a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs#configuration-paths`
+							`${keypath} option must be a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
 						);
 					}
 
@@ -601,13 +601,13 @@ const options = object(
 					if (input) {
 						if (!/^[a-z]+:\/\//.test(input)) {
 							throw new Error(
-								`${keypath} option must be an absolute path, if specified. See https://kit.svelte.dev/docs#configuration-paths`
+								`${keypath} option must be an absolute path, if specified. See https://kit.svelte.dev/docs/configuration#paths`
 							);
 						}
 
 						if (input.endsWith('/')) {
 							throw new Error(
-								`${keypath} option must not end with '/'. See https://kit.svelte.dev/docs#configuration-paths`
+								`${keypath} option must not end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
 							);
 						}
 					}
@@ -681,7 +681,7 @@ const options = object(
 			// TODO remove this for 1.0
 			ssr: error(
 				(keypath) =>
-					`${keypath} has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'`
+					`${keypath} has been removed — use the handle hook instead: https://kit.svelte.dev/docs/hooks#handle'`
 			),
 
 			// TODO remove this for 1.0
@@ -904,7 +904,7 @@ async function load_config({ cwd = process.cwd() } = {}) {
 
 	if (!fs__default.existsSync(config_file)) {
 		throw new Error(
-			'You need to create a svelte.config.js file. See https://kit.svelte.dev/docs#configuration'
+			'You need to create a svelte.config.js file. See https://kit.svelte.dev/docs/configuration'
 		);
 	}
 
@@ -929,7 +929,7 @@ async function load_config({ cwd = process.cwd() } = {}) {
 function validate_config(config) {
 	if (typeof config !== 'object') {
 		throw new Error(
-			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs#configuration'
+			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs/configuration'
 		);
 	}
 
@@ -995,7 +995,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.260');
+const prog = sade('svelte-kit').version('1.0.0-next.264');
 
 prog
 	.command('dev')
@@ -1066,7 +1066,7 @@ prog
 
 			// prettier-ignore
 			console.log(
-				`See ${$.bold().cyan('https://kit.svelte.dev/docs#adapters')} to learn how to configure your app to run on the platform of your choosing`
+				`See ${$.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
 			);
 		} catch (error) {
 			handle_error(error);
@@ -1153,7 +1153,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.260'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.264'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.260",
+  "version": "1.0.0-next.264",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.32",
     "sade": "^1.7.4",
-    "vite": "^2.7.2"
+    "vite": "^2.8.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.17.1",

package/types/helper.d.ts

@@ -4,7 +4,7 @@ export type JSONObject = { [key: string]: JSONValue };
 export type JSONValue = string | number | boolean | null | ToJSON | JSONValue[] | JSONObject;
 
 /** `string[]` is only for set-cookie, everything else must be type of `string` */
-export type ResponseHeaders = Record<string, string | string[]>;
+export type ResponseHeaders = Record<string, string | number | string[]>;
 
 // <-- Utility Types -->
 type Only<T, U> = { [P in keyof T]: T[P] } & { [P in Exclude<keyof U, keyof T>]?: never };