From 85f7a65943d5a254c0fc198804f3ce7318033b6b Mon Sep 17 00:00:00 2001 From: Denis Nedelyaev Date: Wed, 27 Apr 2016 14:27:00 +0300 Subject: [PATCH 1/3] Make `match` set the location as history entry when creating new memory history object I believe, this is a proper fix for https://github.com/denvned/isomorphic-relay-router/issues/26. --- modules/match.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/match.js b/modules/match.js index c3055c546e..e1f3d959ff 100644 --- a/modules/match.js +++ b/modules/match.js @@ -20,7 +20,7 @@ function match({ history, routes, location, ...options }, callback) { 'match needs a history or a location' ) - history = history ? history : createMemoryHistory(options) + history = history || createMemoryHistory({ entrires: [location], ...options }) const transitionManager = createTransitionManager( history, createRoutes(routes) From 3e828ecbc50f72a78d3d6b2dc4ca27ad7e2ee9e3 Mon Sep 17 00:00:00 2001 From: Denis Nedelyaev Date: Wed, 27 Apr 2016 14:31:55 +0300 Subject: [PATCH 2/3] Fix styling issue --- modules/match.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/match.js b/modules/match.js index e1f3d959ff..7657ef0a8a 100644 --- a/modules/match.js +++ b/modules/match.js @@ -20,7 +20,7 @@ function match({ history, routes, location, ...options }, callback) { 'match needs a history or a location' ) - history = history || createMemoryHistory({ entrires: [location], ...options }) + history = history || createMemoryHistory({ entrires: [ location ], ...options }) const transitionManager = createTransitionManager( history, createRoutes(routes) From 93238d5d16b8e8b9ff76b981e33a20d7e34f1963 Mon Sep 17 00:00:00 2001 From: Denis Nedelyaev Date: Wed, 27 Apr 2016 14:32:56 +0300 Subject: [PATCH 3/3] Fix typo --- modules/match.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/match.js b/modules/match.js index 7657ef0a8a..b59be9a2d4 100644 --- a/modules/match.js +++ b/modules/match.js @@ -20,7 +20,7 @@ function match({ history, routes, location, ...options }, callback) { 'match needs a history or a location' ) - history = history || createMemoryHistory({ entrires: [ location ], ...options }) + history = history || createMemoryHistory({ entries: [ location ], ...options }) const transitionManager = createTransitionManager( history, createRoutes(routes)