From 41f5d9cf0f1329fc6c2264d09d69998d9b497a7e Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Sat, 12 Oct 2024 10:19:05 -0400
Subject: [PATCH 1/8] fix: set x-deployment-id to every prefetch request

---
 packages/next/src/shared/lib/router/router.ts |  6 +++--
 .../app/pages/index.tsx                       |  4 ++++
 .../deployment-id-handling.test.ts            | 24 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index 91d7de55f36a1..ca25bf73c4850 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -444,6 +444,7 @@ function fetchRetry(
     method: options.method || 'GET',
     headers: Object.assign({}, options.headers, {
       'x-nextjs-data': '1',
+      'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID,
     }),
   }).then((response) => {
     return !response.ok && attempts > 1 && response.status >= 500
@@ -1921,8 +1922,9 @@ export default class Router implements BaseRouter {
 
     try {
       let props: Record<string, any> | undefined
-      const { page: Component, styleSheets } =
-        await this.fetchComponent('/_error')
+      const { page: Component, styleSheets } = await this.fetchComponent(
+        '/_error'
+      )
 
       const routeInfo: CompletePrivateRouteInfo = {
         props,
diff --git a/test/production/deployment-id-handling/app/pages/index.tsx b/test/production/deployment-id-handling/app/pages/index.tsx
index 077744d736c13..f8890e6702348 100644
--- a/test/production/deployment-id-handling/app/pages/index.tsx
+++ b/test/production/deployment-id-handling/app/pages/index.tsx
@@ -1,6 +1,7 @@
 import testImage from '../public/test.jpg'
 import Image from 'next/image'
 import styles from './styles.module.css'
+import Link from 'next/link'
 
 export default function Page() {
   return (
@@ -8,6 +9,9 @@ export default function Page() {
       <p className={styles.template}>hello pages</p>
       <p id="deploymentId">{process.env.NEXT_DEPLOYMENT_ID}</p>
       <Image src={testImage} alt="test image" />
+      <Link href="/pages-edge" id="edge-link">
+        Edge
+      </Link>
 
       <button
         onClick={() => {
diff --git a/test/production/deployment-id-handling/deployment-id-handling.test.ts b/test/production/deployment-id-handling/deployment-id-handling.test.ts
index 15f39f76ad0f2..2d381246e9f7c 100644
--- a/test/production/deployment-id-handling/deployment-id-handling.test.ts
+++ b/test/production/deployment-id-handling/deployment-id-handling.test.ts
@@ -84,6 +84,30 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])(
       }
     )
 
+    it('should contain deployment id in prefetch request', async () => {
+      const dataHeaders = []
+      const browser = await next.browser('/', {
+        beforePageLoad(page) {
+          page.on('request', async (req) => {
+            const headers = await req.allHeaders()
+            if (headers['x-next-data']) {
+              dataHeaders.push(headers)
+            }
+          })
+        },
+      })
+
+      await browser.elementById('edge-link').click()
+
+      expect(dataHeaders.length).toBeGreaterThan(0)
+
+      expect(
+        dataHeaders.every(
+          (headers) => headers['x-deployment-id'] === deploymentId
+        )
+      ).toBe(true)
+    })
+
     it('should contain deployment id in RSC payload request headers', async () => {
       const rscHeaders = []
       const browser = await next.browser('/from-app', {

From 0f86036447f8a567bde5eefb2a7047f76857a1f5 Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Sat, 12 Oct 2024 10:58:51 -0400
Subject: [PATCH 2/8] isolate setting x-deployment-id to middleware-only

---
 packages/next/src/shared/lib/router/router.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index ca25bf73c4850..1bda2e82bf46e 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -444,7 +444,6 @@ function fetchRetry(
     method: options.method || 'GET',
     headers: Object.assign({}, options.headers, {
       'x-nextjs-data': '1',
-      'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID,
     }),
   }).then((response) => {
     return !response.ok && attempts > 1 && response.status >= 500
@@ -498,7 +497,12 @@ function fetchNextData({
       headers: Object.assign(
         {} as HeadersInit,
         isPrefetch ? { purpose: 'prefetch' } : {},
-        isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {}
+        isPrefetch && hasMiddleware
+          ? {
+              'x-middleware-prefetch': '1',
+              'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID,
+            }
+          : {}
       ),
       method: params?.method ?? 'GET',
     })

From f10807af2c526946cd1227055e7e4ff1178a1c6d Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Sat, 12 Oct 2024 11:00:22 -0400
Subject: [PATCH 3/8] add middleware to test

---
 test/production/deployment-id-handling/app/middleware.ts | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 test/production/deployment-id-handling/app/middleware.ts

diff --git a/test/production/deployment-id-handling/app/middleware.ts b/test/production/deployment-id-handling/app/middleware.ts
new file mode 100644
index 0000000000000..f37782f3cab3d
--- /dev/null
+++ b/test/production/deployment-id-handling/app/middleware.ts
@@ -0,0 +1,5 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+export function middleware(_req: NextRequest) {
+  return NextResponse.next()
+}

From aaa77dad03368bda3d7911aabc47b9c69d6e793a Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Tue, 17 Dec 2024 12:14:24 -0500
Subject: [PATCH 4/8] fix: assign x-deployment-id to all next data fetch
 requests

---
 packages/next/src/shared/lib/router/router.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index 1bda2e82bf46e..fba53c4f0a34c 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -497,12 +497,8 @@ function fetchNextData({
       headers: Object.assign(
         {} as HeadersInit,
         isPrefetch ? { purpose: 'prefetch' } : {},
-        isPrefetch && hasMiddleware
-          ? {
-              'x-middleware-prefetch': '1',
-              'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID,
-            }
-          : {}
+        isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {},
+        { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID }
       ),
       method: params?.method ?? 'GET',
     })

From c496c850b7579117e971a3bd0afe6affc4142a38 Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Tue, 17 Dec 2024 12:23:53 -0500
Subject: [PATCH 5/8] lint-fix

---
 packages/next/src/shared/lib/router/router.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index 781ab77e1930f..42d2784c3e916 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -1916,9 +1916,8 @@ export default class Router implements BaseRouter {
 
     try {
       let props: Record<string, any> | undefined
-      const { page: Component, styleSheets } = await this.fetchComponent(
-        '/_error'
-      )
+      const { page: Component, styleSheets } =
+        await this.fetchComponent('/_error')
 
       const routeInfo: CompletePrivateRouteInfo = {
         props,

From c2a77f16221f167009f2a2d2db15eff63d4ec9ce Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrewjiang@hey.com>
Date: Tue, 17 Dec 2024 22:19:11 -0500
Subject: [PATCH 6/8] Update router.ts

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 packages/next/src/shared/lib/router/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index 42d2784c3e916..9751783208f9c 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -499,7 +499,7 @@ function fetchNextData({
         {} as HeadersInit,
         isPrefetch ? { purpose: 'prefetch' } : {},
         isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {},
-        { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID }
+        process.env.NEXT_DEPLOYMENT_ID ? { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID } : {}
       ),
       method: params?.method ?? 'GET',
     })

From bab0894fecf3d8f5362e1c40e00d628fbea9ca48 Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Wed, 18 Dec 2024 06:47:17 -0500
Subject: [PATCH 7/8] lint-fix

---
 packages/next/src/shared/lib/router/router.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index 9751783208f9c..e5178aecad39e 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -499,7 +499,9 @@ function fetchNextData({
         {} as HeadersInit,
         isPrefetch ? { purpose: 'prefetch' } : {},
         isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {},
-        process.env.NEXT_DEPLOYMENT_ID ? { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID } : {}
+        process.env.NEXT_DEPLOYMENT_ID
+          ? { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID }
+          : {}
       ),
       method: params?.method ?? 'GET',
     })

From fce1c6d257c700490f3f77a365f78d9f1ec5fb42 Mon Sep 17 00:00:00 2001
From: Andrew Jiang <andrew@buildwithfern.com>
Date: Wed, 18 Dec 2024 07:15:12 -0500
Subject: [PATCH 8/8] fix: update test with getServerSideProps

---
 .../deployment-id-handling/app/pages/pages-edge.tsx  | 12 ++++++++++--
 .../deployment-id-handling.test.ts                   | 10 +++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/test/production/deployment-id-handling/app/pages/pages-edge.tsx b/test/production/deployment-id-handling/app/pages/pages-edge.tsx
index c9ee109db6928..789a8c99fe503 100644
--- a/test/production/deployment-id-handling/app/pages/pages-edge.tsx
+++ b/test/production/deployment-id-handling/app/pages/pages-edge.tsx
@@ -1,10 +1,10 @@
 import testImage from '../public/test.jpg'
 import Image from 'next/image'
 
-export default function Page() {
+export default function Page({ data }: { data: string }) {
   return (
     <>
-      <p>hello pages edge</p>
+      <h1>{data}</h1>
       <Image src={testImage} alt="test image" />
       <p id="deploymentId">{process.env.NEXT_DEPLOYMENT_ID}</p>
 
@@ -25,3 +25,11 @@ export default function Page() {
 export const config = {
   runtime: 'experimental-edge',
 }
+
+export function getServerSideProps() {
+  return {
+    props: {
+      data: 'hello pages edge',
+    },
+  }
+}
diff --git a/test/production/deployment-id-handling/deployment-id-handling.test.ts b/test/production/deployment-id-handling/deployment-id-handling.test.ts
index 2d381246e9f7c..723662dcf7132 100644
--- a/test/production/deployment-id-handling/deployment-id-handling.test.ts
+++ b/test/production/deployment-id-handling/deployment-id-handling.test.ts
@@ -90,16 +90,20 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])(
         beforePageLoad(page) {
           page.on('request', async (req) => {
             const headers = await req.allHeaders()
-            if (headers['x-next-data']) {
+            if (headers['x-nextjs-data']) {
               dataHeaders.push(headers)
             }
           })
         },
       })
 
-      await browser.elementById('edge-link').click()
+      await browser.elementByCss('#edge-link').click()
 
-      expect(dataHeaders.length).toBeGreaterThan(0)
+      await retry(async () => {
+        expect(await browser.elementByCss('h1').text()).toBe('hello pages edge')
+        expect(await browser.url()).toContain('/pages-edge')
+        expect(dataHeaders.length).toBeGreaterThan(0)
+      })
 
       expect(
         dataHeaders.every(