@sveltejs/kit 1.0.0-next.252 → 1.0.0-next.256

package/assets/app/stores.js

@@ -33,7 +33,8 @@ const getStores = () => {
 				subscribe: stores.navigating.subscribe
 			};
 		},
-		session: stores.session
+		session: stores.session,
+		updated: stores.updated
 	};
 };
 
@@ -79,4 +80,18 @@ const session = {
 	update: () => throw_error('update')
 };
 
-export { getStores, navigating, page, session, stores };
+/** @type {typeof import('$app/stores').updated} */
+const updated = {
+	subscribe(fn) {
+		const store = getStores().updated;
+
+		if (browser) {
+			updated.check = store.check;
+		}
+
+		return store.subscribe(fn);
+	},
+	check: () => throw_error('check')
+};
+
+export { getStores, navigating, page, session, stores, updated };

package/assets/client/start.js

@@ -3,8 +3,8 @@ import { fallback, routes } from '__GENERATED__/manifest.js';
 import { onMount, tick } from 'svelte';
 import { g as get_base_uri } from '../chunks/utils.js';
 import { writable } from 'svelte/store';
+import { base, set_paths } from '../paths.js';
 import { init } from './singletons.js';
-import { set_paths } from '../paths.js';
 
 function scroll_state() {
 	return {
@@ -553,6 +553,56 @@ function notifiable_store(value) {
 	return { notify, set, subscribe };
 }
 
+function create_updated_store() {
+	const { set, subscribe } = writable(false);
+
+	const interval = +(
+		/** @type {string} */ (import.meta.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL)
+	);
+	const initial = import.meta.env.VITE_SVELTEKIT_APP_VERSION;
+
+	/** @type {NodeJS.Timeout} */
+	let timeout;
+
+	async function check() {
+		if (import.meta.env.DEV || import.meta.env.SSR) return false;
+
+		clearTimeout(timeout);
+
+		if (interval) timeout = setTimeout(check, interval);
+
+		const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE;
+
+		const res = await fetch(`${base}/${file}`, {
+			headers: {
+				pragma: 'no-cache',
+				'cache-control': 'no-cache'
+			}
+		});
+
+		if (res.ok) {
+			const { version } = await res.json();
+			const updated = version !== initial;
+
+			if (updated) {
+				set(true);
+				clearTimeout(timeout);
+			}
+
+			return updated;
+		} else {
+			throw new Error(`Version check failed: ${res.status}`);
+		}
+	}
+
+	if (interval) timeout = setTimeout(check, interval);
+
+	return {
+		subscribe,
+		check
+	};
+}
+
 /**
  * @param {RequestInfo} resource
  * @param {RequestInit} [opts]
@@ -622,7 +672,8 @@ class Renderer {
 			url: notifiable_store({}),
 			page: notifiable_store({}),
 			navigating: writable(/** @type {Navigating | null} */ (null)),
-			session: writable(session)
+			session: writable(session),
+			updated: create_updated_store()
 		};
 
 		this.$session = null;
@@ -788,6 +839,12 @@ class Renderer {
 					location.href = new URL(navigation_result.redirect, location.href).href;
 				}
 
+				return;
+			}
+		} else if (navigation_result.props?.page?.status >= 400) {
+			const updated = await this.stores.updated.check();
+			if (updated) {
+				location.href = info.url.href;
 				return;
 			}
 		}

package/assets/server/index.js

@@ -413,6 +413,16 @@ function safe_not_equal(a, b) {
 Promise.resolve();
 
 const subscriber_queue = [];
+/**
+ * Creates a `Readable` store that allows reading by subscription.
+ * @param value initial value
+ * @param {StartStopNotifier}start start and stop notifications for subscriptions
+ */
+function readable(value, start) {
+    return {
+        subscribe: writable(value, start).subscribe
+    };
+}
 /**
  * Create a `Writable` store that allows both updating and reading by subscription.
  * @param {*=}value initial value
@@ -1015,6 +1025,11 @@ class Csp {
 
 // TODO rename this function/module
 
+const updated = {
+	...readable(false),
+	check: () => false
+};
+
 /**
  * @param {{
  *   branch: Array<import('./types').Loaded>;
@@ -1091,7 +1106,8 @@ async function render_response({
 			stores: {
 				page: writable(null),
 				navigating: writable(null),
-				session
+				session,
+				updated
 			},
 			page: {
 				url: state.prerender ? create_prerendering_url_proxy(url) : url,
@@ -1535,6 +1551,15 @@ async function load_node({
 
 				opts.headers = new Headers(opts.headers);
 
+				// merge headers from request
+				for (const [key, value] of event.request.headers) {
+					if (opts.headers.has(key)) continue;
+					if (key === 'cookie' || key === 'authorization' || key === 'if-none-match') continue;
+					opts.headers.set(key, value);
+				}
+
+				opts.headers.set('referer', event.url.href);
+
 				const resolved = resolve(event.url.pathname, requested.split('?')[0]);
 
 				/** @type {Response} */
@@ -1650,10 +1675,10 @@ async function load_node({
 							if (!opts.body || typeof opts.body === 'string') {
 								// prettier-ignore
 								fetched.push({
-										url: requested,
-										body: /** @type {string} */ (opts.body),
-										json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
-									});
+									url: requested,
+									body: /** @type {string} */ (opts.body),
+									json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
+								});
 							}
 
 							if (dependency) {

package/dist/chunks/index.js

@@ -37,6 +37,8 @@ async function create_plugin(config, cwd) {
 		amp = (await import('./amp_hook.js')).handle;
 	}
 
+	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
+
 	/** @type {import('types/internal').Respond} */
 	const respond = (await import(`${runtime}/server/index.js`)).respond;
 
@@ -394,7 +396,7 @@ async function dev({ cwd, port, host, https, config }) {
 				strictPort: true
 			}
 		},
-		config.kit.vite()
+		await config.kit.vite()
 	);
 
 	/** @type {[any, string[]]} */

package/dist/chunks/index3.js

@@ -63,7 +63,7 @@ async function build_service_worker(
 	);
 
 	/** @type {[any, string[]]} */
-	const [merged_config, conflicts] = deep_merge(config.kit.vite(), {
+	const [merged_config, conflicts] = deep_merge(await config.kit.vite(), {
 		configFile: false,
 		root: cwd,
 		base: assets_base,
@@ -151,6 +151,10 @@ async function build_client({
 	output_dir,
 	client_entry_file
 }) {
+	process.env.VITE_SVELTEKIT_APP_VERSION = config.kit.version.name;
+	process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${config.kit.appDir}/version.json`;
+	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = `${config.kit.version.pollInterval}`;
+
 	create_app({
 		manifest_data,
 		output: `${SVELTE_KIT}/generated`,
@@ -182,7 +186,7 @@ async function build_client({
 	});
 
 	/** @type {[any, string[]]} */
-	const [merged_config, conflicts] = deep_merge(config.kit.vite(), {
+	const [merged_config, conflicts] = deep_merge(await config.kit.vite(), {
 		configFile: false,
 		root: cwd,
 		base: assets_base,
@@ -227,6 +231,11 @@ async function build_client({
 	const entry_css = new Set();
 	find_deps(entry, vite_manifest, entry_js, entry_css);
 
+	fs__default.writeFileSync(
+		`${client_out_dir}/version.json`,
+		JSON.stringify({ version: process.env.VITE_SVELTEKIT_APP_VERSION })
+	);
+
 	return {
 		assets,
 		chunks,
@@ -411,7 +420,7 @@ async function build_server(
 	);
 
 	/** @type {import('vite').UserConfig} */
-	const vite_config = config.kit.vite();
+	const vite_config = await config.kit.vite();
 
 	const default_config = {
 		build: {
@@ -626,7 +635,7 @@ async function build(config) {
 	const build_data = {
 		app_dir: config.kit.appDir,
 		manifest_data: options.manifest_data,
-		service_worker: options.service_worker_entry_file ? 'service_worker.js' : null, // TODO make file configurable?
+		service_worker: options.service_worker_entry_file ? 'service-worker.js' : null, // TODO make file configurable?
 		client,
 		server,
 		static: options.manifest_data.assets.map((asset) => posixify(asset.file)),

package/dist/chunks/index5.js

@@ -311,6 +311,8 @@ function crawl(html) {
 									hrefs.push(src);
 								}
 							}
+						} else {
+							i -= 1;
 						}
 					}
 

package/dist/chunks/index6.js

@@ -81,7 +81,7 @@ async function preview({
 	const app = new App(manifest);
 
 	/** @type {import('vite').UserConfig} */
-	const vite_config = (config.kit.vite && config.kit.vite()) || {};
+	const vite_config = (config.kit.vite && (await config.kit.vite())) || {};
 
 	const server = await get_server(use_https, vite_config, (req, res) => {
 		if (req.url == null) {

package/dist/cli.js

@@ -688,6 +688,11 @@ const options = object(
 
 			trailingSlash: list(['never', 'always', 'ignore']),
 
+			version: object({
+				name: string(Date.now().toString()),
+				pollInterval: number(0)
+			}),
+
 			vite: validate(
 				() => ({}),
 				(input, keypath) => {
@@ -989,7 +994,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.252');
+const prog = sade('svelte-kit').version('1.0.0-next.256');
 
 prog
 	.command('dev')
@@ -1147,7 +1152,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.252'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.256'}\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.252",
+  "version": "1.0.0-next.256",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient-modules.d.ts

@@ -110,6 +110,7 @@ declare module '$app/stores' {
 		navigating: typeof navigating;
 		page: typeof page;
 		session: Writable<Session>;
+		updated: typeof updated;
 	};
 	/**
 	 * A readable store whose value contains page data.
@@ -132,6 +133,11 @@ declare module '$app/stores' {
 	 * It can be written to, but this will not cause changes to persist on the server — this is something you must implement yourself.
 	 */
 	export const session: Writable<any>;
+	/**
+	 * A writable store indicating if the site was updated since the store was created.
+	 * It can be written to when custom logic is required to detect updates.
+	 */
+	export const updated: Readable<boolean> & { check: () => boolean };
 }
 
 declare module '$service-worker' {

package/types/config.d.ts

@@ -1,7 +1,7 @@
 import { CompileOptions } from 'svelte/types/compiler/interfaces';
 import { UserConfig as ViteConfig } from 'vite';
 import { CspDirectives } from './csp';
-import { RecursiveRequired } from './helper';
+import { MaybePromise, RecursiveRequired } from './helper';
 import { HttpMethod, Logger, RouteSegment, TrailingSlash } from './internal';
 
 export interface RouteDefinition {
@@ -165,7 +165,11 @@ export interface Config {
 		};
 		target?: string;
 		trailingSlash?: TrailingSlash;
-		vite?: ViteConfig | (() => ViteConfig);
+		version?: {
+			name?: string;
+			pollInterval?: number;
+		};
+		vite?: ViteConfig | (() => MaybePromise<ViteConfig>);
 	};
 	preprocess?: any;
 }