@sveltejs/kit 1.0.0-next.584 → 1.0.0-next.586

package/package.json

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

package/src/exports/vite/build/utils.js

@@ -117,8 +117,6 @@ export function resolve_symlinks(manifest, file) {
  * @return {import('vite').UserConfig}
  */
 export function get_build_setup_config({ config, ssr }) {
-	const prefix = `${config.kit.appDir}/immutable`;
-
 	return {
 		build: {
 			// don't use the default name to avoid collisions with 'static/manifest.json'
@@ -148,15 +146,6 @@ export function get_build_setup_config({ config, ssr }) {
 				// because they for example use esbuild.build with `platform: 'browser'`
 				'esm-env'
 			]
-		},
-		worker: {
-			rollupOptions: {
-				output: {
-					entryFileNames: `${prefix}/workers/[name]-[hash].js`,
-					chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
-					hoistTransitiveImports: false
-				}
-			}
 		}
 	};
 }
@@ -194,7 +183,16 @@ export function get_build_compile_config({ config, input, ssr, outDir }) {
 			},
 			target: ssr ? 'node16.14' : undefined
 		},
-		publicDir: ssr ? false : config.kit.files.assets
+		publicDir: ssr ? false : config.kit.files.assets,
+		worker: {
+			rollupOptions: {
+				output: {
+					entryFileNames: `${prefix}/workers/[name]-[hash].js`,
+					chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
+					hoistTransitiveImports: false
+				}
+			}
+		}
 	};
 }
 

package/src/exports/vite/index.js

@@ -354,9 +354,7 @@ function kit({ svelte_config }) {
 		 * Clears the output directories.
 		 */
 		buildStart() {
-			if (vite_config.build.ssr) {
-				return;
-			}
+			if (vite_config.build.ssr) return;
 
 			// Reset for new build. Goes here because `build --watch` calls buildStart but not config
 			completed_build = false;
@@ -371,6 +369,16 @@ function kit({ svelte_config }) {
 			}
 		},
 
+		generateBundle() {
+			if (vite_config.build.ssr) return;
+
+			this.emitFile({
+				type: 'asset',
+				fileName: `${svelte_config.kit.appDir}/version.json`,
+				source: JSON.stringify({ version: svelte_config.kit.version.name })
+			});
+		},
+
 		/**
 		 * Vite builds a single bundle. We need three bundles: client, server, and service worker.
 		 * The user's package.json scripts will invoke the Vite CLI to execute the client build. We
@@ -379,9 +387,7 @@ function kit({ svelte_config }) {
 		writeBundle: {
 			sequential: true,
 			async handler(_options, bundle) {
-				if (vite_config.build.ssr) {
-					return;
-				}
+				if (vite_config.build.ssr) return;
 
 				const guard = module_guard(this, {
 					cwd: vite.normalizePath(process.cwd()),
@@ -401,11 +407,6 @@ function kit({ svelte_config }) {
 					verbose
 				});
 
-				fs.writeFileSync(
-					`${paths.client_out_dir}/${svelte_config.kit.appDir}/version.json`,
-					JSON.stringify({ version: svelte_config.kit.version.name })
-				);
-
 				const { assets, chunks } = collect_output(bundle);
 				log.info(
 					`Client build completed. Wrote ${chunks.length} chunks and ${assets.length} assets`

package/src/runtime/components/error.svelte

@@ -3,14 +3,4 @@
 </script>
 
 <h1>{$page.status}</h1>
-
-<pre>{$page.error.message}</pre>
-
-<!-- TODO figure out what to do with frames/stacktraces in prod -->
-<!-- frame is populated by Svelte in its CompileError and is a Rollup/Vite convention -->
-{#if $page.error.frame}
-	<pre>{$page.error.frame}</pre>
-{/if}
-{#if $page.error.stack}
-	<pre>{$page.error.stack}</pre>
-{/if}
+<p>{$page.error?.message}</p>

package/src/runtime/server/cookie.js

@@ -8,10 +8,6 @@ import { normalize_path } from '../../utils/url.js';
  * @type {Record<string, Set<string>>} */
 const cookie_paths = {};
 
-// default encoding functions for header cookie values
-const encode = encodeURIComponent;
-const decode = decodeURIComponent;
-
 /**
  * @param {Request} request
  * @param {URL} url
@@ -20,23 +16,25 @@ const decode = decodeURIComponent;
  */
 export function get_cookies(request, url, dev, trailing_slash) {
 	const header = request.headers.get('cookie') ?? '';
-	const initial_cookies = parse(header, { decode });
+	const initial_cookies = parse(header, { decode: (value) => value });
 
 	const normalized_url = normalize_path(url.pathname, trailing_slash);
 	// Emulate browser-behavior: if the cookie is set at '/foo/bar', its path is '/foo'
 	const default_path = normalized_url.split('/').slice(0, -1).join('/') || '/';
 
 	if (dev) {
+		// TODO this could theoretically be wrong if the cookie was set unencoded?
+		const initial_decoded_cookies = parse(header, { decode: decodeURIComponent });
 		// Remove all cookies that no longer exist according to the request
 		for (const name of Object.keys(cookie_paths)) {
 			cookie_paths[name] = new Set(
 				[...cookie_paths[name]].filter(
-					(path) => !path_matches(normalized_url, path) || name in initial_cookies
+					(path) => !path_matches(normalized_url, path) || name in initial_decoded_cookies
 				)
 			);
 		}
 		// Add all new cookies we might not have seen before
-		for (const name in initial_cookies) {
+		for (const name in initial_decoded_cookies) {
 			cookie_paths[name] = cookie_paths[name] ?? new Set();
 			if (![...cookie_paths[name]].some((path) => path_matches(normalized_url, path))) {
 				cookie_paths[name].add(default_path);
@@ -75,7 +73,7 @@ export function get_cookies(request, url, dev, trailing_slash) {
 				return c.value;
 			}
 
-			const decoder = opts?.decode || decode;
+			const decoder = opts?.decode || decodeURIComponent;
 			const req_cookies = parse(header, { decode: decoder });
 			const cookie = req_cookies[name]; // the decoded string or undefined
 
@@ -161,12 +159,10 @@ export function get_cookies(request, url, dev, trailing_slash) {
 	 */
 	function get_cookie_header(destination, header) {
 		/** @type {Record<string, string>} */
-		const combined_cookies = {};
-
-		// cookies sent by the user agent have lowest precedence
-		for (const name in initial_cookies) {
-			combined_cookies[name] = encode(initial_cookies[name]);
-		}
+		const combined_cookies = {
+			// cookies sent by the user agent have lowest precedence
+			...initial_cookies
+		};
 
 		// cookies previous set during this event with cookies.set have higher precedence
 		for (const key in new_cookies) {
@@ -174,15 +170,15 @@ export function get_cookies(request, url, dev, trailing_slash) {
 			if (!domain_matches(destination.hostname, cookie.options.domain)) continue;
 			if (!path_matches(destination.pathname, cookie.options.path)) continue;
 
-			const encoder = cookie.options.encode || encode;
+			const encoder = cookie.options.encode || encodeURIComponent;
 			combined_cookies[cookie.name] = encoder(cookie.value);
 		}
 
 		// explicit header has highest precedence
 		if (header) {
-			const parsed = parse(header, { decode });
+			const parsed = parse(header, { decode: (value) => value });
 			for (const name in parsed) {
-				combined_cookies[name] = encode(parsed[name]);
+				combined_cookies[name] = parsed[name];
 			}
 		}