[BUGFIX] - only use path in route matching #38

michaelBenin · May 17, 2017 · 70b8653 · 70b8653
1 parent 8add722
commit 70b8653
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/client/index.js b/src/client/index.js
@@ -42,7 +42,7 @@ const store = configureStore(browserHistory, bootstrappedConfig, env);
 const routesToMatch = getRoutesWithStore(store);
 
 browserHistory.listen((location /* , action*/) => {
-  const url = `${location.pathname}${location.search}${location.hash}`;
+  const url = `${location.pathname}`;
   const branch = matchRoutes(routesToMatch, url);
   branch.map(function matchMap({ route, match }) {
     return route.loadData ? route.loadData(match) : P.resolve(null);

diff --git a/src/server/middleware/react_router_middleware.js b/src/server/middleware/react_router_middleware.js
@@ -39,7 +39,7 @@ export default (req, res) => {
 
     const routes = getRoutesWithStore(store);
 
-    const branch = matchRoutes(routes, req.url);
+    const branch = matchRoutes(routes, req.path);
 
     const promises = branch.map(function matchMap({ route, match }) {
       return route.loadData ? route.loadData(match) : P.resolve(null);