Merge branch 'canary' into fix/cf-streaming-write

vercel · Feb 28, 2022 · 876763c · 876763c
2 parents e66f2b1 + 7ca78dd
commit 876763c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/packages/next/shared/lib/router/utils/route-regex.ts b/packages/next/shared/lib/router/utils/route-regex.ts
@@ -1,15 +1,11 @@
+import { escapeStringRegexp } from '../../escape-regexp'
+
 interface Group {
   pos: number
   repeat: boolean
   optional: boolean
 }
 
-// this isn't importing the escape-string-regex module
-// to reduce bytes
-function escapeRegex(str: string) {
-  return str.replace(/[|\\{}()[\]^$+*?.-]/g, '\\$&')
-}
-
 function parseParameter(param: string) {
   const optional = param.startsWith('[') && param.endsWith(']')
   if (optional) {
@@ -34,7 +30,7 @@ export function getParametrizedRoute(route: string) {
         groups[key] = { pos: groupIndex++, repeat, optional }
         return repeat ? (optional ? '(?:/(.+?))?' : '/(.+?)') : '/([^/]+?)'
       } else {
-        return `/${escapeRegex(segment)}`
+        return `/${escapeStringRegexp(segment)}`
       }
     })
     .join('')
@@ -92,7 +88,7 @@ export function getParametrizedRoute(route: string) {
               : `/(?<${cleanedKey}>.+?)`
             : `/(?<${cleanedKey}>[^/]+?)`
         } else {
-          return `/${escapeRegex(segment)}`
+          return `/${escapeStringRegexp(segment)}`
         }
       })
       .join('')