matchPath: Fixed exception thrown if path is undefined (#6715)

* matchPath: Fixed exception thrown if `path` is undefined * Match the line below it
remix-run · Apr 20, 2019 · 7bd1407 · 7bd1407
1 parent 67df646
commit 7bd1407
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/react-router/modules/__tests__/matchPath-test.js b/packages/react-router/modules/__tests__/matchPath-test.js
@@ -1,6 +1,14 @@
 import { matchPath } from "react-router";
 
 describe("matchPath", () => {
+  describe("without path property on params", () => {
+    it("doesn't throw an exception", () => {
+      expect(() => {
+        matchPath("/milkyway/eridani", { hash: "foo" });
+      }).not.toThrow();
+    });
+  });
+
   describe('with path="/"', () => {
     it('returns correct url at "/"', () => {
       const path = "/";

diff --git a/packages/react-router/modules/matchPath.js b/packages/react-router/modules/matchPath.js
@@ -33,7 +33,9 @@ function matchPath(pathname, options = {}) {
   const paths = [].concat(path);
 
   return paths.reduce((matched, path) => {
+    if (!path) return null;
     if (matched) return matched;
+
     const { regexp, keys } = compilePath(path, {
       end: exact,
       strict,