@sveltejs/kit 1.0.0-next.251 → 1.0.0-next.255

package/dist/chunks/index2.js

@@ -1,7 +1,7 @@
 import fs__default from 'fs';
 import path__default from 'path';
 import { s } from './misc.js';
-import { m as mkdirp, b as runtime, f as posixify } from '../cli.js';
+import { m as mkdirp, r as runtime, f as posixify } from '../cli.js';
 
 /**
  * Takes zero or more objects and returns a new object that has all the values

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, a as SVELTE_KIT, d as copy_assets, f as posixify, e as get_aliases, r as resolve_entry, l as load_template, b as runtime, m as mkdirp, h as rimraf } from '../cli.js';
+import { p as print_config_conflicts, b as SVELTE_KIT, d as copy_assets, f as posixify, e as get_aliases, a as resolve_entry, l as load_template, r as runtime, m as mkdirp, h as rimraf } from '../cli.js';
 import { d as deep_merge, a as create_app, c as create_manifest_data } from './index2.js';
 import { g as generate_manifest } from './index4.js';
 import vite from 'vite';
@@ -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

@@ -1,9 +1,8 @@
-import { m as mkdirp, a as SVELTE_KIT, h as rimraf, i as copy, $, j as logger } from '../cli.js';
+import { m as mkdirp, b as SVELTE_KIT, h as rimraf, i as copy, $, j as logger } from '../cli.js';
 import { readFileSync, writeFileSync } from 'fs';
-import { resolve, join, dirname } from 'path';
+import { resolve as resolve$1, join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { e as escape_html_attr, r as resolve$1, i as is_root_relative } from './url.js';
 import { g as generate_manifest } from './index4.js';
 import 'sade';
 import 'child_process';
@@ -17,6 +16,45 @@ import 'node:util';
 import 'node:url';
 import './misc.js';
 
+const absolute = /^([a-z]+:)?\/?\//;
+const scheme = /^[a-z]+:/;
+
+/**
+ * @param {string} base
+ * @param {string} path
+ */
+function resolve(base, path) {
+	if (scheme.test(path)) return path;
+
+	const base_match = absolute.exec(base);
+	const path_match = absolute.exec(path);
+
+	if (!base_match) {
+		throw new Error(`bad base path: "${base}"`);
+	}
+
+	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
+	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
+
+	baseparts.pop();
+
+	for (let i = 0; i < pathparts.length; i += 1) {
+		const part = pathparts[i];
+		if (part === '.') continue;
+		else if (part === '..') baseparts.pop();
+		else baseparts.push(part);
+	}
+
+	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
+
+	return `${prefix}${baseparts.join('/')}`;
+}
+
+/** @param {string} path */
+function is_root_relative(path) {
+	return path[0] === '/' && path[1] !== '/';
+}
+
 /** @typedef {{
  *   fn: () => Promise<any>,
  *   fulfil: (value: any) => void,
@@ -123,7 +161,7 @@ function crawl(html) {
 			if (html[i + 1] === '!') {
 				i += 2;
 
-				if (html.substr(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
+				if (html.substring(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
 					i += DOCTYPE.length;
 					while (i < html.length) {
 						if (html[i++] === '>') {
@@ -133,10 +171,10 @@ function crawl(html) {
 				}
 
 				// skip cdata
-				if (html.substr(i, CDATA_OPEN.length) === CDATA_OPEN) {
+				if (html.substring(i, CDATA_OPEN.length) === CDATA_OPEN) {
 					i += CDATA_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
+						if (html.substring(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
 							i += CDATA_CLOSE.length;
 							continue main;
 						}
@@ -146,10 +184,10 @@ function crawl(html) {
 				}
 
 				// skip comments
-				if (html.substr(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
+				if (html.substring(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
 					i += COMMENT_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
+						if (html.substring(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
 							i += COMMENT_CLOSE.length;
 							continue main;
 						}
@@ -177,7 +215,7 @@ function crawl(html) {
 						if (
 							html[i] === '<' &&
 							html[i + 1] === '/' &&
-							html.substr(i + 2, tag.length).toUpperCase() === tag
+							html.substring(i + 2, tag.length).toUpperCase() === tag
 						) {
 							continue main;
 						}
@@ -273,6 +311,8 @@ function crawl(html) {
 									hrefs.push(src);
 								}
 							}
+						} else {
+							i -= 1;
 						}
 					}
 
@@ -291,6 +331,61 @@ function crawl(html) {
 	return hrefs;
 }
 
+/** @type {Record<string, string>} */
+
+/** @type {Record<string, string>} */
+const escape_html_attr_dict = {
+	'<': '&lt;',
+	'>': '&gt;',
+	'"': '&quot;'
+};
+
+/**
+ * use for escaping string values to be used html attributes on the page
+ * e.g.
+ * <script data-url="here">
+ *
+ * @param {string} str
+ * @returns string escaped string
+ */
+function escape_html_attr(str) {
+	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+}
+
+/**
+ *
+ * @param str {string} string to escape
+ * @param dict {Record<string, string>} dictionary of character replacements
+ * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
+ * @returns {string}
+ */
+function escape(str, dict, unicode_encoder) {
+	let result = '';
+
+	for (let i = 0; i < str.length; i += 1) {
+		const char = str.charAt(i);
+		const code = char.charCodeAt(0);
+
+		if (char in dict) {
+			result += dict[char];
+		} else if (code >= 0xd800 && code <= 0xdfff) {
+			const next = str.charCodeAt(i + 1);
+
+			// If this is the beginning of a [high, low] surrogate pair,
+			// add the next two characters, otherwise escape
+			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
+				result += char + str[++i];
+			} else {
+				result += unicode_encoder(code);
+			}
+		} else {
+			result += char;
+		}
+	}
+
+	return result;
+}
+
 /**
  * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
  * @typedef {import('types/config').PrerenderOnErrorValue} OnError
@@ -342,11 +437,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 	mkdirp(out);
 
-	const dir = resolve(cwd, `${SVELTE_KIT}/output`);
+	const dir = resolve$1(cwd, `${SVELTE_KIT}/output`);
 
 	const seen = new Set();
 
-	const server_root = resolve(dir);
+	const server_root = resolve$1(dir);
 
 	/** @type {import('types/internal').AppModule} */
 	const { App, override } = await import(pathToFileURL(`${server_root}/server/app.js`).href);
@@ -465,7 +560,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 						`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
 					);
 
-					const resolved = resolve$1(path, location);
+					const resolved = resolve(path, location);
 					if (is_root_relative(resolved)) {
 						enqueue(resolved, path);
 					}
@@ -520,7 +615,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 				for (const href of crawl(text)) {
 					if (href.startsWith('data:') || href.startsWith('#')) continue;
 
-					const resolved = resolve$1(path, href);
+					const resolved = resolve(path, href);
 					if (!is_root_relative(resolved)) continue;
 
 					const parsed = new URL(resolved, 'http://localhost');

package/dist/chunks/index6.js

@@ -6,7 +6,7 @@ import { s as sirv } from './build.js';
 import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../node.js';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { a as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
+import { b as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
 import 'querystring';
 import 'stream';
 import 'node:http';
@@ -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.251');
+const prog = sade('svelte-kit').version('1.0.0-next.255');
 
 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.251'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.255'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1184,4 +1189,4 @@ function welcome({ port, host, https, open, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, SVELTE_KIT_ASSETS as S, SVELTE_KIT as a, runtime as b, coalesce_to_error as c, copy_assets as d, get_aliases as e, posixify as f, get_mime_lookup as g, rimraf as h, copy as i, logger as j, load_template as l, mkdirp as m, print_config_conflicts as p, resolve_entry as r, walk as w };
+export { $, SVELTE_KIT_ASSETS as S, resolve_entry as a, SVELTE_KIT as b, coalesce_to_error as c, copy_assets as d, get_aliases as e, posixify as f, get_mime_lookup as g, rimraf as h, copy as i, logger as j, load_template as l, mkdirp as m, print_config_conflicts as p, runtime as r, walk as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.251",
+  "version": "1.0.0-next.255",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -40,7 +40,7 @@
     "svelte": "^3.44.2",
     "svelte-check": "^2.2.10",
     "svelte-preprocess": "^4.9.8",
-    "svelte2tsx": "~0.4.10",
+    "svelte2tsx": "~0.5.0",
     "tiny-glob": "^0.2.9",
     "uvu": "^0.5.2"
   },

package/types/ambient-modules.d.ts

@@ -107,16 +107,11 @@ declare module '$app/stores' {
 	 * Most of the time, you won't need to use it.
 	 */
 	export function getStores<Session = any>(): {
-		navigating: Readable<Navigating | null>;
-		page: Readable<{
-			url: URL;
-			params: Record<string, string>;
-			status: number;
-			error: Error | null;
-		}>;
+		navigating: typeof navigating;
+		page: typeof page;
 		session: Writable<Session>;
+		updated: typeof updated;
 	};
-	export const url: Readable<URL>;
 	/**
 	 * A readable store whose value contains page data.
 	 */
@@ -138,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;
 }

package/dist/chunks/url.js

@@ -1,119 +0,0 @@
-/** @type {Record<string, string>} */
-const escape_json_string_in_html_dict = {
-	'"': '\\"',
-	'<': '\\u003C',
-	'>': '\\u003E',
-	'/': '\\u002F',
-	'\\': '\\\\',
-	'\b': '\\b',
-	'\f': '\\f',
-	'\n': '\\n',
-	'\r': '\\r',
-	'\t': '\\t',
-	'\0': '\\0',
-	'\u2028': '\\u2028',
-	'\u2029': '\\u2029'
-};
-
-/** @param {string} str */
-function escape_json_string_in_html(str) {
-	return escape(
-		str,
-		escape_json_string_in_html_dict,
-		(code) => `\\u${code.toString(16).toUpperCase()}`
-	);
-}
-
-/** @type {Record<string, string>} */
-const escape_html_attr_dict = {
-	'<': '&lt;',
-	'>': '&gt;',
-	'"': '&quot;'
-};
-
-/**
- * use for escaping string values to be used html attributes on the page
- * e.g.
- * <script data-url="here">
- *
- * @param {string} str
- * @returns string escaped string
- */
-function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
-}
-
-/**
- *
- * @param str {string} string to escape
- * @param dict {Record<string, string>} dictionary of character replacements
- * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
- * @returns {string}
- */
-function escape(str, dict, unicode_encoder) {
-	let result = '';
-
-	for (let i = 0; i < str.length; i += 1) {
-		const char = str.charAt(i);
-		const code = char.charCodeAt(0);
-
-		if (char in dict) {
-			result += dict[char];
-		} else if (code >= 0xd800 && code <= 0xdfff) {
-			const next = str.charCodeAt(i + 1);
-
-			// If this is the beginning of a [high, low] surrogate pair,
-			// add the next two characters, otherwise escape
-			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
-				result += char + str[++i];
-			} else {
-				result += unicode_encoder(code);
-			}
-		} else {
-			result += char;
-		}
-	}
-
-	return result;
-}
-
-const absolute = /^([a-z]+:)?\/?\//;
-const scheme = /^[a-z]+:/;
-
-/**
- * @param {string} base
- * @param {string} path
- */
-function resolve(base, path) {
-	if (scheme.test(path)) return path;
-
-	const base_match = absolute.exec(base);
-	const path_match = absolute.exec(path);
-
-	if (!base_match) {
-		throw new Error(`bad base path: "${base}"`);
-	}
-
-	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
-	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
-
-	baseparts.pop();
-
-	for (let i = 0; i < pathparts.length; i += 1) {
-		const part = pathparts[i];
-		if (part === '.') continue;
-		else if (part === '..') baseparts.pop();
-		else baseparts.push(part);
-	}
-
-	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
-
-	return `${prefix}${baseparts.join('/')}`;
-}
-
-/** @param {string} path */
-function is_root_relative(path) {
-	return path[0] === '/' && path[1] !== '/';
-}
-
-export { escape_json_string_in_html as a, escape_html_attr as e, is_root_relative as i, resolve as r };