Fix issue where an incoming query string got lost in a hash redirect

packages/pages-shared/__tests__/asset-server/handler.test.ts

@@ -998,6 +998,21 @@ describe("asset-server handler", () => {
 				"https://foobar.com/#def?test=abc"
 			);
 		});
+
+		// Query string needs to be _before_ the hash
+		test("redirects to a hash with an incoming query cross-origin", async () => {
+			const { response } = await getTestResponse({
+				request: "https://foo.com/bar?test=abc",
+				metadata: createMetadataObjectWithRedirects([
+					{ from: "/bar", to: "https://foobar.com/#heading", status: 301 },
+				]),
+			});
+
+			expect(response.status).toBe(301);
+			expect(response.headers.get("Location")).toBe(
+				"https://foobar.com/?test=abc#heading"
+			);
+		});
 	});
 });
 

packages/pages-shared/asset-server/handler.ts

@@ -227,7 +227,9 @@ export async function generateHandler<
 						? `${destination.pathname}${destination.search || search}${
 								destination.hash
 							}`
-						: `${destination.href}${destination.search ? "" : search}`;
+						: `${destination.href.slice(0, -(destination.search.length + destination.hash.length))}${
+								destination.search ? "" : search
+							}${destination.hash}`;
 
 				switch (status) {
 					case 301: