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

package/assets/runtime/internal/start.js

@@ -13,12 +13,14 @@ function scroll_state() {
 }
 
 /**
- * @param {Node | null} node
- * @returns {HTMLAnchorElement | SVGAElement | null}
+ * @param {Event} event
+ * @returns {HTMLAnchorElement | SVGAElement | undefined}
  */
-function find_anchor(node) {
-	while (node && node.nodeName.toUpperCase() !== 'A') node = node.parentNode; // SVG <a> elements have a lowercase name
-	return /** @type {HTMLAnchorElement | SVGAElement} */ (node);
+function find_anchor(event) {
+	const node = event
+		.composedPath()
+		.find((e) => e instanceof Node && e.nodeName.toUpperCase() === 'A'); // SVG <a> elements have a lowercase name
+	return /** @type {HTMLAnchorElement | SVGAElement | undefined} */ (node);
 }
 
 /**
@@ -99,7 +101,7 @@ class Router {
 
 		/** @param {MouseEvent|TouchEvent} event */
 		const trigger_prefetch = (event) => {
-			const a = find_anchor(/** @type {Node} */ (event.target));
+			const a = find_anchor(event);
 			if (a && a.href && a.hasAttribute('sveltekit:prefetch')) {
 				this.prefetch(get_href(a));
 			}
@@ -129,7 +131,7 @@ class Router {
 			if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
 			if (event.defaultPrevented) return;
 
-			const a = find_anchor(/** @type {Node} */ (event.target));
+			const a = find_anchor(event);
 			if (!a) return;
 
 			if (!a.href) return;
@@ -656,23 +658,35 @@ class Renderer {
 			this._init(navigation_result);
 		}
 
-		if (!opts) {
-			await 0;
-		} else {
+		// opts must be passed if we're navigating...
+		if (opts) {
 			const { hash, scroll, keepfocus } = opts;
 
 			if (!keepfocus) {
+				getSelection()?.removeAllRanges();
 				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);
@@ -685,6 +699,9 @@ class Renderer {
 					scrollTo(0, 0);
 				}
 			}
+		} else {
+			// ...they will not be supplied if we're simply invalidating
+			await 0;
 		}
 
 		this.loading.promise = null;

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/index6.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { createRequire } from 'module';
-import { r as rimraf, w as walk$1, m as mkdirp } from '../cli.js';
+import { r as rimraf, w as walk$1, $, m as mkdirp } from '../cli.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -15292,7 +15292,14 @@ async function make_package(config, cwd = process.cwd()) {
 		if (!config.kit.package.files(normalized)) {
 			const dts_file = (svelte_ext ? file : file.slice(0, -ext.length)) + '.d.ts';
 			const dts_path = path.join(abs_package_dir, dts_file);
-			if (fs.existsSync(dts_path)) fs.unlinkSync(dts_path);
+			if (fs.existsSync(dts_path)) {
+				fs.unlinkSync(dts_path);
+
+				const dir = path.dirname(dts_path);
+				if (fs.readdirSync(dir).length === 0) {
+					fs.rmdirSync(dir);
+				}
+			}
 			continue;
 		}
 
@@ -15367,14 +15374,14 @@ async function make_package(config, cwd = process.cwd()) {
 				console.warn(
 					'Cannot generate a "svelte" entry point because ' +
 						'the "." entry in "exports" is not a string. ' +
-						'If you set it by hand, please also set one of the options as a "svelte" entry point'
+						'If you set it by hand, please also set one of the options as a "svelte" entry point\n'
 				);
 			}
 		} else {
 			console.warn(
 				'Cannot generate a "svelte" entry point because ' +
 					'the "." entry in "exports" is missing. ' +
-					'Please specify one or set a "svelte" entry point yourself'
+					'Please specify one or set a "svelte" entry point yourself\n'
 			);
 		}
 	}
@@ -15392,13 +15399,20 @@ async function make_package(config, cwd = process.cwd()) {
 		const package_path = path.join(abs_package_dir, pathname);
 		if (!fs.existsSync(package_path)) fs.copyFileSync(full_path, package_path);
 	}
+
+	const from = path.relative(cwd, config.kit.files.lib);
+	const to = path.relative(cwd, config.kit.package.dir);
+	console.log($.bold().green(`${from} -> ${to}`));
+	console.log(`Successfully built '${pkg.name}' package. To publish it to npm:`);
+	console.log($.bold().cyan(`  cd ${to}`));
+	console.log($.bold().cyan('  npm publish\n'));
 }
 
 /**
  * Resolves the `$lib` alias.
  *
  * TODO: make this more generic to also handle other aliases the user could have defined
- * via `kit.vite.resolve.alias`. Also investage how to do this in a more robust way
+ * via `kit.vite.resolve.alias`. Also investigate how to do this in a more robust way
  * (right now regex string replacement is used).
  * For more discussion see https://github.com/sveltejs/kit/pull/2453
  *

package/dist/cli.js

@@ -255,8 +255,12 @@ function copy(from, to, filter = () => true) {
 	return files;
 }
 
-/** @param {string} cwd */
-function walk(cwd) {
+/**
+ * Get a list of all files in a directory
+ * @param {string} cwd - the directory to walk
+ * @param {boolean} [dirs] - whether to include directories in the result
+ */
+function walk(cwd, dirs = false) {
 	/** @type {string[]} */
 	const all_files = [];
 
@@ -268,6 +272,7 @@ function walk(cwd) {
 			const joined = path__default.join(dir, file);
 			const stats = fs__default.statSync(path__default.join(cwd, joined));
 			if (stats.isDirectory()) {
+				if (dirs) all_files.push(joined);
 				walk_dir(joined);
 			} else {
 				all_files.push(joined);
@@ -817,7 +822,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.199');
 
 prog
 	.command('dev')
@@ -982,7 +987,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.199'}\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}');
 			}
@@ -1747,9 +1752,15 @@ async function respond(incoming, options, state = {}) {
 						if (response.status === 200) {
 							const cache_control = get_single_valued_header(response.headers, 'cache-control');
 							if (!cache_control || !/(no-store|immutable)/.test(cache_control)) {
+								let if_none_match_value = request.headers['if-none-match'];
+								// ignore W/ prefix https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-None-Match#directives
+								if (if_none_match_value?.startsWith('W/"')) {
+									if_none_match_value = if_none_match_value.substring(2);
+								}
+
 								const etag = `"${hash(response.body || '')}"`;
 
-								if (request.headers['if-none-match'] === etag) {
+								if (if_none_match_value === etag) {
 									return {
 										status: 304,
 										headers: {}

package/package.json

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