Update experimental skipTrailingSlashRedirect handling

parent be75d092
...@@ -161,6 +161,9 @@ export function getDefineEnv({ ...@@ -161,6 +161,9 @@ export function getDefineEnv({
'process.env.__NEXT_ALLOW_MIDDLEWARE_RESPONSE_BODY': JSON.stringify( 'process.env.__NEXT_ALLOW_MIDDLEWARE_RESPONSE_BODY': JSON.stringify(
config.experimental.allowMiddlewareResponseBody config.experimental.allowMiddlewareResponseBody
), ),
'process.env.__NEXT_MANUAL_TRAILING_SLASH': JSON.stringify(
config.experimental?.skipTrailingSlashRedirect
),
'process.env.__NEXT_CROSS_ORIGIN': JSON.stringify(config.crossOrigin), 'process.env.__NEXT_CROSS_ORIGIN': JSON.stringify(config.crossOrigin),
'process.browser': JSON.stringify(isClient), 'process.browser': JSON.stringify(isClient),
'process.env.__NEXT_TEST_MODE': JSON.stringify( 'process.env.__NEXT_TEST_MODE': JSON.stringify(
......
...@@ -6,7 +6,7 @@ import { parsePath } from '../shared/lib/router/utils/parse-path' ...@@ -6,7 +6,7 @@ import { parsePath } from '../shared/lib/router/utils/parse-path'
* in `next.config.js`. * in `next.config.js`.
*/ */
export const normalizePathTrailingSlash = (path: string) => { export const normalizePathTrailingSlash = (path: string) => {
if (!path.startsWith('/')) { if (!path.startsWith('/') || process.env.__NEXT_MANUAL_TRAILING_SLASH) {
return path return path
} }
......
...@@ -8,6 +8,10 @@ export default function Page(props) { ...@@ -8,6 +8,10 @@ export default function Page(props) {
to another to another
</Link> </Link>
<br /> <br />
<Link href="/another/" id="to-another-with-slash">
to another
</Link>
<br />
<Link href="/blog/first" id="to-blog-first"> <Link href="/blog/first" id="to-blog-first">
to /blog/first to /blog/first
</Link> </Link>
......
...@@ -158,6 +158,54 @@ describe('skip-trailing-slash-redirect', () => { ...@@ -158,6 +158,54 @@ describe('skip-trailing-slash-redirect', () => {
expect(await res.text()).toContain('another page') expect(await res.text()).toContain('another page')
}) })
it('should not apply trailing slash to links on client', async () => {
const browser = await webdriver(next.url, '/')
await browser.eval('window.beforeNav = 1')
expect(
new URL(
await browser.elementByCss('#to-another').getAttribute('href'),
'http://n'
).pathname
).toBe('/another')
await browser.elementByCss('#to-another').click()
await browser.waitForElementByCss('#another')
expect(await browser.eval('window.location.pathname')).toBe('/another')
await browser.back().waitForElementByCss('#to-another')
expect(
new URL(
await browser
.elementByCss('#to-another-with-slash')
.getAttribute('href'),
'http://n'
).pathname
).toBe('/another/')
await browser.elementByCss('#to-another-with-slash').click()
await browser.waitForElementByCss('#another')
expect(await browser.eval('window.location.pathname')).toBe('/another/')
await browser.back().waitForElementByCss('#to-another')
expect(await browser.eval('window.beforeNav')).toBe(1)
})
it('should not apply trailing slash on load on client', async () => {
let browser = await webdriver(next.url, '/another')
await check(() => browser.eval('next.router.isReady ? "yes": "no"'), 'yes')
expect(await browser.eval('location.pathname')).toBe('/another')
browser = await webdriver(next.url, '/another/')
await check(() => browser.eval('next.router.isReady ? "yes": "no"'), 'yes')
expect(await browser.eval('location.pathname')).toBe('/another/')
})
it('should not apply trailing slash redirect (with slash)', async () => { it('should not apply trailing slash redirect (with slash)', async () => {
const res = await fetchViaHTTP(next.url, '/another/', undefined, { const res = await fetchViaHTTP(next.url, '/another/', undefined, {
redirect: 'manual', redirect: 'manual',
......
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