fix: only add query string if there is one

10up · Dec 12, 2024 · 0515354 · 0515354
1 parent 7ef872b
commit 0515354
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/next/src/middlewares/appMidleware.ts b/packages/next/src/middlewares/appMidleware.ts
@@ -191,10 +191,11 @@ export async function AppMiddleware(
 
 	if (isMultisiteRequest && !shouldRedirect) {
 		const hostNameOrSlug = site.slug || hostname;
-		const pagesRouterRewrite = `/_sites/${hostNameOrSlug}${pathname}`;
+		const queryString = searchParams.keys.length ? `?${searchParams.toString()}` : '';
+		const pagesRouterRewrite = `/_sites/${hostNameOrSlug}${pathname}${queryString}`;
 		const appRouterRewrite = locale
-			? `/${locale}/${hostNameOrSlug}${pathname.replace(`/${locale}`, '')}?${searchParams.toString()}`
-			: `/${hostNameOrSlug}${pathname}?${searchParams.toString()}`;
+			? `/${locale}/${hostNameOrSlug}${pathname.replace(`/${locale}`, '')}${queryString}`
+			: `/${hostNameOrSlug}${pathname}${queryString}`;
 
 		response = NextResponse.rewrite(
 			new URL(options.appRouter ? appRouterRewrite : pagesRouterRewrite, req.nextUrl),