@sveltejs/kit 1.0.0-next.212 → 1.0.0-next.216

package/assets/kit.js

@@ -1,5 +1,5 @@
 /**
- * @param {Record<string, string | string[]>} headers
+ * @param {Record<string, string | string[] | undefined>} headers
  * @param {string} key
  * @returns {string | undefined}
  * @throws {Error}

package/assets/runtime/app/navigation.js

@@ -1,4 +1,4 @@
-import { router as router$1 } from '../internal/singletons.js';
+import { renderer, router as router$1 } from '../internal/singletons.js';
 import { g as get_base_uri } from '../chunks/utils.js';
 
 const router = /** @type {import('../client/router').Router} */ (router$1);
@@ -12,11 +12,21 @@ function guard(name) {
 	};
 }
 
+const disableScrollHandling = import.meta.env.SSR
+	? guard('disableScrollHandling')
+	: disableScrollHandling_;
 const goto = import.meta.env.SSR ? guard('goto') : goto_;
 const invalidate = import.meta.env.SSR ? guard('invalidate') : invalidate_;
 const prefetch = import.meta.env.SSR ? guard('prefetch') : prefetch_;
 const prefetchRoutes = import.meta.env.SSR ? guard('prefetchRoutes') : prefetchRoutes_;
 
+/**
+ * @type {import('$app/navigation').goto}
+ */
+async function disableScrollHandling_() {
+	renderer.disable_scroll_handling();
+}
+
 /**
  * @type {import('$app/navigation').goto}
  */
@@ -52,4 +62,4 @@ async function prefetchRoutes_(pathnames) {
 	await Promise.all(promises);
 }
 
-export { goto, invalidate, prefetch, prefetchRoutes };
+export { disableScrollHandling, goto, invalidate, prefetch, prefetchRoutes };

package/assets/runtime/internal/singletons.js

@@ -1,9 +1,18 @@
 /** @type {import('./router').Router?} */
 let router;
 
-/** @param {import('./router').Router?} _ */
-function init(_) {
-	router = _;
+/** @type {import('./renderer').Renderer} */
+let renderer;
+
+/**
+ * @param {{
+ *   router: import('./router').Router?;
+ *   renderer: import('./renderer').Renderer;
+ * }} opts
+ */
+function init(opts) {
+	router = opts.router;
+	renderer = opts.renderer;
 }
 
-export { init, router };
+export { init, renderer, router };

package/assets/runtime/internal/start.js

@@ -162,16 +162,17 @@ class Router {
 
 			if (!this.owns(url)) return;
 
-			const noscroll = a.hasAttribute('sveltekit:noscroll');
+			// Check if new url only differs by hash
+			if (url.href.split('#')[0] === location.href.split('#')[0]) {
+				// Call `pushState` to add url to history so going back works.
+				// Also make a delay, otherwise the browser default behaviour would not kick in
+				setTimeout(() => history.pushState({}, '', url.href));
+				return;
+			}
 
-			const i1 = url_string.indexOf('#');
-			const i2 = location.href.indexOf('#');
-			const u1 = i1 >= 0 ? url_string.substring(0, i1) : url_string;
-			const u2 = i2 >= 0 ? location.href.substring(0, i2) : location.href;
 			history.pushState({}, '', url.href);
-			if (u1 === u2) {
-				window.dispatchEvent(new HashChangeEvent('hashchange'));
-			}
+
+			const noscroll = a.hasAttribute('sveltekit:noscroll');
 			this._navigate(url, noscroll ? scroll_state() : null, false, [], url.hash);
 			event.preventDefault();
 		});
@@ -466,6 +467,8 @@ class Renderer {
 		this.session_id = 1;
 		this.invalid = new Set();
 		this.invalidating = null;
+		this.autoscroll = true;
+		this.updating = false;
 
 		/** @type {import('./types').NavigationState} */
 		this.current = {
@@ -508,6 +511,16 @@ class Renderer {
 		ready = true;
 	}
 
+	disable_scroll_handling() {
+		if (import.meta.env.DEV && this.started && !this.updating) {
+			throw new Error('Can only disable scroll handling during navigation');
+		}
+
+		if (this.updating || !this.started) {
+			this.autoscroll = false;
+		}
+	}
+
 	/**
 	 * @param {{
 	 *   status: number;
@@ -637,6 +650,8 @@ class Renderer {
 			}
 		}
 
+		this.updating = true;
+
 		if (this.started) {
 			this.current = navigation_result.state;
 
@@ -655,26 +670,9 @@ class Renderer {
 				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) {
+			if (this.autoscroll) {
 				const deep_linked = hash && document.getElementById(hash.slice(1));
 				if (scroll) {
 					scrollTo(scroll.x, scroll.y);
@@ -694,6 +692,8 @@ class Renderer {
 
 		this.loading.promise = null;
 		this.loading.id = null;
+		this.autoscroll = true;
+		this.updating = false;
 
 		if (!this.router) return;
 
@@ -1202,7 +1202,7 @@ async function start({ paths, target, session, route, spa, trailing_slash, hydra
 		  })
 		: null;
 
-	init(router);
+	init({ router, renderer });
 	set_paths(paths);
 
 	if (hydrate) await renderer.start(hydrate);

package/dist/chunks/index.js

@@ -12,7 +12,7 @@ import 'querystring';
 import { URL } from 'url';
 import require$$10 from 'vm';
 import vite from 'vite';
-import { r as resolve_entry, $, g as get_mime_lookup, a as rimraf, c as copy_assets, p as print_config_conflicts } from '../cli.js';
+import { r as resolve_entry, $, l as load_template, g as get_mime_lookup, a as rimraf, c as copy_assets, p as print_config_conflicts } from '../cli.js';
 import { c as create_manifest_data, a as create_app, d as deep_merge } from './index2.js';
 import { S as SVELTE_KIT, a as SVELTE_KIT_ASSETS } from './constants.js';
 import { respond } from '../ssr.js';
@@ -4407,8 +4407,7 @@ function create_plugin(config, output, cwd, amp) {
 								ssr: config.kit.ssr,
 								target: config.kit.target,
 								template: ({ head, body }) => {
-									let rendered = fs__default
-										.readFileSync(config.kit.files.template, 'utf8')
+									let rendered = load_template(cwd, config)
 										.replace('%svelte.head%', () => head)
 										.replace('%svelte.body%', () => body);
 

package/dist/chunks/index3.js

@@ -1,6 +1,6 @@
 import fs__default from 'fs';
 import path__default from 'path';
-import { p as print_config_conflicts, c as copy_assets, b as posixify, r as resolve_entry, m as mkdirp, a as rimraf } from '../cli.js';
+import { p as print_config_conflicts, c as copy_assets, b as posixify, r as resolve_entry, l as load_template, m as mkdirp, a as rimraf } from '../cli.js';
 import { d as deep_merge, a as create_app, c as create_manifest_data } from './index2.js';
 import { S as SVELTE_KIT } from './constants.js';
 import { g as generate_manifest } from './index4.js';
@@ -247,20 +247,22 @@ async function build_client({
 
 /**
  * @param {{
- *   runtime: string,
- *   hooks: string,
- *   config: import('types/config').ValidatedConfig
+ *   cwd: string;
+ *   runtime: string;
+ *   hooks: string;
+ *   config: import('types/config').ValidatedConfig;
+ *   has_service_worker: boolean;
  * }} opts
  * @returns
  */
-const template = ({ config, hooks, runtime }) => `
+const template = ({ cwd, config, hooks, runtime, has_service_worker }) => `
 import { respond } from '${runtime}';
 import root from './generated/root.svelte';
 import { set_paths, assets, base } from './runtime/paths.js';
 import { set_prerendering } from './runtime/env.js';
 import * as user_hooks from ${s(hooks)};
 
-const template = ({ head, body }) => ${s(fs__default.readFileSync(config.kit.files.template, 'utf-8'))
+const template = ({ head, body }) => ${s(load_template(cwd, config))
 	.replace('%svelte.head%', '" + head + "')
 	.replace('%svelte.body%', '" + body + "')};
 
@@ -309,11 +311,7 @@ export class App {
 			prerender: ${config.kit.prerender.enabled},
 			read,
 			root,
-			service_worker: ${
-				config.kit.files.serviceWorker && config.kit.serviceWorker.register
-					? "'/service-worker.js'"
-					: 'null'
-			},
+			service_worker: ${has_service_worker ? "'/service-worker.js'" : 'null'},
 			router: ${s(config.kit.router)},
 			ssr: ${s(config.kit.ssr)},
 			target: ${s(config.kit.target)},
@@ -356,12 +354,23 @@ export class App {
  *   manifest_data: import('types/internal').ManifestData
  *   build_dir: string;
  *   output_dir: string;
+ *   service_worker_entry_file: string | null;
+ *   service_worker_register: boolean;
  * }} options
  * @param {string} runtime
  * @param {{ vite_manifest: import('vite').Manifest, assets: import('rollup').OutputAsset[] }} client
  */
 async function build_server(
-	{ cwd, assets_base, config, manifest_data, build_dir, output_dir },
+	{
+		cwd,
+		assets_base,
+		config,
+		manifest_data,
+		build_dir,
+		output_dir,
+		service_worker_entry_file,
+		service_worker_register
+	},
 	runtime,
 	client
 ) {
@@ -407,9 +416,11 @@ async function build_server(
 	fs__default.writeFileSync(
 		input.app,
 		template({
+			cwd,
 			config,
 			hooks: app_relative(hooks_file),
-			runtime
+			runtime,
+			has_service_worker: service_worker_register && !!service_worker_entry_file
 		})
 	);
 

package/dist/chunks/index5.js

@@ -1,4 +1,4 @@
-import { m as mkdirp, a as rimraf, d as copy, $, l as logger } from '../cli.js';
+import { m as mkdirp, a as rimraf, d as copy, $, e as logger } from '../cli.js';
 import { S as SVELTE_KIT } from './constants.js';
 import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
@@ -270,7 +270,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 		const rendered = await app.render(
 			{
-				url: `${config.kit.protocol || 'sveltekit'}://${config.kit.host || 'prerender'}${path}`,
+				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}${path}`,
 				method: 'GET',
 				headers: {},
 				rawBody: null
@@ -417,7 +417,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	if (fallback) {
 		const rendered = await app.render(
 			{
-				url: `${config.kit.host || 'sveltekit'}://${config.kit.host || 'prerender'}/[fallback]`,
+				url: `${config.kit.protocol || 'http'}://${config.kit.host || 'prerender'}/[fallback]`,
 				method: 'GET',
 				headers: {},
 				rawBody: null

package/dist/chunks/url.js

@@ -1,5 +1,5 @@
 /**
- * @param {Record<string, string | string[]>} headers
+ * @param {Record<string, string | string[] | undefined>} headers
  * @param {string} key
  * @returns {string | undefined}
  * @throws {Error}

package/dist/cli.js

@@ -740,10 +740,10 @@ function assert_string(input, keypath) {
 
 /**
  * @param {string} cwd
- * @param {import('types/config').ValidatedConfig} validated
+ * @param {import('types/config').ValidatedConfig} config
  */
-function validate_template(cwd, validated) {
-	const { template } = validated.kit.files;
+function load_template(cwd, config) {
+	const { template } = config.kit.files;
 	const relative = path__default.relative(cwd, template);
 
 	if (fs__default.existsSync(template)) {
@@ -757,6 +757,8 @@ function validate_template(cwd, validated) {
 	} else {
 		throw new Error(`${relative} does not exist`);
 	}
+
+	return fs__default.readFileSync(template, 'utf-8');
 }
 
 async function load_config({ cwd = process.cwd() } = {}) {
@@ -775,10 +777,6 @@ async function load_config({ cwd = process.cwd() } = {}) {
 	validated.kit.files.serviceWorker = path__default.resolve(cwd, validated.kit.files.serviceWorker);
 	validated.kit.files.template = path__default.resolve(cwd, validated.kit.files.template);
 
-	validate_template(cwd, validated);
-
-	// TODO check all the `files` exist when the config is loaded?
-
 	return validated;
 }
 
@@ -887,7 +885,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.212');
+const prog = sade('svelte-kit').version('1.0.0-next.216');
 
 prog
 	.command('dev')
@@ -1039,7 +1037,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.212'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.216'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1076,4 +1074,4 @@ function welcome({ port, host, https, open, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, rimraf as a, posixify as b, copy_assets as c, copy as d, get_mime_lookup as g, logger as l, mkdirp as m, print_config_conflicts as p, resolve_entry as r, walk as w };
+export { $, rimraf as a, posixify as b, copy_assets as c, copy as d, logger as e, get_mime_lookup as g, load_template as l, mkdirp as m, print_config_conflicts as p, resolve_entry as r, walk as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.212",
+  "version": "1.0.0-next.216",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -15,6 +15,7 @@
     "vite": "^2.7.2"
   },
   "devDependencies": {
+    "@playwright/test": "^1.17.1",
     "@rollup/plugin-replace": "^3.0.0",
     "@types/amphtml-validator": "^1.0.1",
     "@types/cookie": "^0.4.1",
@@ -24,6 +25,7 @@
     "@types/sade": "^1.7.3",
     "amphtml-validator": "^1.0.35",
     "cookie": "^0.4.1",
+    "cross-env": "^7.0.3",
     "devalue": "^2.0.1",
     "eslint": "^8.3.0",
     "kleur": "^4.1.4",
@@ -85,6 +87,10 @@
     "test": "npm run test:unit && npm run test:packaging && npm run test:integration",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
-    "test:integration": "uvu test test.js"
+    "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
+    "test:integration:amp": "cd test/apps/amp && pnpm test",
+    "test:integration:basics": "cd test/apps/basics && pnpm test",
+    "test:integration:options": "cd test/apps/options && pnpm test",
+    "test:integration:options-2": "cd test/apps/options-2 && pnpm test"
   }
 }

package/types/ambient-modules.d.ts

@@ -26,6 +26,11 @@ declare module '$app/env' {
 }
 
 declare module '$app/navigation' {
+	/**
+	 * Disable SvelteKit's built-in scroll handling for the current navigation, in case you need to manually control the scroll position.
+	 * This is generally discouraged, since it breaks user expectations.
+	 */
+	export function disableScrollHandling(): void;
 	/**
 	 * Returns a Promise that resolves when SvelteKit navigates (or fails to navigate, in which case the promise rejects) to the specified href.
 	 *

package/types/endpoint.d.ts

@@ -5,7 +5,7 @@ type DefaultBody = JSONString | Uint8Array;
 
 export interface EndpointOutput<Body extends DefaultBody = DefaultBody> {
 	status?: number;
-	headers?: ResponseHeaders;
+	headers?: Partial<ResponseHeaders>;
 	body?: Body;
 }
 

package/types/hooks.d.ts

@@ -15,7 +15,7 @@ export interface ServerRequest<Locals = Record<string, any>, Body = unknown> {
 
 export interface ServerResponse {
 	status: number;
-	headers: ResponseHeaders;
+	headers: Partial<ResponseHeaders>;
 	body?: StrictBody;
 }