Unverified Commit ac7c8f35 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure default params are detected after rewrite (#25205)

* Ensure default params are detected after rewrite

* Add test case

* bump
parent 78b17351
...@@ -280,7 +280,7 @@ export function getUtils({ ...@@ -280,7 +280,7 @@ export function getUtils({
function normalizeDynamicRouteParams(params: ParsedUrlQuery) { function normalizeDynamicRouteParams(params: ParsedUrlQuery) {
let hasValidParams = true let hasValidParams = true
if (!defaultRouteRegex) return { params, hasValidParams } if (!defaultRouteRegex) return { params, hasValidParams: false }
params = Object.keys(defaultRouteRegex.groups).reduce((prev, key) => { params = Object.keys(defaultRouteRegex.groups).reduce((prev, key) => {
let value: string | string[] | undefined = params[key] let value: string | string[] | undefined = params[key]
...@@ -288,15 +288,15 @@ export function getUtils({ ...@@ -288,15 +288,15 @@ export function getUtils({
// if the value matches the default value we can't rely // if the value matches the default value we can't rely
// on the parsed params, this is used to signal if we need // on the parsed params, this is used to signal if we need
// to parse x-now-route-matches or not // to parse x-now-route-matches or not
const isDefaultValue = Array.isArray(value) const defaultValue = defaultRouteMatches![key]
? value.some((val) => {
const defaultValue = defaultRouteMatches![key]
return Array.isArray(defaultValue) const isDefaultValue = Array.isArray(defaultValue)
? defaultValue.includes(val) ? defaultValue.some((defaultVal) => {
: defaultValue === val return Array.isArray(value)
? value.some((val) => val.includes(defaultVal))
: value?.includes(defaultVal)
}) })
: value === defaultRouteMatches![key] : value?.includes(defaultValue as string)
if (isDefaultValue || typeof value === 'undefined') { if (isDefaultValue || typeof value === 'undefined') {
hasValidParams = false hasValidParams = false
......
...@@ -216,6 +216,20 @@ describe('Required Server Files', () => { ...@@ -216,6 +216,20 @@ describe('Required Server Files', () => {
expect($2('#slug').text()).toBe('second') expect($2('#slug').text()).toBe('second')
expect(isNaN(data2.random)).toBe(false) expect(isNaN(data2.random)).toBe(false)
expect(data2.random).not.toBe(data.random) expect(data2.random).not.toBe(data.random)
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',
},
})
const $3 = cheerio.load(html3)
const data3 = JSON.parse($3('#props').text())
expect($3('#dynamic').text()).toBe('dynamic page')
expect($3('#slug').text()).toBe('second')
expect(isNaN(data3.random)).toBe(false)
expect(data3.random).not.toBe(data.random)
}) })
it('should render fallback page correctly with x-matched-path and routes-matches', async () => { it('should render fallback page correctly with x-matched-path and routes-matches', async () => {
......
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