@sveltejs/kit 1.0.0-next.229 → 1.0.0-next.232

package/assets/{runtime/app → app}/navigation.js

@@ -1,4 +1,4 @@
-import { renderer, router as router$1 } from '../internal/singletons.js';
+import { renderer, router as router$1 } from '../client/singletons.js';
 import { g as get_base_uri } from '../chunks/utils.js';
 
 const router = /** @type {import('../client/router').Router} */ (router$1);

package/assets/{runtime/internal → client}/start.js

@@ -1,5 +1,5 @@
-import Root from '../../generated/root.svelte';
-import { fallback, routes } from '../../generated/manifest.js';
+import Root from '__GENERATED__/root.svelte';
+import { fallback, routes } from '__GENERATED__/manifest.js';
 import { onMount, tick } from 'svelte';
 import { g as get_base_uri } from '../chunks/utils.js';
 import { writable } from 'svelte/store';
@@ -156,7 +156,7 @@ class Router {
 		addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);
 
 		/** @param {MouseEvent} event */
-		addEventListener('click', async (event) => {
+		addEventListener('click', (event) => {
 			if (!this.enabled) return;
 
 			// Adapted from https://github.com/visionmedia/page.js
@@ -1326,8 +1326,6 @@ class Renderer {
 	}
 }
 
-// @ts-expect-error - doesn't exist yet. generated by Rollup
-
 /**
  * @param {{
  *   paths: {

package/assets/{kit.js → server/index.js}

@@ -1896,7 +1896,12 @@ async function respond(incoming, options, state = {}) {
 					});
 				}
 
-				const decoded = decodeURI(request.url.pathname).replace(options.paths.base, '');
+				let decoded = decodeURI(request.url.pathname);
+
+				if (options.paths.base) {
+					if (!decoded.startsWith(options.paths.base)) return;
+					decoded = decoded.slice(options.paths.base.length) || '/';
+				}
 
 				for (const route of options.manifest._.routes) {
 					const match = route.pattern.exec(decoded);
@@ -1908,8 +1913,9 @@ async function respond(incoming, options, state = {}) {
 							: await render_page(request, route, match, options, state, ssr);
 
 					if (response) {
-						// inject ETags for 200 responses
-						if (response.status === 200) {
+						// inject ETags for 200 responses, if the endpoint
+						// doesn't have its own ETag handling
+						if (response.status === 200 && !response.headers.etag) {
 							const cache_control = get_single_valued_header(response.headers, 'cache-control');
 							if (!cache_control || !/(no-store|immutable)/.test(cache_control)) {
 								let if_none_match_value = request.headers['if-none-match'];