From 6eaa5cc19d2d3dd939a9eac66c97ea3b3751aa07 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <accounts+github@wyattjoh.ca>
Date: Fri, 26 Aug 2022 13:20:53 +0100
Subject: [PATCH] fix: added extedned internal param removal

---
 packages/next/server/internal-utils.ts | 13 ++++++++++++-
 packages/next/server/web/adapter.ts    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/next/server/internal-utils.ts b/packages/next/server/internal-utils.ts
index e77842d13983c8b..d2637536d56b75d 100644
--- a/packages/next/server/internal-utils.ts
+++ b/packages/next/server/internal-utils.ts
@@ -12,16 +12,27 @@ const INTERNAL_QUERY_NAMES = [
   '__flight_router_state_tree__',
 ] as const
 
+const EXTENDED_INTERNAL_QUERY_NAMES = ['__nextDataReq'] as const
+
 export function stripInternalQueries(query: NextParsedUrlQuery) {
   for (const name of INTERNAL_QUERY_NAMES) {
     delete query[name]
   }
 }
 
-export function stripInternalSearchParams(searchParams: URLSearchParams) {
+export function stripInternalSearchParams(
+  searchParams: URLSearchParams,
+  extended?: boolean
+) {
   for (const name of INTERNAL_QUERY_NAMES) {
     searchParams.delete(name)
   }
 
+  if (extended) {
+    for (const name of EXTENDED_INTERNAL_QUERY_NAMES) {
+      searchParams.delete(name)
+    }
+  }
+
   return searchParams
 }
diff --git a/packages/next/server/web/adapter.ts b/packages/next/server/web/adapter.ts
index 1539eb1ca7b2654..c2ed309b588cacb 100644
--- a/packages/next/server/web/adapter.ts
+++ b/packages/next/server/web/adapter.ts
@@ -60,7 +60,7 @@ export async function adapter(params: {
   requestUrl.flightData = undefined
 
   // Strip internal query parameters off the request.
-  stripInternalSearchParams(requestUrl.searchParams)
+  stripInternalSearchParams(requestUrl.searchParams, true)
 
   const request = new NextRequestHint({
     page: params.page,