Unverified Commit 27d78a5d authored by Rob Vermeer's avatar Rob Vermeer Committed by GitHub

Fix domain locales not available on client (#26083)

* bug: Fix domain locales not available on client

* Add test case

* update tests
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 005a6e4c
...@@ -43,6 +43,7 @@ const urlPropertyFields = [ ...@@ -43,6 +43,7 @@ const urlPropertyFields = [
'isReady', 'isReady',
'isPreview', 'isPreview',
'isLocaleDomain', 'isLocaleDomain',
'domainLocales',
] ]
const routerEvents = [ const routerEvents = [
'routeChangeStart', 'routeChangeStart',
......
...@@ -129,7 +129,7 @@ describe('Build Output', () => { ...@@ -129,7 +129,7 @@ describe('Build Output', () => {
expect(parseFloat(err404Size)).toBeCloseTo(gz ? 3.17 : 8.51, 1) expect(parseFloat(err404Size)).toBeCloseTo(gz ? 3.17 : 8.51, 1)
expect(err404Size.endsWith('kB')).toBe(true) 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(err404FirstLoad.endsWith('kB')).toBe(true)
expect(parseFloat(sharedByAll)).toBeCloseTo(gz ? 63.7 : 196, 1) expect(parseFloat(sharedByAll)).toBeCloseTo(gz ? 63.7 : 196, 1)
......
...@@ -11,6 +11,7 @@ export default function Page(props) { ...@@ -11,6 +11,7 @@ export default function Page(props) {
<p id="router-locale">{router.locale}</p> <p id="router-locale">{router.locale}</p>
<p id="router-default-locale">{router.defaultLocale}</p> <p id="router-default-locale">{router.defaultLocale}</p>
<p id="router-locales">{JSON.stringify(router.locales)}</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-query">{JSON.stringify(router.query)}</p>
<p id="router-pathname">{router.pathname}</p> <p id="router-pathname">{router.pathname}</p>
<p id="router-as-path">{router.asPath}</p> <p id="router-as-path">{router.asPath}</p>
......
...@@ -11,6 +11,7 @@ export default function Page(props) { ...@@ -11,6 +11,7 @@ export default function Page(props) {
<p id="router-locale">{router.locale}</p> <p id="router-locale">{router.locale}</p>
<p id="router-default-locale">{router.defaultLocale}</p> <p id="router-default-locale">{router.defaultLocale}</p>
<p id="router-locales">{JSON.stringify(router.locales)}</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-query">{JSON.stringify(router.query)}</p>
<p id="router-pathname">{router.pathname}</p> <p id="router-pathname">{router.pathname}</p>
<p id="router-as-path">{router.asPath}</p> <p id="router-as-path">{router.asPath}</p>
......
...@@ -37,6 +37,21 @@ async function addDefaultLocaleCookie(browser) { ...@@ -37,6 +37,21 @@ async function addDefaultLocaleCookie(browser) {
} }
export function runTests(ctx) { 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 () => { it('should not error with similar named cookie to locale cookie', async () => {
const res = await fetchViaHTTP( const res = await fetchViaHTTP(
ctx.appPort, ctx.appPort,
......
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