maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 05:00:43 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the new matchPath instead of matchPattern

Browse source
This commit is contained in:
Kimmo Puputti 2017-02-14 09:50:08 +02:00
parent be2fcdf793
commit 10d6d19c00
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/routesConfiguration.js
View file

@ -1,10 +1,6 @@
import React from 'react';
import { find } from 'lodash';
import { Redirect } from 'react-router-dom';
// This will change to `matchPath` soonish
import matchPattern from 'react-router-dom/matchPattern';
import { Redirect, matchPath } from 'react-router-dom';
import pathToRegexp from 'path-to-regexp';
import {
AuthenticationPage,
@ -286,7 +282,7 @@ const matchRoutesToLocation = (routes, location, matchedRoutes = [], params = {}
routes.forEach(route => {
const { exactly = false } = route;
const match = !route.pattern ? true : matchPattern(route.pattern, location, exactly);
const match = !route.pattern || matchPath(location.pathname, route.pattern, { exact: exactly });
if (match) {
matched.push(route);