@sveltejs/kit 1.0.0-next.352 → 1.0.0-next.355

package/assets/app/env.js

@@ -4,13 +4,25 @@ export { prerendering } from '../env.js';
  * @type {import('$app/env').browser}
  */
 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;
 
-export { browser, dev, mode };
+export { browser, dev, mode, prod, server };

package/assets/client/start.js

@@ -577,16 +577,18 @@ function create_client({ target, session, base, trailing_slash }) {
 	let token;
 
 	/**
-	 * @param {string} href
+	 * @param {string | URL} url
 	 * @param {{ noscroll?: boolean; replaceState?: boolean; keepfocus?: boolean; state?: any }} opts
 	 * @param {string[]} redirect_chain
 	 */
 	async function goto(
-		href,
+		url,
 		{ noscroll = false, replaceState = false, keepfocus = false, state = {} },
 		redirect_chain
 	) {
-		const url = new URL(href, get_base_uri(document));
+		if (typeof url === 'string') {
+			url = new URL(url, get_base_uri(document));
+		}
 
 		if (router_enabled) {
 			return navigate({

package/assets/server/index.js

@@ -630,18 +630,6 @@ function escape_html_attr(str) {
 
 const s = JSON.stringify;
 
-/** @param {URL} url */
-function create_prerendering_url_proxy(url) {
-	return new Proxy(url, {
-		get: (target, prop, receiver) => {
-			if (prop === 'search' || prop === 'searchParams') {
-				throw new Error(`Cannot access url.${prop} on a page with prerendering enabled`);
-			}
-			return Reflect.get(target, prop, receiver);
-		}
-	});
-}
-
 const encoder = new TextEncoder();
 
 /**
@@ -1069,6 +1057,82 @@ class Csp {
 	}
 }
 
+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] !== '/';
+}
+
+/**
+ * @param {string} path
+ * @param {import('types').TrailingSlash} trailing_slash
+ */
+function normalize_path(path, trailing_slash) {
+	if (path === '/' || trailing_slash === 'ignore') return path;
+
+	if (trailing_slash === 'never') {
+		return path.endsWith('/') ? path.slice(0, -1) : path;
+	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
+		return path + '/';
+	}
+
+	return path;
+}
+
+class LoadURL extends URL {
+	/** @returns {string} */
+	get hash() {
+		throw new Error(
+			'url.hash is inaccessible from load. Consider accessing hash from the page store within the script tag of your component.'
+		);
+	}
+}
+
+class PrerenderingURL extends URL {
+	/** @returns {string} */
+	get search() {
+		throw new Error('Cannot access url.search on a page with prerendering enabled');
+	}
+
+	/** @returns {URLSearchParams} */
+	get searchParams() {
+		throw new Error('Cannot access url.searchParams on a page with prerendering enabled');
+	}
+}
+
 // TODO rename this function/module
 
 const updated = {
@@ -1171,7 +1235,7 @@ async function render_response({
 				routeId: event.routeId,
 				status,
 				stuff,
-				url: state.prerendering ? create_prerendering_url_proxy(event.url) : event.url
+				url: state.prerendering ? new PrerenderingURL(event.url) : event.url
 			},
 			components: branch.map(({ node }) => node.module.default)
 		};
@@ -1946,70 +2010,6 @@ function normalize(loaded) {
 	return /** @type {import('types').NormalizedLoadOutput} */ (loaded);
 }
 
-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] !== '/';
-}
-
-/**
- * @param {string} path
- * @param {import('types').TrailingSlash} trailing_slash
- */
-function normalize_path(path, trailing_slash) {
-	if (path === '/' || trailing_slash === 'ignore') return path;
-
-	if (trailing_slash === 'never') {
-		return path.endsWith('/') ? path.slice(0, -1) : path;
-	} else if (trailing_slash === 'always' && !path.endsWith('/')) {
-		return path + '/';
-	}
-
-	return path;
-}
-
-class LoadURL extends URL {
-	/** @returns {string} */
-	get hash() {
-		throw new Error(
-			'url.hash is inaccessible from load. Consider accessing hash from the page store within the script tag of your component.'
-		);
-	}
-}
-
 /**
  * @param {string} hostname
  * @param {string} [constraint]
@@ -2112,7 +2112,7 @@ async function load_node({
 	} else if (module.load) {
 		/** @type {import('types').LoadEvent} */
 		const load_input = {
-			url: state.prerendering ? create_prerendering_url_proxy(event.url) : new LoadURL(event.url),
+			url: state.prerendering ? new PrerenderingURL(event.url) : new LoadURL(event.url),
 			params: event.params,
 			props: shadow.body || {},
 			routeId: event.routeId,