Unverified Commit 2790ea41 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure i18n + trailingSlash works for different page types (#19331)

This adds additional test coverage and more handling for i18n + `trailingSlash: true`

Closes: https://github.com/vercel/next.js/issues/19069
parent 0c389225
...@@ -357,12 +357,7 @@ export default class Server { ...@@ -357,12 +357,7 @@ export default class Server {
pathname: localePathResult.pathname, pathname: localePathResult.pathname,
}) })
;(req as any).__nextStrippedLocale = true ;(req as any).__nextStrippedLocale = true
parsedUrl.pathname = `${basePath || ''}${localePathResult.pathname}${ parsedUrl.pathname = `${basePath || ''}${localePathResult.pathname}`
(req as any).__nextHadTrailingSlash &&
localePathResult.pathname !== '/'
? '/'
: ''
}`
} }
// If a detected locale is a domain specific locale and we aren't already // If a detected locale is a domain specific locale and we aren't already
...@@ -1466,8 +1461,11 @@ export default class Server { ...@@ -1466,8 +1461,11 @@ export default class Server {
isRedirect = renderResult.renderOpts.isRedirect isRedirect = renderResult.renderOpts.isRedirect
} else { } else {
const origQuery = parseUrl(req.url || '', true).query const origQuery = parseUrl(req.url || '', true).query
const hadTrailingSlash =
urlPathname !== '/' && this.nextConfig.trailingSlash
const resolvedUrl = formatUrl({ const resolvedUrl = formatUrl({
pathname: resolvedUrlPathname, pathname: `${resolvedUrlPathname}${hadTrailingSlash ? '/' : ''}`,
// make sure to only add query values from original URL // make sure to only add query values from original URL
query: origQuery, query: origQuery,
}) })
...@@ -1487,7 +1485,7 @@ export default class Server { ...@@ -1487,7 +1485,7 @@ export default class Server {
? formatUrl({ ? formatUrl({
// we use the original URL pathname less the _next/data prefix if // we use the original URL pathname less the _next/data prefix if
// present // present
pathname: urlPathname, pathname: `${urlPathname}${hadTrailingSlash ? '/' : ''}`,
query: origQuery, query: origQuery,
}) })
: resolvedUrl, : resolvedUrl,
......
...@@ -495,8 +495,11 @@ export async function renderToHTML( ...@@ -495,8 +495,11 @@ export async function renderToHTML(
} }
: {}), : {}),
} }
renderOpts.resolvedAsPath = `${pathname}${
// ensure trailing slash is present for non-dynamic auto-export pages
req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : ''
}`
req.url = pathname req.url = pathname
renderOpts.resolvedAsPath = pathname
renderOpts.nextExport = true renderOpts.nextExport = true
} }
......
export default (req, res) => {
res.json({ hello: true, query: req.query })
}
export default (req, res) => {
res.json({ post: true, query: req.query })
}
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="auto-export">auto-export page</p> <p id="auto-export">auto-export page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -62,11 +62,18 @@ export const getStaticPaths = ({ locales, defaultLocale }) => { ...@@ -62,11 +62,18 @@ export const getStaticPaths = ({ locales, defaultLocale }) => {
throw new Error('missing defaultLocale in getStaticPaths') throw new Error('missing defaultLocale in getStaticPaths')
} }
return { const paths = [
// the default locale will be used since one isn't defined here // the default locale will be used since one isn't defined here
paths: ['first', 'second'].map((slug) => ({ { params: { slug: 'first' } },
params: { slug }, { params: { slug: 'second' } },
})), ]
for (const locale of locales) {
paths.push({ params: { slug: 'always' }, locale })
}
return {
paths,
fallback: true, fallback: true,
} }
} }
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="gsp">gsp page</p> <p id="gsp">gsp page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="gssp">gssp page</p> <p id="gssp">gssp page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="auto-export">auto-export page</p> <p id="auto-export">auto-export page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -62,11 +62,18 @@ export const getStaticPaths = ({ locales, defaultLocale }) => { ...@@ -62,11 +62,18 @@ export const getStaticPaths = ({ locales, defaultLocale }) => {
throw new Error('missing defaultLocale in getStaticPaths') throw new Error('missing defaultLocale in getStaticPaths')
} }
return { const paths = [
// the default locale will be used since one isn't defined here // the default locale will be used since one isn't defined here
paths: ['first', 'second'].map((slug) => ({ { params: { slug: 'first' } },
params: { slug }, { params: { slug: 'second' } },
})), ]
for (const locale of locales) {
paths.push({ params: { slug: 'always' }, locale })
}
return {
paths,
fallback: true, fallback: true,
} }
} }
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="gsp">gsp page</p> <p id="gsp">gsp page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -9,6 +9,7 @@ export default function Page(props) { ...@@ -9,6 +9,7 @@ export default function Page(props) {
<p id="gssp">gssp page</p> <p id="gssp">gssp page</p>
<p id="props">{JSON.stringify(props)}</p> <p id="props">{JSON.stringify(props)}</p>
<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-locales">{JSON.stringify(router.locales)}</p> <p id="router-locales">{JSON.stringify(router.locales)}</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>
......
...@@ -319,23 +319,33 @@ describe('i18n Support', () => { ...@@ -319,23 +319,33 @@ describe('i18n Support', () => {
it('should serve pages correctly with locale prefix', async () => { it('should serve pages correctly with locale prefix', async () => {
for (const locale of locales) { for (const locale of locales) {
const res = await fetchViaHTTP( for (const [pathname, asPath] of [
curCtx.appPort, ['/', '/'],
`/${locale}/`, ['/links', '/links/'],
undefined, ['/auto-export', '/auto-export/'],
{ ['/gsp', '/gsp/'],
redirect: 'manual', ['/gsp/fallback/[slug]', '/gsp/fallback/always/'],
} ['/gssp', '/gssp/'],
) ['/gssp/[slug]', '/gssp/first/'],
expect(res.status).toBe(200) ]) {
const res = await fetchViaHTTP(
curCtx.appPort,
`${locale === 'en-US' ? '' : `/${locale}`}${asPath}`,
undefined,
{
redirect: 'manual',
}
)
expect(res.status).toBe(200)
const $ = cheerio.load(await res.text()) const $ = cheerio.load(await res.text())
expect($('#router-pathname').text()).toBe('/') expect($('#router-pathname').text()).toBe(pathname)
expect($('#router-as-path').text()).toBe('/') expect($('#router-as-path').text()).toBe(asPath)
expect($('#router-locale').text()).toBe(locale) expect($('#router-locale').text()).toBe(locale)
expect(JSON.parse($('#router-locales').text())).toEqual(locales) expect(JSON.parse($('#router-locales').text())).toEqual(locales)
expect($('#router-default-locale').text()).toBe('en-US') expect($('#router-default-locale').text()).toBe('en-US')
}
} }
}) })
......
...@@ -213,6 +213,11 @@ export function runTests(ctx) { ...@@ -213,6 +213,11 @@ export function runTests(ctx) {
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
srcRoute: null, srcRoute: null,
}, },
'/en-US/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/en-US/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/en-US/gsp/fallback/first': { '/en-US/gsp/fallback/first': {
dataRoute: `/_next/data/${ctx.buildId}/en-US/gsp/fallback/first.json`, dataRoute: `/_next/data/${ctx.buildId}/en-US/gsp/fallback/first.json`,
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
...@@ -253,6 +258,21 @@ export function runTests(ctx) { ...@@ -253,6 +258,21 @@ export function runTests(ctx) {
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
srcRoute: '/not-found/fallback/[slug]', srcRoute: '/not-found/fallback/[slug]',
}, },
'/en/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/en/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/fr-BE/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/fr-BE/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/fr/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/fr/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/frank': { '/frank': {
dataRoute: `/_next/data/${ctx.buildId}/frank.json`, dataRoute: `/_next/data/${ctx.buildId}/frank.json`,
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
...@@ -263,11 +283,26 @@ export function runTests(ctx) { ...@@ -263,11 +283,26 @@ export function runTests(ctx) {
srcRoute: null, srcRoute: null,
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
}, },
'/nl-BE/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/nl-BE/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/nl-NL/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/nl-NL/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/nl-NL/gsp/no-fallback/second': { '/nl-NL/gsp/no-fallback/second': {
dataRoute: `/_next/data/${ctx.buildId}/nl-NL/gsp/no-fallback/second.json`, dataRoute: `/_next/data/${ctx.buildId}/nl-NL/gsp/no-fallback/second.json`,
initialRevalidateSeconds: false, initialRevalidateSeconds: false,
srcRoute: '/gsp/no-fallback/[slug]', srcRoute: '/gsp/no-fallback/[slug]',
}, },
'/nl/gsp/fallback/always': {
dataRoute: `/_next/data/${ctx.buildId}/nl/gsp/fallback/always.json`,
initialRevalidateSeconds: false,
srcRoute: '/gsp/fallback/[slug]',
},
'/not-found': { '/not-found': {
dataRoute: `/_next/data/${ctx.buildId}/not-found.json`, dataRoute: `/_next/data/${ctx.buildId}/not-found.json`,
srcRoute: null, srcRoute: null,
......
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