@sveltejs/kit 1.0.0-next.194 → 1.0.0-next.198

package/assets/runtime/internal/start.js

@@ -93,7 +93,8 @@ class Router {
 					'sveltekit:scroll': scroll_state()
 				};
 				history.replaceState(new_state, document.title, window.location.href);
-			}, 50);
+				// iOS scroll event intervals happen between 30-150ms, sometimes around 200ms
+			}, 200);
 		});
 
 		/** @param {MouseEvent|TouchEvent} event */
@@ -655,34 +656,43 @@ class Renderer {
 			this._init(navigation_result);
 		}
 
-		if (!opts) {
-			await 0;
-		} else {
-			const { hash, scroll, keepfocus } = opts;
+		const { hash, scroll, keepfocus } = opts || {};
 
-			if (!keepfocus) {
-				document.body.focus();
-			}
+		if (!keepfocus) {
+			getSelection()?.removeAllRanges();
+			document.body.focus();
+		}
 
-			const oldPageYOffset = pageYOffset;
-			await 0;
-			const maxPageYOffset = document.body.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)) {
-				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/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/chunks/index3.js

@@ -888,12 +888,7 @@ async function build_server(
 
 	const default_config = {
 		build: {
-			target: 'es2020',
-			rollupOptions: {
-				output: {
-					inlineDynamicImports: true
-				}
-			}
+			target: 'es2020'
 		},
 		server: {
 			fs: {

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.194');
+const prog = sade('svelte-kit').version('1.0.0-next.198');
 
 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.194'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.198'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -587,6 +587,9 @@ async function render_response({
 		<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style>
 		<noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
 		<script async src="https://cdn.ampproject.org/v0.js"></script>`;
+		init += options.service_worker
+			? '<script async custom-element="amp-install-serviceworker" src="https://cdn.ampproject.org/v0/amp-install-serviceworker-0.1.js"></script>'
+			: '';
 	} else if (include_js) {
 		// prettier-ignore
 		init = `<script type="module">
@@ -625,7 +628,9 @@ async function render_response({
 	}
 
 	if (options.service_worker) {
-		init += `<script>
+		init += options.amp
+			? `<amp-install-serviceworker src="${options.service_worker}" layout="nodisplay"></amp-install-serviceworker>`
+			: `<script>
 			if ('serviceWorker' in navigator) {
 				navigator.serviceWorker.register('${options.service_worker}');
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.194",
+  "version": "1.0.0-next.198",
   "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",