Feature/rewrite with query string (#281)

* feat: add query string parameter to rewrite-destination page

examples/app-pages-router/app/rewrite-destination/page.tsx

@@ -1,3 +1,12 @@
-export default function RewriteDestination() {
-  return <div>Rewritten Destination</div>;
+export default function RewriteDestination({
+  searchParams,
+}: {
+  searchParams: { a: string };
+}) {
+  return (
+    <div>
+      <div>Rewritten Destination</div>
+      <div>a: {searchParams.a}</div>
+    </div>
+  );
 }

examples/app-pages-router/middleware.ts

@@ -12,6 +12,7 @@ export function middleware(request: NextRequest) {
     });
   } else if (path === "/rewrite") {
     const u = new URL("/rewrite-destination", `${protocol}://${host}`);
+    u.searchParams.set("a", "b");
     return NextResponse.rewrite(u);
   } else if (path === "/api/middleware") {
     return new NextResponse(JSON.stringify({ hello: "middleware" }), {

packages/open-next/src/adapters/routing/middleware.ts

@@ -139,8 +139,15 @@ export async function handleMiddleware(
   // NOTE: the header was added to `req` from above
   const rewriteUrl = responseHeaders.get("x-middleware-rewrite");
   let rewritten = false;
+  let middlewareQueryString = internalEvent.query;
   if (rewriteUrl) {
-    req.url = new URL(rewriteUrl).pathname;
+    const rewriteUrlObject = new URL(rewriteUrl);
+    req.url = rewriteUrlObject.pathname;
+    //reset qs
+    middlewareQueryString = {};
+    rewriteUrlObject.searchParams.forEach((v: string, k: string) => {
+      middlewareQueryString[k] = v;
+    });
     rewritten = true;
   }
 
@@ -164,7 +171,7 @@ export async function handleMiddleware(
     headers: { ...internalEvent.headers, ...reqHeaders },
     body: internalEvent.body,
     method: internalEvent.method,
-    query: internalEvent.query,
+    query: middlewareQueryString,
     cookies: internalEvent.cookies,
     remoteAddress: internalEvent.remoteAddress,
   };

packages/tests-e2e/tests/appPagesRouter/middleware.rewrite.test.ts

@@ -7,10 +7,13 @@ test("Middleware Rewrite", async ({ page }) => {
   await page.waitForURL(`/rewrite`);
   let el = page.getByText("Rewritten Destination", { exact: true });
   await expect(el).toBeVisible();
-
+  el = page.getByText("a: b", { exact: true });
+  await expect(el).toBeVisible();
   // Loading page should also rewrite
   await page.goto(`/rewrite`);
   await page.waitForURL(`/rewrite`);
   el = page.getByText("Rewritten Destination", { exact: true });
   await expect(el).toBeVisible();
+  el = page.getByText("a: b", { exact: true });
+  await expect(el).toBeVisible();
 });