@sveltejs/kit 1.0.0-next.196 → 1.0.0-next.197

package/assets/runtime/internal/start.js

@@ -656,48 +656,43 @@ class Renderer {
 			this._init(navigation_result);
 		}
 
-		getSelection()?.removeAllRanges();
+		const { hash, scroll, keepfocus } = opts || {};
 
-		if (!opts) {
-			await 0;
-		} else {
-			const { hash, scroll, keepfocus } = opts;
-
-			if (!keepfocus) {
-				document.body.focus();
-			}
+		if (!keepfocus) {
+			getSelection()?.removeAllRanges();
+			document.body.focus();
+		}
 
-			const old_page_y_offset = Math.round(pageYOffset);
-			const old_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
-
-			await 0;
-
-			const new_page_y_offset = Math.round(pageYOffset);
-			const new_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
-
-			// After `await 0`, the `onMount()` function in the component executed.
-			// Check if no scrolling happened on mount.
-			const no_scroll_happened =
-				// In most cases, we can compare whether `pageYOffset` changed between navigation
-				new_page_y_offset === Math.min(old_page_y_offset, new_max_page_y_offset) ||
-				// But if the page is scrolled to/near the bottom, the browser would also scroll
-				// to/near the bottom of the new page on navigation. Since we can't detect when this
-				// behaviour happens, we naively compare by the y offset from the bottom of the page.
-				old_max_page_y_offset - old_page_y_offset === new_max_page_y_offset - new_page_y_offset;
-
-			// If there was no scrolling, we run on our custom scroll handling
-			if (no_scroll_happened) {
-				const deep_linked = hash && document.getElementById(hash.slice(1));
-				if (scroll) {
-					scrollTo(scroll.x, scroll.y);
-				} else if (deep_linked) {
-					// Here we use `scrollIntoView` on the element instead of `scrollTo`
-					// because it natively supports the `scroll-margin` and `scroll-behavior`
-					// CSS properties.
-					deep_linked.scrollIntoView();
-				} else {
-					scrollTo(0, 0);
-				}
+		const old_page_y_offset = Math.round(pageYOffset);
+		const old_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
+
+		await 0;
+
+		const new_page_y_offset = Math.round(pageYOffset);
+		const new_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
+
+		// After `await 0`, the `onMount()` function in the component executed.
+		// Check if no scrolling happened on mount.
+		const no_scroll_happened =
+			// In most cases, we can compare whether `pageYOffset` changed between navigation
+			new_page_y_offset === Math.min(old_page_y_offset, new_max_page_y_offset) ||
+			// But if the page is scrolled to/near the bottom, the browser would also scroll
+			// to/near the bottom of the new page on navigation. Since we can't detect when this
+			// behaviour happens, we naively compare by the y offset from the bottom of the page.
+			old_max_page_y_offset - old_page_y_offset === new_max_page_y_offset - new_page_y_offset;
+
+		// If there was no scrolling, we run on our custom scroll handling
+		if (no_scroll_happened) {
+			const deep_linked = hash && document.getElementById(hash.slice(1));
+			if (scroll) {
+				scrollTo(scroll.x, scroll.y);
+			} else if (deep_linked) {
+				// Here we use `scrollIntoView` on the element instead of `scrollTo`
+				// because it natively supports the `scroll-margin` and `scroll-behavior`
+				// CSS properties.
+				deep_linked.scrollIntoView();
+			} else {
+				scrollTo(0, 0);
 			}
 		}
 

package/dist/cli.js

@@ -817,7 +817,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.196');
+const prog = sade('svelte-kit').version('1.0.0-next.197');
 
 prog
 	.command('dev')
@@ -982,7 +982,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.196'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.197'}\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.196",
+  "version": "1.0.0-next.197",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",