Fix inconsistent rendering of shadow routes on client/server-side

.changeset/curvy-experts-try.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fixes a bug with same module client-side navigation for shadow routes

packages/kit/src/runtime/client/renderer.js

@@ -615,6 +615,9 @@ export class Renderer {
 		if (props) {
 			// shadow endpoint props means we need to mark this URL as a dependency of itself
 			node.uses.dependencies.add(url.href);
+			for (const key in params) {
+				node.uses.params.add(key);
+			}
 		}
 
 		/** @type {Record<string, string>} */
@@ -743,6 +746,7 @@ export class Renderer {
 					!previous ||
 					module !== previous.module ||
 					(changed.url && previous.uses.url) ||
+					(has_shadow && i === a.length - 1) ||
 					changed.params.some((param) => previous.uses.params.has(param)) ||
 					(changed.session && previous.uses.session) ||
 					Array.from(previous.uses.dependencies).some((dep) => this.invalid.has(dep)) ||
@@ -754,7 +758,7 @@ export class Renderer {
 
 					if (has_shadow && i === a.length - 1) {
 						const res = await fetch(
-							`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json`,
+							`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json${url.search}`,
 							{
 								headers: {
 									'x-sveltekit-noredirect': 'true'

packages/kit/src/runtime/server/index.js

@@ -141,6 +141,11 @@ export async function respond(request, options, state = {}) {
 					if (!match) continue;
 
 					event.params = route.params ? decode_params(route.params(match)) : {};
+					if (event.url.pathname.endsWith(DATA_SUFFIX)) {
+						event.url = new URL(
+							event.url.origin + event.url.pathname.slice(0, -DATA_SUFFIX.length) + event.url.search
+						);
+					}
 
 					/** @type {Response | undefined} */
 					let response;