Unverified Commit 9afcdfcb authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure i18n index prefetch is correct with trailingSlash (#22746)

This fixes index data route loading for i18n with `trailingSlash: true` enabled and also fixes prerendering `asPath` values not containing a trailingSlash when enabled. 


Fixes: https://github.com/vercel/next.js/issues/17813
Fixes: https://github.com/vercel/next.js/issues/22747
parent c1b2b3f9
......@@ -1022,7 +1022,6 @@ export default async function build(
}
return defaultMap
},
trailingSlash: false,
}
await exportApp(dir, exportOptions, exportConfig)
......
......@@ -8,6 +8,7 @@ import {
import getAssetPathFromRoute from '../next-server/lib/router/utils/get-asset-path-from-route'
import { isDynamicRoute } from '../next-server/lib/router/utils/is-dynamic'
import { parseRelativeUrl } from '../next-server/lib/router/utils/parse-relative-url'
import { removePathTrailingSlash } from './normalize-trailing-slash'
import createRouteLoader, {
getClientBuildManifest,
RouteLoader,
......@@ -96,7 +97,10 @@ export default class PageLoader {
const route = normalizeRoute(hrefPathname)
const getHrefForSlug = (path: string) => {
const dataRoute = getAssetPathFromRoute(addLocale(path, locale), '.json')
const dataRoute = getAssetPathFromRoute(
removePathTrailingSlash(addLocale(path, locale)),
'.json'
)
return addBasePath(
`/_next/data/${this.buildId}${dataRoute}${ssg ? '' : search}`
)
......
......@@ -170,7 +170,7 @@ export default async function exportApp(
)
}
const subFolders = nextConfig.trailingSlash
const subFolders = nextConfig.trailingSlash && !options.buildExport
const isLikeServerless = nextConfig.target !== 'server'
if (!options.silent && !options.buildExport) {
......@@ -367,6 +367,7 @@ export default async function exportApp(
locale: i18n?.defaultLocale,
defaultLocale: i18n?.defaultLocale,
domainLocales: i18n?.domains,
trailingSlash: nextConfig.trailingSlash,
}
const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig
......
......@@ -76,6 +76,7 @@ interface RenderOpts {
locales?: string[]
locale?: string
defaultLocale?: string
trailingSlash?: boolean
}
type ComponentModule = ComponentType<{}> & {
......@@ -184,6 +185,10 @@ export default async function exportPage({
res.statusCode = 500
}
if (renderOpts.trailingSlash && !req.url?.endsWith('/')) {
req.url += '/'
}
envConfig.setConfig({
serverRuntimeConfig,
publicRuntimeConfig: renderOpts.runtimeConfig,
......
......@@ -28,6 +28,11 @@ export default function Page(props) {
<Link href="/gsp" locale="fr">
<a id="to-gsp-fr">to /gsp</a>
</Link>
<br />
<Link href="/" locale="fr">
<a id="to-index-fr">to /</a>
</Link>
</>
)
}
......@@ -28,6 +28,11 @@ export default function Page(props) {
<Link href="/gsp" locale="fr">
<a id="to-gsp-fr">to /gsp</a>
</Link>
<br />
<Link href="/" locale="fr">
<a id="to-index-fr">to /</a>
</Link>
</>
)
}
......@@ -339,7 +339,7 @@ export function runTests(ctx) {
.replace(ctx.basePath, '')
.replace(/^\/_next\/data\/[^/]+/, '')
),
['/en-US/gsp.json', '/fr/gsp.json', '/nl-NL/gsp.json']
['/en-US/gsp.json', '/fr.json', '/fr/gsp.json', '/nl-NL/gsp.json']
)
return 'yes'
}, 'yes')
......
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