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

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');

package/assets/server/index.js

@@ -474,8 +474,7 @@ function coalesce_to_error(err) {
 }
 
 /** @type {Record<string, string>} */
-const escape_json_string_in_html_dict = {
-	'"': '\\"',
+const escape_json_in_html_dict = {
 	'<': '\\u003C',
 	'>': '\\u003E',
 	'/': '\\u002F',
@@ -490,7 +489,24 @@ const escape_json_string_in_html_dict = {
 	'\u2029': '\\u2029'
 };
 
-/** @param {string} str */
+/** @type {Record<string, string>} */
+const escape_json_string_in_html_dict = {
+	'"': '\\"',
+	...escape_json_in_html_dict
+};
+
+/**
+ * Escape a stringified JSON object that's going to be embedded in a `<script>` tag
+ * @param {string} str
+ */
+function escape_json_in_html(str) {
+	return escape(str, escape_json_in_html_dict, (code) => `\\u${code.toString(16).toUpperCase()}`);
+}
+
+/**
+ * Escape a string JSON value to be embedded into a `<script>` tag
+ * @param {string} str
+ */
 function escape_json_string_in_html(str) {
 	return escape(
 		str,
@@ -1269,7 +1285,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>`;
 			}
 		}
 

package/dist/cli.js

@@ -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.261');
 
 prog
 	.command('dev')
@@ -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.261'}\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.261",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",