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

package/assets/runtime/internal/start.js

@@ -656,6 +656,8 @@ class Renderer {
 			this._init(navigation_result);
 		}
 
+		getSelection()?.removeAllRanges();
+
 		if (!opts) {
 			await 0;
 		} else {
@@ -665,14 +667,26 @@ class Renderer {
 				document.body.focus();
 			}
 
-			const oldPageYOffset = pageYOffset;
+			const old_page_y_offset = Math.round(pageYOffset);
+			const old_max_page_y_offset = document.documentElement.scrollHeight - innerHeight;
+
 			await 0;
-			const maxPageYOffset = document.body.scrollHeight - innerHeight;
+
+			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.
-			// If there was no scrolling happening (checked via `pageYOffset`),
-			// continue on our custom scroll handling
-			if (pageYOffset === Math.min(oldPageYOffset, maxPageYOffset)) {
+			// 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);

package/dist/chunks/http.js

@@ -2,6 +2,7 @@
  * @param {Record<string, string | string[]>} headers
  * @param {string} key
  * @returns {string | undefined}
+ * @throws {Error}
  */
 function get_single_valued_header(headers, key) {
 	const value = headers[key];

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.195');
+const prog = sade('svelte-kit').version('1.0.0-next.196');
 
 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.195'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.196'}\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.195",
+  "version": "1.0.0-next.196",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -21,7 +21,6 @@
     "@types/marked": "^3.0.1",
     "@types/mime": "^2.0.3",
     "@types/node": "^16.10.3",
-    "@types/rimraf": "^3.0.2",
     "@types/sade": "^1.7.3",
     "amphtml-validator": "^1.0.35",
     "cookie": "^0.4.1",
@@ -33,7 +32,6 @@
     "mime": "^2.5.2",
     "node-fetch": "^3.0.0",
     "port-authority": "^1.1.2",
-    "rimraf": "^3.0.2",
     "rollup": "^2.58.0",
     "selfsigned": "^1.10.11",
     "sirv": "^1.0.17",