Speed up pattern matching

remix-run · Mar 21, 2016 · 6e908b5 · 6e908b5
1 parent 90ceb42
commit 6e908b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/PatternUtils.js b/modules/PatternUtils.js
@@ -24,10 +24,10 @@ function _compilePattern(pattern) {
       regexpSource += '([^/?#]+)'
       paramNames.push(match[1])
     } else if (match[0] === '**') {
-      regexpSource += '([\\s\\S]*)'
+      regexpSource += '(.*)'
       paramNames.push('splat')
     } else if (match[0] === '*') {
-      regexpSource += '([\\s\\S]*?)'
+      regexpSource += '(.*?)'
       paramNames.push('splat')
     } else if (match[0] === '(') {
       regexpSource += '(?:'
@@ -98,8 +98,7 @@ export function matchPattern(pattern, pathname) {
   const captureRemaining = tokens[tokens.length - 1] !== '*'
 
   if (captureRemaining) {
-    // This will match newlines in the remaining path.
-    regexpSource += '([\\s\\S]*?)'
+    regexpSource += '(.*?)'
   }
 
   const match = pathname.match(new RegExp('^' + regexpSource + '$', 'i'))

diff --git a/modules/__tests__/getParams-test.js b/modules/__tests__/getParams-test.js
@@ -120,7 +120,7 @@ describe('getParams', function () {
         expect(getParams('/files/*', '/files/my/photo.jpg')).toEqual({ splat: 'my/photo.jpg' })
         expect(getParams('/files/*', '/files/my/photo.jpg.zip')).toEqual({ splat: 'my/photo.jpg.zip' })
         expect(getParams('/files/*.jpg', '/files/my/photo.jpg')).toEqual({ splat: 'my/photo' })
-        expect(getParams('/files/*.jpg', '/files/my/new\nline.jpg')).toEqual({ splat: 'my/new\nline' })
+        expect(getParams('/files/*.jpg', '/files/my/new%0Aline.jpg')).toEqual({ splat: 'my/new\nline' })
       })
     })