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

Update normalize revalidate params for named matches #48032

Merged
merged 1 commit into from
Apr 6, 2023
Merged

Update normalize revalidate params for named matches #48032

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions packages/next/src/server/server-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,21 @@ export function getUtils({
const matchesHasLocale =
i18n && detectedLocale && obj['1'] === detectedLocale

for (const key of Object.keys(obj)) {
const value = obj[key]

if (
key !== NEXT_QUERY_PARAM_PREFIX &&
key.startsWith(NEXT_QUERY_PARAM_PREFIX)
) {
const normalizedKey = key.substring(
NEXT_QUERY_PARAM_PREFIX.length
)
obj[normalizedKey] = value
delete obj[key]
}
}

// favor named matches if available
const routeKeyNames = Object.keys(routeKeys || {})
const filterLocaleItem = (val: string | string[] | undefined) => {
Expand Down
21 changes: 12 additions & 9 deletions test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ describe('should set-up next', () => {
const html3 = await renderViaHTTP(appPort, '/some-other-path', undefined, {
headers: {
'x-matched-path': '/dynamic/[slug]?slug=%5Bslug%5D.json',
'x-now-route-matches': '1=second&slug=second',
'x-now-route-matches': '1=second&nextParamslug=second',
},
})
const $3 = cheerio.load(html3)
Expand Down Expand Up @@ -451,7 +451,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': '/catch-all/[[...rest]]',
'x-now-route-matches': '1=hello&catchAll=hello',
'x-now-route-matches': '1=hello&nextParamcatchAll=hello',
},
}
)
Expand All @@ -470,7 +470,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': '/catch-all/[[...rest]]',
'x-now-route-matches': '1=hello/world&catchAll=hello/world',
'x-now-route-matches': '1=hello/world&nextParamcatchAll=hello/world',
},
}
)
Expand Down Expand Up @@ -507,7 +507,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': `/_next/data/${next.buildId}/en/catch-all/[[...rest]].json`,
'x-now-route-matches': '1=hello&rest=hello',
'x-now-route-matches': '1=hello&nextParamrest=hello',
},
}
)
Expand All @@ -524,7 +524,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': `/_next/data/${next.buildId}/en/catch-all/[[...rest]].json`,
'x-now-route-matches': '1=hello/world&rest=hello/world',
'x-now-route-matches': '1=hello/world&nextParamrest=hello/world',
},
}
)
Expand Down Expand Up @@ -682,7 +682,8 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': '/en/[slug]/social/[[...rest]]',
'x-now-route-matches': 'nextLocale=en&1=en&2=user-123&slug=user-123',
'x-now-route-matches':
'nextLocale=en&1=en&2=user-123&nextParamslug=user-123',
},
}
)
Expand All @@ -705,7 +706,7 @@ describe('should set-up next', () => {
headers: {
'x-matched-path': '/optional-ssg/[[...rest]]',
'x-now-route-matches':
'1=en%2Fes%2Fhello%252Fworld&rest=en%2Fes%2Fhello%252Fworld',
'1=en%2Fes%2Fhello%252Fworld&nextParamrest=en%2Fes%2Fhello%252Fworld',
},
}
)
Expand Down Expand Up @@ -765,7 +766,8 @@ describe('should set-up next', () => {
const res = await fetchViaHTTP(appPort, '/en/fallback/[slug]', undefined, {
headers: {
'x-matched-path': '/en/fallback/[slug]',
'x-now-route-matches': '2=another&slug=another&1=en&nextLocale=en',
'x-now-route-matches':
'2=another&nextParamslug=another&1=en&nextLocale=en',
},
redirect: 'manual',
})
Expand All @@ -783,7 +785,8 @@ describe('should set-up next', () => {
const res = await fetchViaHTTP(appPort, '/fr/fallback/[slug]', undefined, {
headers: {
'x-matched-path': '/fr/fallback/[slug]',
'x-now-route-matches': '2=another&slug=another&1=fr&nextLocale=fr',
'x-now-route-matches':
'2=another&nextParamslug=another&1=fr&nextLocale=fr',
},
redirect: 'manual',
})
Expand Down
12 changes: 6 additions & 6 deletions test/production/standalone-mode/required-server-files/required-server-files.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ describe('should set-up next', () => {
const html3 = await renderViaHTTP(appPort, '/some-other-path', undefined, {
headers: {
'x-matched-path': '/dynamic/[slug]',
'x-now-route-matches': '1=second&slug=second',
'x-now-route-matches': '1=second&nextParamslug=second',
},
})
const $3 = cheerio.load(html3)
Expand Down Expand Up @@ -761,7 +761,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': '/catch-all/[[...rest]]',
'x-now-route-matches': '1=hello&catchAll=hello',
'x-now-route-matches': '1=hello&nextParamcatchAll=hello',
},
}
)
Expand All @@ -780,7 +780,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': '/catch-all/[[...rest]]',
'x-now-route-matches': '1=hello/world&catchAll=hello/world',
'x-now-route-matches': '1=hello/world&nextParamcatchAll=hello/world',
},
}
)
Expand Down Expand Up @@ -818,7 +818,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': `/_next/data/${next.buildId}/catch-all/[[...rest]].json`,
'x-now-route-matches': '1=hello&rest=hello',
'x-now-route-matches': '1=hello&nextParamrest=hello',
},
}
)
Expand All @@ -835,7 +835,7 @@ describe('should set-up next', () => {
{
headers: {
'x-matched-path': `/_next/data/${next.buildId}/catch-all/[[...rest]].json`,
'x-now-route-matches': '1=hello/world&rest=hello/world',
'x-now-route-matches': '1=hello/world&nextParamrest=hello/world',
},
}
)
Expand Down Expand Up @@ -1111,7 +1111,7 @@ describe('should set-up next', () => {
headers: {
'x-matched-path': '/optional-ssg/[[...rest]]',
'x-now-route-matches':
'1=en%2Fes%2Fhello%252Fworld&rest=en%2Fes%2Fhello%252Fworld',
'1=en%2Fes%2Fhello%252Fworld&nextParamrest=en%2Fes%2Fhello%252Fworld',
},
}
)
Expand Down