Unverified Commit 7b1bacee authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure external beforeFiles rewrites are handled with next/link (#33888)

This ensures we properly handle external `beforeFiles` rewrites client-side so that a different result doesn't occur client-side versus on a direct visit. 

## Bug

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

Fixes: https://github.com/vercel/next.js/issues/32348
parent ee2725f5
...@@ -1104,6 +1104,11 @@ export default class Router implements BaseRouter { ...@@ -1104,6 +1104,11 @@ export default class Router implements BaseRouter {
(p: string) => resolveDynamicRoute(p, pages), (p: string) => resolveDynamicRoute(p, pages),
this.locales this.locales
) )
if (rewritesResult.externalDest) {
location.href = as
return true
}
resolvedAs = rewritesResult.asPath resolvedAs = rewritesResult.asPath
if (rewritesResult.matchedPage && rewritesResult.resolvedHref) { if (rewritesResult.matchedPage && rewritesResult.resolvedHref) {
...@@ -1689,6 +1694,10 @@ export default class Router implements BaseRouter { ...@@ -1689,6 +1694,10 @@ export default class Router implements BaseRouter {
(p: string) => resolveDynamicRoute(p, pages), (p: string) => resolveDynamicRoute(p, pages),
this.locales this.locales
) )
if (rewritesResult.externalDest) {
return
}
resolvedAs = delLocale(delBasePath(rewritesResult.asPath), this.locale) resolvedAs = delLocale(delBasePath(rewritesResult.asPath), this.locale)
if (rewritesResult.matchedPage && rewritesResult.resolvedHref) { if (rewritesResult.matchedPage && rewritesResult.resolvedHref) {
......
...@@ -25,8 +25,10 @@ export default function resolveRewrites( ...@@ -25,8 +25,10 @@ export default function resolveRewrites(
parsedAs: ReturnType<typeof parseRelativeUrl> parsedAs: ReturnType<typeof parseRelativeUrl>
asPath: string asPath: string
resolvedHref?: string resolvedHref?: string
externalDest?: boolean
} { } {
let matchedPage = false let matchedPage = false
let externalDest = false
let parsedAs = parseRelativeUrl(asPath) let parsedAs = parseRelativeUrl(asPath)
let fsPathname = removePathTrailingSlash( let fsPathname = removePathTrailingSlash(
normalizeLocalePath(delBasePath(parsedAs.pathname), locales).pathname normalizeLocalePath(delBasePath(parsedAs.pathname), locales).pathname
...@@ -65,6 +67,7 @@ export default function resolveRewrites( ...@@ -65,6 +67,7 @@ export default function resolveRewrites(
if (params) { if (params) {
if (!rewrite.destination) { if (!rewrite.destination) {
// this is a proxied rewrite which isn't handled on the client // this is a proxied rewrite which isn't handled on the client
externalDest = true
return true return true
} }
const destRes = prepareDestination({ const destRes = prepareDestination({
...@@ -103,7 +106,7 @@ export default function resolveRewrites( ...@@ -103,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
handleRewrite(rewrites.beforeFiles[i]) finished = handleRewrite(rewrites.beforeFiles[i]) || false
} }
matchedPage = pages.includes(fsPathname) matchedPage = pages.includes(fsPathname)
...@@ -139,5 +142,6 @@ export default function resolveRewrites( ...@@ -139,5 +142,6 @@ export default function resolveRewrites(
parsedAs, parsedAs,
matchedPage, matchedPage,
resolvedHref, resolvedHref,
externalDest,
} }
} }
...@@ -220,6 +220,10 @@ module.exports = { ...@@ -220,6 +220,10 @@ module.exports = {
source: '/old-blog/:path*', source: '/old-blog/:path*',
destination: '/blog/:path*', destination: '/blog/:path*',
}, },
{
source: '/overridden',
destination: 'https://example.com',
},
], ],
} }
}, },
......
...@@ -40,6 +40,10 @@ const Page = () => ( ...@@ -40,6 +40,10 @@ const Page = () => (
<a id="to-old-blog">to /old-blog/post-1</a> <a id="to-old-blog">to /old-blog/post-1</a>
</Link> </Link>
<br /> <br />
<Link href="/overridden">
<a id="to-before-files-overridden">to /overridden</a>
</Link>
<br />
</> </>
) )
export default Page export default Page
export default function Page() {
return <p>this page is overridden by a beforeFiles rewrite</p>
}
...@@ -39,6 +39,19 @@ let appPort ...@@ -39,6 +39,19 @@ let appPort
let app let app
const runTests = (isDev = false) => { const runTests = (isDev = false) => {
it('should handle external beforeFiles rewrite correctly', async () => {
const res = await fetchViaHTTP(appPort, '/overridden')
expect(res.status).toBe(200)
expect(await res.text()).toContain('Example Domain')
const browser = await webdriver(appPort, '/nav')
await browser.elementByCss('#to-before-files-overridden').click()
await check(
() => browser.eval('document.documentElement.innerHTML'),
/Example Domain/
)
})
it('should handle has query encoding correctly', async () => { it('should handle has query encoding correctly', async () => {
for (const expected of [ for (const expected of [
{ {
...@@ -1697,6 +1710,11 @@ const runTests = (isDev = false) => { ...@@ -1697,6 +1710,11 @@ const runTests = (isDev = false) => {
), ),
source: '/old-blog/:path*', source: '/old-blog/:path*',
}, },
{
destination: 'https://example.com',
regex: normalizeRegEx('^\\/overridden(?:\\/)?$'),
source: '/overridden',
},
], ],
afterFiles: [ afterFiles: [
{ {
...@@ -2028,6 +2046,12 @@ const runTests = (isDev = false) => { ...@@ -2028,6 +2046,12 @@ const runTests = (isDev = false) => {
regex: '^/nav(?:/)?$', regex: '^/nav(?:/)?$',
routeKeys: {}, routeKeys: {},
}, },
{
namedRegex: '^/overridden(?:/)?$',
page: '/overridden',
regex: '^/overridden(?:/)?$',
routeKeys: {},
},
{ {
namedRegex: '^/redirect\\-override(?:/)?$', namedRegex: '^/redirect\\-override(?:/)?$',
page: '/redirect-override', page: '/redirect-override',
......
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