Disable compile validate instead of replacing unnamed patterns in des…

…tination
vercel · Jan 27, 2020 · dadbfde · dadbfde
1 parent 9b34575
commit dadbfde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/packages/next/next-server/server/lib/path-match.ts b/packages/next/next-server/server/lib/path-match.ts
@@ -29,7 +29,6 @@ export default (customRoute = false) => {
 
       return { ...params, ...res.params }
     }
-    ;(wrappedMatcher as any).keys = keys as any
     return wrappedMatcher
   }
 }

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -457,16 +457,9 @@ export default class Server {
               let destToCompile = `${parsedDestination.pathname!}${parsedDestination.hash ||
                 ''}`
 
-              for (const key of (route.matcher as any).keys || []) {
-                const { name, pattern } = key
-                if (typeof name === 'number') {
-                  destToCompile = destToCompile.replace(
-                    new RegExp(`(\\:${name}(?![0-9]))`, 'g'),
-                    `(${pattern})`
-                  )
-                }
-              }
-              let destinationCompiler = compilePathToRegex(destToCompile)
+              let destinationCompiler = compilePathToRegex(destToCompile, {
+                validate: false,
+              })
               let newUrl
 
               Object.keys(destQuery).forEach(key => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ export default (customRoute = false) => { @@
           return { ...params, ...res.params }
         }
-        ;(wrappedMatcher as any).keys = keys as any
         return wrappedMatcher
       }
     }
@@ Expand Down @@