c351f6154b
Prior to this pull request, Next.js would immediately decode all URLs sent to its server (via `path-match`). This was rarely needed, and Next.js would typically re-encode the incoming request right away (see all the `encodeURIComponent`s removed in PR diff). This adds unnecessary performance overhead. Long term, this will also help prevent weird encoding edge-cases like #10004, #10022, #11371, et al. --- No new tests are necessary for this change because we've extensively tested these edge cases with existing tests. One test was updated to reflect that we skip decoding in a 404 scenario. Let's see if all the existing tests pass!
46 lines
1.2 KiB
TypeScript
46 lines
1.2 KiB
TypeScript
import * as pathToRegexp from 'next/dist/compiled/path-to-regexp'
|
|
|
|
export { pathToRegexp }
|
|
|
|
export const matcherOptions: pathToRegexp.TokensToRegexpOptions &
|
|
pathToRegexp.ParseOptions = {
|
|
sensitive: false,
|
|
delimiter: '/',
|
|
}
|
|
|
|
export const customRouteMatcherOptions: pathToRegexp.TokensToRegexpOptions &
|
|
pathToRegexp.ParseOptions = {
|
|
...matcherOptions,
|
|
strict: true,
|
|
}
|
|
|
|
export default (customRoute = false) => {
|
|
return (path: string) => {
|
|
const keys: pathToRegexp.Key[] = []
|
|
const matcherRegex = pathToRegexp.pathToRegexp(
|
|
path,
|
|
keys,
|
|
customRoute ? customRouteMatcherOptions : matcherOptions
|
|
)
|
|
const matcher = pathToRegexp.regexpToFunction(matcherRegex, keys)
|
|
|
|
return (pathname: string | null | undefined, params?: any) => {
|
|
const res = pathname == null ? false : matcher(pathname)
|
|
if (!res) {
|
|
return false
|
|
}
|
|
|
|
if (customRoute) {
|
|
for (const key of keys) {
|
|
// unnamed params should be removed as they
|
|
// are not allowed to be used in the destination
|
|
if (typeof key.name === 'number') {
|
|
delete (res.params as any)[key.name]
|
|
}
|
|
}
|
|
}
|
|
|
|
return { ...params, ...res.params }
|
|
}
|
|
}
|
|
}
|