@sveltejs/kit 1.16.0 → 1.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",

package/src/exports/vite/index.js

@@ -525,6 +525,12 @@ function kit({ svelte_config }) {
 				} else {
 					input['entry/start'] = `${runtime_directory}/client/start.js`;
 					input['entry/app'] = `${kit.outDir}/generated/client-optimized/app.js`;
+
+					manifest_data.nodes.forEach((node, i) => {
+						if (node.component || node.universal) {
+							input[`nodes/${i}`] = `${kit.outDir}/generated/client-optimized/nodes/${i}.js`;
+						}
+					});
 				}
 
 				// see the kit.output.preloadStrategy option for details on why we have multiple options here

package/src/runtime/client/client.js

@@ -171,6 +171,9 @@ export function create_client(app, target) {
 			if (navigation_result.type === 'redirect') {
 				return goto(new URL(navigation_result.location, url).href, {}, [url.pathname], nav_token);
 			} else {
+				if (navigation_result.props.page !== undefined) {
+					page = navigation_result.props.page;
+				}
 				root.$set(navigation_result.props);
 			}
 		}
@@ -1122,7 +1125,7 @@ export function create_client(app, target) {
 			document.activeElement !== document.body;
 
 		if (!keepfocus && !changed_focus) {
-			await reset_focus();
+			reset_focus();
 		}
 
 		autoscroll = true;
@@ -1132,6 +1135,11 @@ export function create_client(app, target) {
 		}
 
 		navigating = false;
+
+		if (type === 'popstate') {
+			restore_snapshot(current_history_index);
+		}
+
 		callbacks.after_navigate.forEach((fn) =>
 			fn(/** @type {import('types').AfterNavigate} */ (navigation))
 		);
@@ -1635,7 +1643,6 @@ export function create_client(app, target) {
 					}
 
 					const delta = event.state[INDEX_KEY] - current_history_index;
-					let blocked = false;
 
 					await navigate({
 						url: new URL(location.href),
@@ -1648,15 +1655,10 @@ export function create_client(app, target) {
 						},
 						blocked: () => {
 							history.go(-delta);
-							blocked = true;
 						},
 						type: 'popstate',
 						delta
 					});
-
-					if (!blocked) {
-						restore_snapshot(current_history_index);
-					}
 				}
 			});
 
@@ -1737,14 +1739,30 @@ export function create_client(app, target) {
 					});
 				});
 
+				/** @type {Array<import('./types').BranchNode | undefined>} */
+				const branch = await Promise.all(branch_promises);
+
+				const parsed_route = routes.find(({ id }) => id === route.id);
+
+				// server-side will have compacted the branch, reinstate empty slots
+				// so that error boundaries can be lined up correctly
+				if (parsed_route) {
+					const layouts = parsed_route.layouts;
+					for (let i = 0; i < layouts.length; i++) {
+						if (!layouts[i]) {
+							branch.splice(i, 0, undefined);
+						}
+					}
+				}
+
 				result = await get_navigation_result_from_branch({
 					url,
 					params,
-					branch: await Promise.all(branch_promises),
+					branch,
 					status,
 					error,
 					form,
-					route: routes.find(({ id }) => id === route.id) ?? null
+					route: parsed_route ?? null
 				});
 			} catch (error) {
 				if (error instanceof Redirect) {
@@ -1899,12 +1917,44 @@ function reset_focus() {
 			root.removeAttribute('tabindex');
 		}
 
-		return new Promise((resolve) => {
+		// capture current selection, so we can compare the state after
+		// snapshot restoration and afterNavigate callbacks have run
+		const selection = getSelection();
+
+		if (selection && selection.type !== 'None') {
+			/** @type {Range[]} */
+			const ranges = [];
+
+			for (let i = 0; i < selection.rangeCount; i += 1) {
+				ranges.push(selection.getRangeAt(i));
+			}
+
 			setTimeout(() => {
+				if (selection.rangeCount !== ranges.length) return;
+
+				for (let i = 0; i < selection.rangeCount; i += 1) {
+					const a = ranges[i];
+					const b = selection.getRangeAt(i);
+
+					// we need to do a deep comparison rather than just `a !== b` because
+					// Safari behaves differently to other browsers
+					if (
+						a.commonAncestorContainer !== b.commonAncestorContainer ||
+						a.startContainer !== b.startContainer ||
+						a.endContainer !== b.endContainer ||
+						a.startOffset !== b.startOffset ||
+						a.endOffset !== b.endOffset
+					) {
+						return;
+					}
+				}
+
+				// if the selection hasn't changed (as a result of an element being (auto)focused,
+				// or a programmatic selection, we reset everything as part of the navigation)
 				// fixes https://github.com/sveltejs/kit/issues/8439
-				resolve(getSelection()?.removeAllRanges());
+				selection.removeAllRanges();
 			});
-		});
+		}
 	}
 }
 

package/src/utils/url.js

@@ -93,9 +93,15 @@ export function decode_uri(uri) {
 /**
  * URL properties that could change during the lifetime of the page,
  * which excludes things like `origin`
- * @type {Array<keyof URL>}
  */
-const tracked_url_properties = ['href', 'pathname', 'search', 'searchParams', 'toString', 'toJSON'];
+const tracked_url_properties = /** @type {const} */ ([
+	'href',
+	'pathname',
+	'search',
+	'searchParams',
+	'toString',
+	'toJSON'
+]);
 
 /**
  * @param {URL} url
@@ -105,12 +111,10 @@ export function make_trackable(url, callback) {
 	const tracked = new URL(url);
 
 	for (const property of tracked_url_properties) {
-		let value = tracked[property];
-
 		Object.defineProperty(tracked, property, {
 			get() {
 				callback();
-				return value;
+				return url[property];
 			},
 
 			enumerable: true,