Skip to content

Fix domain locales not available on client #26083

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

Merged
ijjk merged 6 commits into from
Jun 22, 2021
Merged

Fix domain locales not available on client #26083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79ea788
bug: Fix domain locales not available on client
RobVermeer Jun 14, 2021
05b467c
Merge branch 'canary' into fix-client-domain-locales
RobVermeer Jun 15, 2021
b91ab0d
Merge remote-tracking branch 'upstream/canary' into fix-client-domain…
ijjk Jun 22, 2021
ee6a816
Add test case
ijjk Jun 22, 2021
b8802dc
update tests
ijjk Jun 22, 2021
14d7ac1
Merge branch 'canary' into fix-client-domain-locales
kodiakhq[bot] Jun 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
1 change: 1 addition & 0 deletions packages/next/client/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const urlPropertyFields = [
'isReady',
'isPreview',
'isLocaleDomain',
'domainLocales',
]
const routerEvents = [
'routeChangeStart',
Expand Down
2 changes: 1 addition & 1 deletion test/integration/build-output/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('Build Output', () => {
expect(parseFloat(err404Size)).toBeCloseTo(gz ? 3.17 : 8.51, 1)
expect(err404Size.endsWith('kB')).toBe(true)

expect(parseFloat(err404FirstLoad)).toBeCloseTo(gz ? 66.9 : 204, 1)
expect(parseFloat(err404FirstLoad)).toBeCloseTo(gz ? 66.9 : 205, 1)
expect(err404FirstLoad.endsWith('kB')).toBe(true)

expect(parseFloat(sharedByAll)).toBeCloseTo(gz ? 63.7 : 196, 1)
Expand Down
1 change: 1 addition & 0 deletions test/integration/i18n-support-base-path/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default function Page(props) {
<p id="router-locale">{router.locale}</p>
<p id="router-default-locale">{router.defaultLocale}</p>
<p id="router-locales">{JSON.stringify(router.locales)}</p>
<p id="router-domain-locales">{JSON.stringify(router.domainLocales)}</p>
<p id="router-query">{JSON.stringify(router.query)}</p>
<p id="router-pathname">{router.pathname}</p>
<p id="router-as-path">{router.asPath}</p>
Expand Down
1 change: 1 addition & 0 deletions test/integration/i18n-support/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default function Page(props) {
<p id="router-locale">{router.locale}</p>
<p id="router-default-locale">{router.defaultLocale}</p>
<p id="router-locales">{JSON.stringify(router.locales)}</p>
<p id="router-domain-locales">{JSON.stringify(router.domainLocales)}</p>
<p id="router-query">{JSON.stringify(router.query)}</p>
<p id="router-pathname">{router.pathname}</p>
<p id="router-as-path">{router.asPath}</p>
Expand Down
15 changes: 15 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 @@ -37,6 +37,21 @@ async function addDefaultLocaleCookie(browser) {
}

export function runTests(ctx) {
it.only('should have domainLocales available on useRouter', async () => {
const browser = await webdriver(ctx.appPort, `${ctx.basePath || '/'}`)
expect(
JSON.parse(await browser.elementByCss('#router-domain-locales').text())
).toEqual([
{
http: true,
domain: 'example.do',
defaultLocale: 'do',
locales: ['do-BE'],
},
{ domain: 'example.com', defaultLocale: 'go', locales: ['go-BE'] },
])
})

it('should not error with similar named cookie to locale cookie', async () => {
const res = await fetchViaHTTP(
ctx.appPort,
Expand Down