Skip to content

Commit

Permalink
interception routes: fix rewrites order (#49615)
Browse files Browse the repository at this point in the history
This PR fixes an issue where the rewrites were applied too early and
thus not working with other beforeFiles rewrites

<!-- 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 or adding/fixing 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

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->

link NEXT-1148

Co-authored-by: JJ Kasper <jj@jjsweb.site>
  • Loading branch information
feedthejim and ijjk committed May 11, 2023
1 parent 2eeb1c1 commit e6d50ec
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/next/src/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ export default async function build(
}

// Interception routes are modelled as beforeFiles rewrites
rewrites.beforeFiles.unshift(
rewrites.beforeFiles.push(
...generateInterceptionRoutesRewrites(appPageKeys)
)

Expand Down
6 changes: 4 additions & 2 deletions packages/next/src/server/dev/next-dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -793,10 +793,12 @@ export default class DevServer extends Server {
: undefined

this.customRoutes = await loadCustomRoutes(this.nextConfig)
this.customRoutes.rewrites.beforeFiles.unshift(
const { rewrites } = this.customRoutes

this.customRoutes.rewrites.beforeFiles.push(
...generateInterceptionRoutesRewrites(Object.keys(appPaths))
)
const { rewrites } = this.customRoutes

if (
rewrites.beforeFiles.length ||
rewrites.afterFiles.length ||
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Page() {
return <div id="intercepted">intercepted</div>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use client'

import Link from 'next/link'

export default function Page() {
return (
<div>
<div id="foo">FOO</div>
<Link href="/photos">To photos</Link>
</div>
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function Page() {
return 'non intercepted'
}
17 changes: 16 additions & 1 deletion test/e2e/app-dir/parallel-routes-and-interception/next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {}
const nextConfig = {
async rewrites() {
return {
beforeFiles: [
{
source: '/foo',
destination: '/en/foo',
},
{
source: '/photos',
destination: '/en/photos',
},
],
}
},
}

module.exports = nextConfig
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,20 @@ createNextDescribe(
next.url + '/intercepting-parallel-modal/photo/2'
)
})

it('should support intercepting with beforeFiles rewrites', async () => {
const browser = await next.browser('/foo')

await check(
() =>
browser
.elementByCss('[href="/photos"]')
.click()
.waitForElementByCss('#intercepted')
.text(),
'intercepted'
)
})
})
}
)

0 comments on commit e6d50ec

Please sign in to comment.