Skip to content

Commit

Permalink
fix: set x-deployment-id to every middleware prefetch request (#71193)
Browse files Browse the repository at this point in the history
<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

Closes NEXT-
Fixes #

-->

### What?

`x-deployment-id` is missing on prefetch requests

### Why?

To handle version skew on the pages router. When version skew is turned
on, `x-deployment-id` should be used on prefetch otherwise the server
will return 404. But with middleware enabled, the 404 does not appear to
hard-refresh the page.

### How?

next.js seems to be relying on the 404 to perform a _hard_ navigation
and auto-refresh the client. But that doesn't appear to happen when
middleware is in use (separate issue, not addressed in this PR), which
is causing the client to navigate to 404 whenever we deploy a new
version of the site to vercel.

instead of sending the client to 404, passing the `x-deployment-id`
helps guarantee that next-data requests respect version skew protection.

---------

Co-authored-by: JJ Kasper <[email protected]>
  • Loading branch information
abvthecity and ijjk authored Dec 18, 2024
1 parent b766599 commit d31b8b8
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 3 deletions.
5 changes: 4 additions & 1 deletion packages/next/src/shared/lib/router/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,10 @@ function fetchNextData({
headers: Object.assign(
{} as HeadersInit,
isPrefetch ? { purpose: 'prefetch' } : {},
isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {}
isPrefetch && hasMiddleware ? { 'x-middleware-prefetch': '1' } : {},
process.env.NEXT_DEPLOYMENT_ID
? { 'x-deployment-id': process.env.NEXT_DEPLOYMENT_ID }
: {}
),
method: params?.method ?? 'GET',
})
Expand Down
5 changes: 5 additions & 0 deletions test/production/deployment-id-handling/app/middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { NextRequest, NextResponse } from 'next/server'

export function middleware(_req: NextRequest) {
return NextResponse.next()
}
4 changes: 4 additions & 0 deletions test/production/deployment-id-handling/app/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
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 (
<>
<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={() => {
Expand Down
12 changes: 10 additions & 2 deletions test/production/deployment-id-handling/app/pages/pages-edge.tsx
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -25,3 +25,11 @@ export default function Page() {
export const config = {
runtime: 'experimental-edge',
}

export function getServerSideProps() {
return {
props: {
data: 'hello pages edge',
},
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,34 @@ 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-nextjs-data']) {
dataHeaders.push(headers)
}
})
},
})

await browser.elementByCss('#edge-link').click()

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(
(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', {
Expand Down

0 comments on commit d31b8b8

Please sign in to comment.