@sveltejs/kit 1.0.0-next.349 → 1.0.0-next.351

package/assets/client/start.js

@@ -110,6 +110,15 @@ function normalize_path(path, trailing_slash) {
 	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 {HTMLDocument} doc */
 function get_base_uri(doc) {
 	let baseURI = doc.baseURI;
@@ -939,6 +948,7 @@ function create_client({ target, session, base, trailing_slash }) {
 		}
 
 		const session = $session;
+		const load_url = new LoadURL(url);
 
 		if (module.load) {
 			/** @type {import('types').LoadEvent} */
@@ -948,18 +958,7 @@ function create_client({ target, session, base, trailing_slash }) {
 				props: props || {},
 				get url() {
 					node.uses.url = true;
-
-					return new Proxy(url, {
-						get: (target, property) => {
-							if (property === 'hash') {
-								throw new Error(
-									'url.hash is inaccessible from load. Consider accessing hash from the page store within the script tag of your component.'
-								);
-							}
-
-							return Reflect.get(target, property, target);
-						}
-					});
+					return load_url;
 				},
 				get session() {
 					node.uses.session = true;

package/assets/server/index.js

@@ -2001,6 +2001,15 @@ function normalize_path(path, trailing_slash) {
 	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]
@@ -2103,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) : event.url,
+			url: state.prerendering ? create_prerendering_url_proxy(event.url) : new LoadURL(event.url),
 			params: event.params,
 			props: shadow.body || {},
 			routeId: event.routeId,

package/dist/chunks/index.js

@@ -161,6 +161,10 @@ const get_default_config = function ({ client_out_dir, config, input, output_dir
 		plugins: [
 			svelte({
 				...config,
+				compilerOptions: {
+					...config.compilerOptions,
+					hydratable: !!config.kit.browser.hydrate
+				},
 				configFile: false
 			})
 		],
@@ -405,7 +409,7 @@ export class Server {
 				error.stack = this.options.get_stack(error);
 			},
 			hooks: null,
-			hydrate: ${s(config.compilerOptions.hydratable)},
+			hydrate: ${s(config.kit.browser.hydrate)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },

package/dist/chunks/plugin.js

@@ -388,7 +388,7 @@ const sveltekit = function (svelte_config) {
 									});
 								},
 								hooks,
-								hydrate: svelte_config.compilerOptions.hydratable,
+								hydrate: svelte_config.kit.browser.hydrate,
 								manifest,
 								method_override: svelte_config.kit.methodOverride,
 								paths: {
@@ -536,6 +536,10 @@ function has_correct_case(file, assets) {
 const svelte = function (svelte_config) {
 	return svelte$1({
 		...svelte_config,
+		compilerOptions: {
+			...svelte_config.compilerOptions,
+			hydratable: !!svelte_config.kit.browser.hydrate
+		},
 		configFile: false
 	});
 };

package/dist/cli.js

@@ -211,10 +211,6 @@ function get_aliases(config) {
 /** @type {Validator} */
 const options = object(
 	{
-		compilerOptions: object({
-			hydratable: boolean(true)
-		}),
-
 		extensions: validate(['.svelte'], (input, keypath) => {
 			if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
 				throw new Error(`${keypath} must be an array of strings`);
@@ -284,10 +280,7 @@ const options = object(
 			}),
 
 			browser: object({
-				// TODO remove for 1.0
-				hydrate: error(
-					(keypath) => `${keypath} has been moved to config.compilerOptions.hydratable`
-				),
+				hydrate: boolean(true),
 				router: boolean(true)
 			}),
 
@@ -355,7 +348,7 @@ const options = object(
 			),
 
 			// TODO remove for 1.0
-			hydrate: error((keypath) => `${keypath} has been moved to config.compilerOptions.hydratable`),
+			hydrate: error((keypath) => `${keypath} has been moved to config.kit.browser.hydrate`),
 
 			inlineStyleThreshold: number(0),
 
@@ -818,7 +811,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.349');
+const prog = sade('svelte-kit').version('1.0.0-next.351');
 
 prog
 	.command('dev')
@@ -1058,7 +1051,7 @@ prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.349'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.351'}\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.349",
+  "version": "1.0.0-next.351",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -10,7 +10,7 @@
   "homepage": "https://kit.svelte.dev",
   "type": "module",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.48",
     "chokidar": "^3.5.3",
     "sade": "^1.8.1",
     "vite": "^2.9.10"