Upgrade farce

4Catalyzer · Nov 3, 2016 · 22cd461 · 22cd461
1 parent beee218
commit 22cd461
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/4Catalyzer/found#readme",
   "dependencies": {
     "babel-runtime": "^6.18.0",
-    "farce": "^0.0.4",
+    "farce": "^0.0.6",
     "invariant": "^2.2.1",
     "is-promise": "^2.1.0",
     "lodash": "^4.16.4",

diff --git a/src/createBaseRouter.js b/src/createBaseRouter.js
@@ -7,7 +7,11 @@ import HttpError from './HttpError';
 import { routerShape } from './PropTypes';
 import RedirectException from './RedirectException';
 
-export default function createBaseRouter({ routeConfig, matcher, render }) {
+export default function createBaseRouter({
+  routeConfig,
+  matcher,
+  render,
+}) {
   const propTypes = {
     match: React.PropTypes.object.isRequired,
     resolvedMatch: React.PropTypes.object.isRequired,

diff --git a/src/createFarceRouter.js b/src/createFarceRouter.js
@@ -31,9 +31,11 @@ export default function createFarceRouter({
           found: foundReducer,
         }),
         compose(
-          createHistoryEnhancer(
-            historyProtocol, historyMiddlewares, historyOptions,
-          ),
+          createHistoryEnhancer({
+            ...historyOptions,
+            protocol: historyProtocol,
+            middlewares: historyMiddlewares,
+          }),
           createMatchEnhancer(matcher),
         ),
       );