From d96848ba6d1a628652fe93e913e8629abf0d3e2c Mon Sep 17 00:00:00 2001
From: Steven Hall <steven@gitbook.io>
Date: Wed, 18 Jun 2025 11:19:05 +0100
Subject: [PATCH] Update test + implementation

---
 packages/gitbook-v2/src/middleware.ts | 6 +-----
 packages/gitbook/e2e/internal.spec.ts | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/gitbook-v2/src/middleware.ts b/packages/gitbook-v2/src/middleware.ts
index 722b3c26e..4bcbf77ae 100644
--- a/packages/gitbook-v2/src/middleware.ts
+++ b/packages/gitbook-v2/src/middleware.ts
@@ -259,11 +259,7 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) {
         console.log(`rewriting ${request.nextUrl.toString()} to ${route}`);
 
         const rewrittenURL = new URL(`/${route}`, request.nextUrl.toString());
-
-        // Ensure all searchParams are brought over to the rewritten URL
-        request.nextUrl.searchParams.forEach((value, key) => {
-            rewrittenURL.searchParams.set(key, value);
-        });
+        rewrittenURL.search = request.nextUrl.search; // Preserve the original search params
 
         const response = NextResponse.rewrite(rewrittenURL, {
             request: {
diff --git a/packages/gitbook/e2e/internal.spec.ts b/packages/gitbook/e2e/internal.spec.ts
index 67fa3cda9..ad945bfa5 100644
--- a/packages/gitbook/e2e/internal.spec.ts
+++ b/packages/gitbook/e2e/internal.spec.ts
@@ -82,11 +82,11 @@ const testCases: TestsCase[] = [
             },
             {
                 name: 'PDF (all pages)',
-                url: '~gitbook/pdf?limit=100',
+                url: '~gitbook/pdf?limit=10',
             },
             {
                 name: 'PDF (only current page)',
-                url: '~gitbook/pdf?page=Bw7LjWwgTjV8nIV4s7rs&only=yes&limit=100',
+                url: '~gitbook/pdf?page=Bw7LjWwgTjV8nIV4s7rs&only=yes&limit=2',
             },
             {
                 name: 'Not found',
@@ -316,11 +316,11 @@ const testCases: TestsCase[] = [
             },
             {
                 name: 'PDF (all pages)',
-                url: '~gitbook/pdf?limit=100',
+                url: '~gitbook/pdf?limit=10',
             },
             {
                 name: 'PDF (only current page)',
-                url: '~gitbook/pdf?page=DfnNkU49mvLe2ythHAyx&only=yes&limit=100',
+                url: '~gitbook/pdf?page=DfnNkU49mvLe2ythHAyx&only=yes&limit=2', // limit 2 pages to catch any bugs with multiple pages
             },
             {
                 name: 'Not found',