Merge branch 'dev' of https://github.com/brookslybrand/react-router into brookslybrand-dev

Author: chaance

packages/react-router/__tests__/path-matching-test.tsx

@@ -179,14 +179,23 @@ describe("path matching with a basename", () => {
 });
 
 describe("path matching with splats", () => {
-  test("splat after /", () => {
+  describe("splat after /", () => {
     let routes = [{ path: "users/:id/files/*" }];
     let match = matchRoutes(routes, "/users/mj/files/secrets.md");
 
-    expect(match).not.toBeNull();
-    expect(match[0]).toMatchObject({
-      params: { id: "mj", "*": "secrets.md" },
-      pathname: "/users/mj/files"
+    it("finds the correct match", () => {
+      expect(match).not.toBeNull();
+      expect(match[0]).toMatchObject({
+        pathname: "/users/mj/files",
+        params: { id: "mj", "*": "secrets.md" }
+      });
+    });
+
+    describe("when other characters come before the /", () => {
+      it("does not find a match", () => {
+        let match = matchRoutes(routes, "/users/mj/filesssss/secrets.md");
+        expect(match).toBeNull();
+      });
     });
   });
 

packages/react-router/index.tsx

@@ -908,7 +908,7 @@ export function matchPath(
   let matchedPathname = match[1];
   let values = match.slice(2);
   let params = paramNames.reduce((memo, paramName, index) => {
-    memo[paramName] = safelyDecodeURIComponent(values[index], paramName);
+    memo[paramName] = safelyDecodeURIComponent(values[index] || "", paramName);
     return memo;
   }, {} as Params);
 
@@ -941,10 +941,11 @@ function compilePath(
 
   if (path.endsWith("*")) {
     if (path.endsWith("/*")) {
-      source += "\\/?"; // Don't include the / in params['*']
+      source += "(?:\\/(.+)|\\/?)"; // Don't include the / in params['*']
+    } else {
+      source += "(.*)";
     }
     keys.push("*");
-    source += "(.*)";
   } else if (end) {
     source += "\\/?";
   }