@sveltejs/kit 1.0.0-next.383 → 1.0.0-next.386

package/assets/app/env.js

@@ -5,24 +5,9 @@ export { prerendering } from '../env.js';
  */
 const browser = !import.meta.env.SSR;
 
-/**
- * @type {import('$app/env').server}
- */
-const server = !!import.meta.env.SSR;
-
 /**
  * @type {import('$app/env').dev}
  */
-const dev = !!import.meta.env.DEV;
-
-/**
- * @type {import('$app/env').prod}
- */
-const prod = !import.meta.env.DEV;
-
-/**
- * @type {import('$app/env').mode}
- */
-const mode = import.meta.env.MODE;
+const dev = __SVELTEKIT_DEV__;
 
-export { browser, dev, mode, prod, server };
+export { browser, dev };

package/assets/client/start.js

@@ -117,6 +117,28 @@ function normalize_path(path, trailing_slash) {
 	return path;
 }
 
+/** @param {Record<string, string>} params */
+function decode_params(params) {
+	for (const key in params) {
+		// input has already been decoded by decodeURI
+		// now handle the rest that decodeURIComponent would do
+		params[key] = params[key]
+			.replace(/%23/g, '#')
+			.replace(/%3[Bb]/g, ';')
+			.replace(/%2[Cc]/g, ',')
+			.replace(/%2[Ff]/g, '/')
+			.replace(/%3[Ff]/g, '?')
+			.replace(/%3[Aa]/g, ':')
+			.replace(/%40/g, '@')
+			.replace(/%26/g, '&')
+			.replace(/%3[Dd]/g, '=')
+			.replace(/%2[Bb]/g, '+')
+			.replace(/%24/g, '$');
+	}
+
+	return params;
+}
+
 class LoadURL extends URL {
 	/** @returns {string} */
 	get hash() {
@@ -1323,7 +1345,7 @@ function create_client({ target, session, base, trailing_slash }) {
 			if (params) {
 				const id = normalize_path(url.pathname, trailing_slash) + url.search;
 				/** @type {import('./types').NavigationIntent} */
-				const intent = { id, route, params, url };
+				const intent = { id, route, params: decode_params(params), url };
 				return intent;
 			}
 		}
@@ -1650,6 +1672,13 @@ function create_client({ target, session, base, trailing_slash }) {
 				}
 			});
 
+			// fix link[rel=icon], because browsers will occasionally try to load relative
+			// URLs after a pushState/replaceState, resulting in a 404 — see
+			// https://github.com/sveltejs/kit/issues/3748#issuecomment-1125980897
+			for (const link of document.querySelectorAll('link')) {
+				if (link.rel === 'icon') link.href = link.href;
+			}
+
 			addEventListener('pageshow', (event) => {
 				// If the user navigates to another site and then uses the back button and
 				// bfcache hits, we need to set navigating to null, the site doesn't know

package/assets/server/index.js

@@ -105,28 +105,6 @@ function lowercase_keys(obj) {
 	return clone;
 }
 
-/** @param {Record<string, string>} params */
-function decode_params(params) {
-	for (const key in params) {
-		// input has already been decoded by decodeURI
-		// now handle the rest that decodeURIComponent would do
-		params[key] = params[key]
-			.replace(/%23/g, '#')
-			.replace(/%3[Bb]/g, ';')
-			.replace(/%2[Cc]/g, ',')
-			.replace(/%2[Ff]/g, '/')
-			.replace(/%3[Ff]/g, '?')
-			.replace(/%3[Aa]/g, ':')
-			.replace(/%40/g, '@')
-			.replace(/%26/g, '&')
-			.replace(/%3[Dd]/g, '=')
-			.replace(/%2[Bb]/g, '+')
-			.replace(/%24/g, '$');
-	}
-
-	return params;
-}
-
 /** @param {any} body */
 function is_pojo(body) {
 	if (typeof body !== 'object') return false;
@@ -1290,6 +1268,28 @@ function normalize_path(path, trailing_slash) {
 	return path;
 }
 
+/** @param {Record<string, string>} params */
+function decode_params(params) {
+	for (const key in params) {
+		// input has already been decoded by decodeURI
+		// now handle the rest that decodeURIComponent would do
+		params[key] = params[key]
+			.replace(/%23/g, '#')
+			.replace(/%3[Bb]/g, ';')
+			.replace(/%2[Cc]/g, ',')
+			.replace(/%2[Ff]/g, '/')
+			.replace(/%3[Ff]/g, '?')
+			.replace(/%3[Aa]/g, ':')
+			.replace(/%40/g, '@')
+			.replace(/%26/g, '&')
+			.replace(/%3[Dd]/g, '=')
+			.replace(/%2[Bb]/g, '+')
+			.replace(/%24/g, '$');
+	}
+
+	return params;
+}
+
 class LoadURL extends URL {
 	/** @returns {string} */
 	get hash() {
@@ -1410,20 +1410,15 @@ async function render_response({
 		}
 
 		const session = writable($session);
+		// Even if $session isn't accessed, it still ends up serialized in the rendered HTML
+		is_private = is_private || (cache?.private ?? (!!$session && Object.keys($session).length > 0));
 
 		/** @type {Record<string, any>} */
 		const props = {
 			stores: {
 				page: writable(null),
 				navigating: writable(null),
-				/** @type {import('svelte/store').Writable<App.Session>} */
-				session: {
-					...session,
-					subscribe: (fn) => {
-						is_private = cache?.private ?? true;
-						return session.subscribe(fn);
-					}
-				},
+				session,
 				updated
 			},
 			/** @type {import('types').Page} */

package/dist/chunks/error.js

@@ -365,6 +365,24 @@ const options = object(
 					);
 				}),
 
+				origin: validate('http://sveltekit-prerender', (input, keypath) => {
+					assert_string(input, keypath);
+
+					let origin;
+
+					try {
+						origin = new URL(input).origin;
+					} catch (e) {
+						throw new Error(`${keypath} must be a valid origin`);
+					}
+
+					if (input !== origin) {
+						throw new Error(`${keypath} must be a valid origin (${origin} rather than ${input})`);
+					}
+
+					return origin;
+				}),
+
 				// TODO: remove this for the 1.0 release
 				pages: error((keypath) => `${keypath} has been renamed to \`entries\`.`)
 			}),

package/dist/cli.js

@@ -18,7 +18,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.383');
+const prog = sade('svelte-kit').version('1.0.0-next.386');
 
 prog
 	.command('package')

package/dist/node/polyfills.js

@@ -17769,6 +17769,7 @@ function installPolyfills() {
 		Object.defineProperty(globalThis, name, {
 			enumerable: true,
 			configurable: true,
+			writable: true,
 			value: globals[name]
 		});
 	}

package/dist/vite.js

@@ -7,7 +7,7 @@ import * as vite from 'vite';
 import { loadConfigFromFile } from 'vite';
 import { p as posixify, m as mkdirp, r as rimraf } from './chunks/write_tsconfig.js';
 import { g as get_runtime_directory, s, i as init, a as get_runtime_prefix, u as update, b as get_mime_lookup, p as parse_route_id, c as all, l as logger } from './chunks/sync.js';
-import { pathToFileURL, URL as URL$1 } from 'url';
+import { URL as URL$1, pathToFileURL } from 'url';
 import { installPolyfills } from './node/polyfills.js';
 import * as qs from 'querystring';
 import { getRequest, setResponse } from './node.js';
@@ -46,7 +46,7 @@ async function get_vite_config(config_env) {
 	if (!config) {
 		throw new Error('Could not load Vite config');
 	}
-	return config;
+	return { ...config, mode: config_env.mode };
 }
 
 /**
@@ -281,7 +281,8 @@ const get_default_config = function ({ config, input, ssr, outDir }) {
 			__SVELTEKIT_ADAPTER_NAME__: JSON.stringify(config.kit.adapter?.name),
 			__SVELTEKIT_APP_VERSION__: JSON.stringify(config.kit.version.name),
 			__SVELTEKIT_APP_VERSION_FILE__: JSON.stringify(`${config.kit.appDir}/version.json`),
-			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval)
+			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval),
+			__SVELTEKIT_DEV__: 'false'
 		},
 		// prevent Vite copying the contents of `config.kit.files.assets`,
 		// if it happens to be 'public' instead of 'static'
@@ -434,9 +435,9 @@ export class Server {
 /**
  * @param {{
  *   cwd: string;
- *   config: import('types').ValidatedConfig
- *   vite_config_env: import('vite').ConfigEnv
- *   manifest_data: import('types').ManifestData
+ *   config: import('types').ValidatedConfig;
+ *   vite_config_env: import('vite').ConfigEnv;
+ *   manifest_data: import('types').ManifestData;
  *   build_dir: string;
  *   output_dir: string;
  *   service_worker_entry_file: string | null;
@@ -1111,28 +1112,39 @@ function escape_html_attr(str) {
 
 /**
  * @typedef {import('types').PrerenderErrorHandler} PrerenderErrorHandler
- * @typedef {import('types').PrerenderOnErrorValue} OnError
  * @typedef {import('types').Logger} Logger
  */
 
-/** @type {(details: Parameters<PrerenderErrorHandler>[0] ) => string} */
-function format_error({ status, path, referrer, referenceType }) {
-	return `${status} ${path}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
+/**
+ * @param {Parameters<PrerenderErrorHandler>[0]} details
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function format_error({ status, path, referrer, referenceType }, config) {
+	const message =
+		status === 404 && !path.startsWith(config.paths.base)
+			? `${path} does not begin with \`base\`, which is configured in \`paths.base\` and can be imported from \`$app/paths\``
+			: path;
+
+	return `${status} ${message}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
 }
 
-/** @type {(log: Logger, onError: OnError) => PrerenderErrorHandler} */
-function normalise_error_handler(log, onError) {
-	switch (onError) {
+/**
+ * @param {Logger} log
+ * @param {import('types').ValidatedKitConfig} config
+ * @returns {PrerenderErrorHandler}
+ */
+function normalise_error_handler(log, config) {
+	switch (config.prerender.onError) {
 		case 'continue':
 			return (details) => {
-				log.error(format_error(details));
+				log.error(format_error(details, config));
 			};
 		case 'fail':
 			return (details) => {
-				throw new Error(format_error(details));
+				throw new Error(format_error(details, config));
 			};
 		default:
-			return onError;
+			return config.prerender.onError;
 	}
 }
 
@@ -1161,6 +1173,58 @@ async function prerender({ config, entries, files, log }) {
 	}
 
 	installPolyfills();
+	const { fetch } = globalThis;
+	globalThis.fetch = async (info, init) => {
+		/** @type {string} */
+		let url;
+
+		/** @type {RequestInit} */
+		let opts = {};
+
+		if (info instanceof Request) {
+			url = info.url;
+
+			opts = {
+				method: info.method,
+				headers: info.headers,
+				body: info.body,
+				mode: info.mode,
+				credentials: info.credentials,
+				cache: info.cache,
+				redirect: info.redirect,
+				referrer: info.referrer,
+				integrity: info.integrity
+			};
+		} else {
+			url = info.toString();
+		}
+
+		if (url.startsWith(config.prerender.origin + '/')) {
+			const request = new Request(url, opts);
+			const response = await server.respond(request, {
+				getClientAddress,
+				prerendering: {
+					dependencies: new Map()
+				}
+			});
+
+			const decoded = new URL$1(url).pathname;
+
+			save(
+				'dependencies',
+				response,
+				Buffer.from(await response.clone().arrayBuffer()),
+				decoded,
+				encodeURI(decoded),
+				null,
+				'fetched'
+			);
+
+			return response;
+		}
+
+		return fetch(info, init);
+	};
 
 	const server_root = join(config.outDir, 'output');
 
@@ -1176,7 +1240,7 @@ async function prerender({ config, entries, files, log }) {
 
 	const server = new Server(manifest);
 
-	const error = normalise_error_handler(log, config.prerender.onError);
+	const error = normalise_error_handler(log, config);
 
 	const q = queue(config.prerender.concurrency);
 
@@ -1230,7 +1294,7 @@ async function prerender({ config, entries, files, log }) {
 		/** @type {Map<string, import('types').PrerenderDependency>} */
 		const dependencies = new Map();
 
-		const response = await server.respond(new Request(`http://sveltekit-prerender${encoded}`), {
+		const response = await server.respond(new Request(config.prerender.origin + encoded), {
 			getClientAddress,
 			prerendering: {
 				dependencies
@@ -1366,7 +1430,7 @@ async function prerender({ config, entries, files, log }) {
 		await q.done();
 	}
 
-	const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
+	const rendered = await server.respond(new Request(config.prerender.origin + '/[fallback]'), {
 		getClientAddress,
 		prerendering: {
 			fallback: true,
@@ -2976,6 +3040,7 @@ function kit() {
 					}
 				},
 				define: {
+					__SVELTEKIT_DEV__: 'true',
 					__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: '0'
 				},
 				resolve: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.383",
+  "version": "1.0.0-next.386",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient.d.ts

@@ -65,7 +65,7 @@ declare namespace App {
 
 /**
  * ```ts
- * import { browser, dev, mode, prerendering, prod, server } from '$app/env';
+ * import { browser, dev, prerendering } from '$app/env';
  * ```
  */
 declare module '$app/env' {
@@ -75,31 +75,14 @@ declare module '$app/env' {
 	export const browser: boolean;
 
 	/**
-	 * `true` in development mode, `false` in production.
+	 * Whether the dev server is running. This is not guaranteed to correspond to `NODE_ENV` or `MODE`.
 	 */
 	export const dev: boolean;
 
-	/**
-	 * The Vite.js mode the app is running in. Configure in [`vite.config.js`](https://vitejs.dev/config/shared-options.html#mode).
-	 * Vite.js loads the dotenv file associated with the provided mode, `.env.[mode]` or `.env.[mode].local`.
-	 * By default, `vite dev` runs with `mode=development` and `vite build` runs with `mode=production`.
-	 */
-	export const mode: string;
-
 	/**
 	 * `true` when prerendering, `false` otherwise.
 	 */
 	export const prerendering: boolean;
-
-	/**
-	 * `true` in production mode, `false` in development.
-	 */
-	export const prod: boolean;
-
-	/**
-	 * `true` if the app is running on the server.
-	 */
-	export const server: boolean;
 }
 
 /**

package/types/index.d.ts

@@ -135,6 +135,7 @@ export interface KitConfig {
 		enabled?: boolean;
 		entries?: Array<'*' | `/${string}`>;
 		onError?: PrerenderOnErrorValue;
+		origin?: string;
 	};
 	routes?: (filepath: string) => boolean;
 	serviceWorker?: {

package/types/internal.d.ts

@@ -323,4 +323,5 @@ declare global {
 	const __SVELTEKIT_APP_VERSION__: string;
 	const __SVELTEKIT_APP_VERSION_FILE__: string;
 	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
+	const __SVELTEKIT_DEV__: boolean;
 }