Unverified Commit 6da71321 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure beforeFiles client-side resolving handles dynamic routes (#36317)

This fixes resolving `beforeFiles` rewrites with `next/link` as previously we weren't resolving the destination to a dynamic route since the resolving was being marked as finished when it shouldn't be during `beforeFiles`. 

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [x] Errors have helpful link attached, see `contributing.md`

Fixes: https://github.com/vercel/next.js/issues/35402
parent 864d401e
...@@ -106,7 +106,7 @@ export default function resolveRewrites( ...@@ -106,7 +106,7 @@ export default function resolveRewrites(
for (let i = 0; i < rewrites.beforeFiles.length; i++) { for (let i = 0; i < rewrites.beforeFiles.length; i++) {
// we don't end after match in beforeFiles to allow // we don't end after match in beforeFiles to allow
// continuing through all beforeFiles rewrites // continuing through all beforeFiles rewrites
finished = handleRewrite(rewrites.beforeFiles[i]) || false handleRewrite(rewrites.beforeFiles[i])
} }
matchedPage = pages.includes(fsPathname) matchedPage = pages.includes(fsPathname)
......
...@@ -224,6 +224,10 @@ module.exports = { ...@@ -224,6 +224,10 @@ module.exports = {
source: '/overridden', source: '/overridden',
destination: 'https://vercel.com', destination: 'https://vercel.com',
}, },
{
source: '/nfl/:path*',
destination: '/_sport/nfl/:path*',
},
], ],
} }
}, },
......
import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()
return (
<>
<p>/_sport/[slug]</p>
<p id="query">{JSON.stringify(router.query)}</p>
<p id="as-path">{router.asPath}</p>
<p id="pathname">{router.pathname}</p>
</>
)
}
import { useRouter } from 'next/router'
export default function Page() {
const router = useRouter()
return (
<>
<p>/_sport/[slug]/test</p>
<p id="query">{JSON.stringify(router.query)}</p>
<p id="as-path">{router.asPath}</p>
<p id="pathname">{router.pathname}</p>
</>
)
}
...@@ -44,6 +44,15 @@ const Page = () => ( ...@@ -44,6 +44,15 @@ const Page = () => (
<a id="to-before-files-overridden">to /overridden</a> <a id="to-before-files-overridden">to /overridden</a>
</Link> </Link>
<br /> <br />
<Link href="/nfl">
<a id="to-before-files-dynamic">to /nfl</a>
</Link>
<br />
<Link href="/nfl/test">
<a id="to-before-files-dynamic-again">to /nfl/test</a>
</Link>
<br />
</> </>
) )
export default Page export default Page
...@@ -99,6 +99,58 @@ const runTests = (isDev = false) => { ...@@ -99,6 +99,58 @@ const runTests = (isDev = false) => {
) )
}) })
it('should handle beforeFiles rewrite to dynamic route correctly', async () => {
const res = await fetchViaHTTP(appPort, '/nfl')
const html = await res.text()
if (res.status !== 200) {
console.error('Invalid response', html)
}
expect(res.status).toBe(200)
expect(html).toContain('/_sport/[slug]')
const browser = await webdriver(appPort, '/nav')
await browser.eval('window.beforeNav = 1')
await browser.elementByCss('#to-before-files-dynamic').click()
await check(
() => browser.eval('document.documentElement.innerHTML'),
/_sport\/\[slug\]/
)
expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
slug: 'nfl',
})
expect(await browser.elementByCss('#pathname').text()).toBe(
'/_sport/[slug]'
)
expect(await browser.eval('window.beforeNav')).toBe(1)
})
it('should handle beforeFiles rewrite to partly dynamic route correctly', async () => {
const res = await fetchViaHTTP(appPort, '/nfl')
const html = await res.text()
if (res.status !== 200) {
console.error('Invalid response', html)
}
expect(res.status).toBe(200)
expect(html).toContain('/_sport/[slug]')
const browser = await webdriver(appPort, '/nav')
await browser.eval('window.beforeNav = 1')
await browser.elementByCss('#to-before-files-dynamic-again').click()
await check(
() => browser.eval('document.documentElement.innerHTML'),
/_sport\/\[slug\]\/test/
)
expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual({
slug: 'nfl',
})
expect(await browser.elementByCss('#pathname').text()).toBe(
'/_sport/[slug]/test'
)
expect(await browser.eval('window.beforeNav')).toBe(1)
})
it('should support long URLs for rewrites', async () => { it('should support long URLs for rewrites', async () => {
const res = await fetchViaHTTP( const res = await fetchViaHTTP(
appPort, appPort,
...@@ -1720,6 +1772,13 @@ const runTests = (isDev = false) => { ...@@ -1720,6 +1772,13 @@ const runTests = (isDev = false) => {
regex: normalizeRegEx('^\\/overridden(?:\\/)?$'), regex: normalizeRegEx('^\\/overridden(?:\\/)?$'),
source: '/overridden', source: '/overridden',
}, },
{
destination: '/_sport/nfl/:path*',
regex: normalizeRegEx(
'^\\/nfl(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))?(?:\\/)?$'
),
source: '/nfl/:path*',
},
], ],
afterFiles: [ afterFiles: [
{ {
...@@ -1973,6 +2032,22 @@ const runTests = (isDev = false) => { ...@@ -1973,6 +2032,22 @@ const runTests = (isDev = false) => {
fallback: [], fallback: [],
}, },
dynamicRoutes: [ dynamicRoutes: [
{
namedRegex: '^/_sport/(?<slug>[^/]+?)(?:/)?$',
page: '/_sport/[slug]',
regex: normalizeRegEx('^\\/_sport\\/([^\\/]+?)(?:\\/)?$'),
routeKeys: {
slug: 'slug',
},
},
{
namedRegex: '^/_sport/(?<slug>[^/]+?)/test(?:/)?$',
page: '/_sport/[slug]/test',
regex: normalizeRegEx('^\\/_sport\\/([^\\/]+?)\\/test(?:\\/)?$'),
routeKeys: {
slug: 'slug',
},
},
{ {
namedRegex: '^/another/(?<id>[^/]+?)(?:/)?$', namedRegex: '^/another/(?<id>[^/]+?)(?:/)?$',
page: '/another/[id]', page: '/another/[id]',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment