diff --git a/runtime/src/app/app.ts b/runtime/src/app/app.ts index 6b7fec5..a75f70d 100644 --- a/runtime/src/app/app.ts +++ b/runtime/src/app/app.ts @@ -104,14 +104,13 @@ export function select_target(url: URL): Target { // avoid accidental clashes between server routes and page routes if (ignore.some(pattern => pattern.test(path))) return; - const query: Query = extract_query(url.search) - for (let i = 0; i < routes.length; i += 1) { const route = routes[i]; const match = route.pattern.exec(path); if (match) { + const query: Query = extract_query(url.search); const part = route.parts[route.parts.length - 1]; const params = part.params ? part.params(match) : {}; @@ -141,7 +140,7 @@ export function handle_error(url: URL) { segments: preloaded } - const query = extract_query(search) + const query = extract_query(search); render(null, [], props, { path: pathname, query, params: {} }); } diff --git a/runtime/src/app/start/index.ts b/runtime/src/app/start/index.ts index 3c8f898..c68f371 100644 --- a/runtime/src/app/start/index.ts +++ b/runtime/src/app/start/index.ts @@ -35,7 +35,7 @@ export default function start(opts: { history.replaceState({ id: uid }, '', href); - const url = new URL(location.href) + const url = new URL(location.href); if (initial_data.error) return handle_error(url);