update enhancer interface

Author: Ville Saukkonen

demo/client/app.js

@@ -18,12 +18,11 @@ const store = createStore(
   // initial state the hbs template inserted
   window.__INITIAL_STATE || {},
   compose(
-    enhancer,
     applyMiddleware(middleware),
     window.devToolsExtension ? window.devToolsExtension() : f => f
   )
 );
-
+enhancer(store);
 const initialLocation = store.getState().router;
 if (initialLocation) {
   store.dispatch(initializeCurrentLocation(initialLocation));

demo/server/index.js

@@ -33,7 +33,6 @@ const Root = require('../client/demo').default;
 
 const createStore = redux.createStore;
 const combineReducers = redux.combineReducers;
-const compose = redux.compose;
 const applyMiddleware = redux.applyMiddleware;
 
 const PORT = 4567;
@@ -83,9 +82,10 @@ app.get('/*', (req, res) => {
   const store = createStore(
     combineReducers({ router: router.reducer }),
     initialState,
-    compose(router.enhancer, applyMiddleware(router.middleware))
+    applyMiddleware(router.middleware)
   );
 
+  router.enhancer(store);
   const content = renderToString(wrap(store)(Root));
 
   return res.send(

src/enhancer.js

@@ -1,37 +1,26 @@
 // @flow
 
-import type { StoreCreator, Reducer, StoreEnhancer } from 'redux';
+import type { Store } from 'redux';
 import type { History } from 'history';
 
-import type { Location } from './types';
-
 import qs from 'query-string';
 
 import { POP } from './types';
 import { locationDidChange, didReplaceRoutes, replace } from './actions';
 
 import matchCache from './util/match-cache';
 
-type InitialState = {
-  router: Location
-};
-
 type EnhancerArgs = {|
   history: History,
   matchRoute: Function,
   createMatcher: Function
 |};
+
 export default ({ history, matchRoute, createMatcher }: EnhancerArgs) => (
-  createStore: StoreCreator<*, *>
-) => (
-  userReducer: Reducer<*, *>,
-  initialState: InitialState,
-  enhancer: StoreEnhancer<*, *>
+  store: Store<*, *>
 ) => {
   let currentMatcher = matchRoute;
 
-  const store = createStore(userReducer, initialState, enhancer);
-
   // Replace the matcher when replacing routes
   store.subscribe(() => {
     const {
@@ -75,6 +64,4 @@ export default ({ history, matchRoute, createMatcher }: EnhancerArgs) => (
       })
     );
   });
-
-  return { ...store };
 };

test/enhancer.spec.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 
-import { combineReducers, compose, createStore, applyMiddleware } from 'redux';
+import { combineReducers, createStore, applyMiddleware } from 'redux';
 
 import { PUSH, REPLACE_ROUTES } from '../src/types';
 import install from '../src/install';
@@ -33,8 +33,9 @@ describe('Router store enhancer', () => {
     store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     sandbox.spy(store, 'dispatch');
   });
 
@@ -60,9 +61,7 @@ describe('Router store enhancer', () => {
       }
     });
 
-    // This dispatch isn't the dispatch used in the enhancer
-    // (each enhancer has its own copy of dispatch)
-    expect(store.dispatch).to.be.calledOnce;
+    expect(store.dispatch).to.be.calledThrice;
     expect(historyStub.replace).to.be.calledOnce;
     expect(listenStub).to.be.calledOnce;
 

test/environment/browser-router.spec.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 
-import { applyMiddleware, combineReducers, createStore, compose } from 'redux';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
 
 import routerForBrowser from '../../src/environment/browser-router';
 
@@ -25,8 +25,9 @@ describe('Browser router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.pathname', '/home');
     expect(state).to.have.nested.property('router.search', '?get=schwifty');
@@ -52,8 +53,9 @@ describe('Browser router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.basename', '/cob-planet');
     expect(state).to.have.nested.property('router.pathname', '/home');

test/environment/express-router.spec.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 
-import { applyMiddleware, combineReducers, createStore, compose } from 'redux';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
 
 import routerForExpress from '../../src/environment/express-router';
 
@@ -21,8 +21,9 @@ describe('Express router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.pathname', '/home');
     expect(state).to.have.nested.property('router.search', '?get=schwifty');
@@ -43,8 +44,9 @@ describe('Express router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.basename', '/cob-planet');
     expect(state).to.have.nested.property('router.pathname', '/home');

test/environment/hapi-router.spec.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 
-import { applyMiddleware, combineReducers, createStore, compose } from 'redux';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
 
 import routerForHapi from '../../src/environment/hapi-router';
 
@@ -21,8 +21,9 @@ describe('Hapi router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.pathname', '/home');
     expect(state).to.have.nested.property('router.search', '?get=schwifty');

test/environment/hash-router.spec.js

@@ -1,7 +1,7 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 
-import { applyMiddleware, combineReducers, createStore, compose } from 'redux';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
 
 import routerForHash from '../../src/environment/hash-router';
 
@@ -25,8 +25,9 @@ describe('Hash router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.pathname', '/home');
     expect(state).to.have.nested.property('router.search', '?get=schwifty');
@@ -52,8 +53,9 @@ describe('Hash router', () => {
     const store = createStore(
       combineReducers({ router: reducer }),
       {},
-      compose(enhancer, applyMiddleware(middleware))
+      applyMiddleware(middleware)
     );
+    enhancer(store);
     const state = store.getState();
     expect(state).to.have.nested.property('router.basename', '/cob-planet');
     expect(state).to.have.nested.property('router.pathname', '/home');