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

Fix NextUrl trailing slash normalize for data route #41311

Merged
merged 1 commit into from Oct 10, 2022
Merged

Fix NextUrl trailing slash normalize for data route #41311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/next/shared/lib/router/utils/format-next-pathname-info.ts
View file
Open in desktop
Expand Up @@ -17,6 +17,10 @@ export function formatNextPathnameInfo(info: ExtendedInfo) {
info.ignorePrefix
)

if (info.buildId || !info.trailingSlash) {
pathname = removeTrailingSlash(pathname)
}

if (info.buildId) {
pathname = addPathSuffix(
addPathPrefix(pathname, `/_next/data/${info.buildId}`),
Expand All @@ -25,8 +29,8 @@ export function formatNextPathnameInfo(info: ExtendedInfo) {
}

pathname = addPathPrefix(pathname, info.basePath)
return info.trailingSlash
? !info.buildId && !pathname.endsWith('/')
return !info.buildId && info.trailingSlash
? !pathname.endsWith('/')
? addPathSuffix(pathname, '/')
: pathname
: removeTrailingSlash(pathname)
Expand Down
33 changes: 33 additions & 0 deletions test/unit/web-runtime/next-url.test.ts
View file
Open in desktop
Expand Up @@ -263,6 +263,39 @@ it('correctly parses a prefetch url', async () => {
)
})

it('correctly handles trailing slash in _next/data', async () => {
const url = new NextURL('/abc/', 'http://127.0.0.1:3000')
url.buildId = '1234'

expect(url.pathname).toEqual('/abc/')
expect(url.locale).toEqual('')
expect(String(url)).toEqual('http://localhost:3000/_next/data/1234/abc.json')
})

it('correctly handles trailing slash in _next/data with config', async () => {
const url = new NextURL('/abc/', 'http://127.0.0.1:3000', {
nextConfig: { trailingSlash: true },
})
url.buildId = '1234'

expect(url.pathname).toEqual('/abc/')
expect(url.locale).toEqual('')
expect(String(url)).toEqual('http://localhost:3000/_next/data/1234/abc.json')
})

it('correctly handles trailing slash in _next/data with basePath', async () => {
const url = new NextURL('/docs/abc/', 'http://127.0.0.1:3000', {
nextConfig: { basePath: '/docs', trailingSlash: true },
})
url.buildId = '1234'

expect(url.pathname).toEqual('/abc/')
expect(url.locale).toEqual('')
expect(String(url)).toEqual(
'http://localhost:3000/docs/_next/data/1234/abc.json'
)
})

it('correctly parses a prefetch index url', async () => {
const url = new NextURL(
'/_next/data/development/index.json',
Expand Down