Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure locale key not duplicated when navigating back to root path with a query or hash value #24323

Merged
merged 2 commits into from
Apr 22, 2021
Merged

Ensure locale key not duplicated when navigating back to root path with a query or hash value #24323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dcb006
Ensure locale key is not duplicated when navigating back to root path…
kmarshall-ccmi Apr 21, 2021
23fc935
Merge branch 'canary' into fix/i18n-locale-query-params
kodiakhq[bot] Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/next/next-server/lib/router/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ export function addLocale(
defaultLocale?: string
) {
if (process.env.__NEXT_I18N_SUPPORT) {
const pathLower = path.toLowerCase()
const pathname = pathNoQueryHash(path)
const pathLower = pathname.toLowerCase()
const localeLower = locale && locale.toLowerCase()

return locale &&
Expand Down
78 changes: 78 additions & 0 deletions test/integration/i18n-support/test/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,84 @@ export function runTests(ctx) {
expect(await res.text()).toContain('index page')
})

it('should not add duplicate locale key when navigating back to root path with query params', async () => {
const basePath = ctx.basePath || ''
const queryKey = 'query'
const queryValue = '1'
const browser = await webdriver(
ctx.appPort,
`${basePath}/fr?${queryKey}=${queryValue}`
)

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr`
)
expect(await browser.elementByCss('#router-pathname').text()).toBe('/')
expect(
JSON.parse(await browser.elementByCss('#router-query').text())
).toEqual({ [queryKey]: queryValue })
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')

await browser
.elementByCss('#to-another')
.click()
.waitForElementByCss('#another')

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr/another`
)
expect(await browser.elementByCss('#router-pathname').text()).toBe(
'/another'
)
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')

await browser.back().waitForElementByCss('#index')

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr`
)
expect(await browser.elementByCss('#router-pathname').text()).toBe('/')
expect(
JSON.parse(await browser.elementByCss('#router-query').text())
).toEqual({ [queryKey]: queryValue })
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')
})

it('should not add duplicate locale key when navigating back to root path with hash', async () => {
const basePath = ctx.basePath || ''
const hashValue = '#anchor-1'
const browser = await webdriver(ctx.appPort, `${basePath}/fr${hashValue}`)

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr`
)
expect(await browser.eval(() => document.location.hash)).toBe(hashValue)
expect(await browser.elementByCss('#router-pathname').text()).toBe('/')
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')

await browser
.elementByCss('#to-another')
.click()
.waitForElementByCss('#another')

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr/another`
)
expect(await browser.elementByCss('#router-pathname').text()).toBe(
'/another'
)
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')

await browser.back().waitForElementByCss('#index')

expect(await browser.eval(() => document.location.pathname)).toBe(
`${basePath}/fr`
)
expect(await browser.eval(() => document.location.hash)).toBe(hashValue)
expect(await browser.elementByCss('#router-pathname').text()).toBe('/')
expect(await browser.elementByCss('#router-locale').text()).toBe('fr')
})

it('should handle navigating back to different casing of locale', async () => {
const browser = await webdriver(
ctx.appPort,
Expand Down