From fa4fedd44376836f49d51bdf7415294474ac262d Mon Sep 17 00:00:00 2001 From: Philipp Zerelles Date: Sat, 29 May 2021 10:35:57 +0200 Subject: [PATCH 1/2] fix: on rehydrate, when page has no query params, construct them from location.search (#1218) --- packages/kit/src/runtime/server/page/render.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index e6538758ba6c..2a9d84287907 100644 --- a/packages/kit/src/runtime/server/page/render.js +++ b/packages/kit/src/runtime/server/page/render.js @@ -136,7 +136,7 @@ export async function render_response({ page: { host: ${page.host ? s(page.host) : 'location.host'}, // TODO this is redundant path: ${s(page.path)}, - query: new URLSearchParams(${s(page.query.toString())}), + query: new URLSearchParams(${page.query.toString().length > 0 ? s(page.query.toString()) : 'location.search'}), params: ${s(page.params)} } }` : 'null'} From f2c3b36526e7f8284edf67b4d49e63e3839a3119 Mon Sep 17 00:00:00 2001 From: Philipp Zerelles Date: Sat, 29 May 2021 10:35:57 +0200 Subject: [PATCH 2/2] simplified to only use location.search --- packages/kit/src/runtime/server/page/render.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index 2a9d84287907..ca6eaaf17862 100644 --- a/packages/kit/src/runtime/server/page/render.js +++ b/packages/kit/src/runtime/server/page/render.js @@ -136,7 +136,7 @@ export async function render_response({ page: { host: ${page.host ? s(page.host) : 'location.host'}, // TODO this is redundant path: ${s(page.path)}, - query: new URLSearchParams(${page.query.toString().length > 0 ? s(page.query.toString()) : 'location.search'}), + query: new URLSearchParams(location.search), params: ${s(page.params)} } }` : 'null'}