Merge pull request #778 from tighten/fix-percent-in-param

Fix params sometimes being double-decoded

src/js/Route.js

@@ -91,7 +91,9 @@ export default class Route {
 
         const [location, query] = url.replace(/^\w+:\/\//, '').split('?');
 
-        const matches = new RegExp(`^${pattern}/?$`).exec(decodeURI(location));
+        const matches =
+            new RegExp(`^${pattern}/?$`).exec(location) ??
+            new RegExp(`^${pattern}/?$`).exec(decodeURI(location));
 
         if (matches) {
             for (const k in matches.groups) {

tests/js/route.test.js

@@ -1412,6 +1412,13 @@ describe('current()', () => {
         expect(route().current('statistics')).toBe(true);
     });
 
+    test('can check the current route with encoded percent sign', () => {
+        global.window.location.pathname = '/optionalpage/john%25';
+
+        expect(route().current()).toBe('pages.optional');
+        expect(route().current('pages.optional')).toBe(true);
+    });
+
     test('can ignore routes that don’t allow GET requests', () => {
         global.window.location.pathname = '/posts/1';