From 6e3dcf784b90750daa8bf3e3a58d282d58b05ea2 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Fri, 15 Jan 2016 17:06:37 +0200
Subject: [PATCH 01/10] Migration to redux simple router and async-props

---
 package.json                                  |   8 +-
 src/client.js                                 |  17 ++-
 src/containers/App/App.js                     |  36 +++---
 src/containers/Widgets/Widgets.js             |  15 ++-
 src/helpers/Html.js                           |   9 +-
 src/helpers/__tests__/connectData-test.js     |  29 -----
 .../__tests__/getDataDependencies-test.js     |  64 ----------
 .../__tests__/getStatusFromRoutes-test.js     |  52 ---------
 .../__tests__/makeRouteHooksSafe-test.js      | 110 ------------------
 src/helpers/asyncPropsResolver.js             |   4 +
 src/helpers/connectData.js                    |  23 ----
 src/helpers/getDataDependencies.js            |  18 ---
 src/helpers/getStatusFromRoutes.js            |   9 --
 src/helpers/makeRouteHooksSafe.js             |  43 -------
 src/redux/create.js                           |  13 ++-
 src/redux/middleware/transitionMiddleware.js  |  44 -------
 src/redux/modules/reducer.js                  |   4 +-
 src/server.js                                 |  45 +++----
 18 files changed, 74 insertions(+), 469 deletions(-)
 delete mode 100644 src/helpers/__tests__/connectData-test.js
 delete mode 100644 src/helpers/__tests__/getDataDependencies-test.js
 delete mode 100644 src/helpers/__tests__/getStatusFromRoutes-test.js
 delete mode 100644 src/helpers/__tests__/makeRouteHooksSafe-test.js
 create mode 100644 src/helpers/asyncPropsResolver.js
 delete mode 100644 src/helpers/connectData.js
 delete mode 100644 src/helpers/getDataDependencies.js
 delete mode 100644 src/helpers/getStatusFromRoutes.js
 delete mode 100644 src/helpers/makeRouteHooksSafe.js
 delete mode 100644 src/redux/middleware/transitionMiddleware.js

diff --git a/package.json b/package.json
index f2e49b008..111afacd0 100644
--- a/package.json
+++ b/package.json
@@ -82,13 +82,14 @@
     }
   },
   "dependencies": {
+    "async-props": "sars/async-props",
     "babel": "~5.8.29",
     "babel-plugin-typecheck": "^2.0.0",
     "body-parser": "^1.14.1",
     "compression": "^1.6.0",
     "express": "^4.13.3",
     "express-session": "^1.12.1",
-    "history": "1.17.0",
+    "history": "2.0.0-rc2",
     "file-loader": "^0.8.5",
     "http-proxy": "^1.12.0",
     "invariant": "^2.2.0",
@@ -106,12 +107,11 @@
     "react-helmet": "^2.2.0",
     "react-inline-css": "^2.0.0",
     "react-redux": "^4.0.0",
-    "react-router": "1.0.3",
+    "react-router": "2.0.0-rc5",
     "react-router-bootstrap": "^0.19.3",
     "redux": "^3.0.4",
     "redux-form": "^3.0.12",
-    "redux-router": "1.0.0-beta5",
-    "scroll-behavior": "^0.3.0",
+    "redux-simple-router": "^2.0.2",
     "serialize-javascript": "^1.1.2",
     "serve-favicon": "^2.3.0",
     "socket.io": "^1.3.7",
diff --git a/src/client.js b/src/client.js
index 948d9fc6f..0e17479a6 100644
--- a/src/client.js
+++ b/src/client.js
@@ -4,25 +4,20 @@
 import 'babel/polyfill';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import createHistory from 'history/lib/createBrowserHistory';
-import useScroll from 'scroll-behavior/lib/useStandardScroll';
 import createStore from './redux/create';
 import ApiClient from './helpers/ApiClient';
 import io from 'socket.io-client';
 import {Provider} from 'react-redux';
-import {reduxReactRouter, ReduxRouter} from 'redux-router';
+import { Router, browserHistory } from 'react-router';
+import AsyncProps from 'async-props';
+import asyncPropsResolver from './helpers/asyncPropsResolver';
 
 import getRoutes from './routes';
-import makeRouteHooksSafe from './helpers/makeRouteHooksSafe';
 
 const client = new ApiClient();
 
-// Three different types of scroll behavior available.
-// Documented here: https://github.com/rackt/scroll-behavior
-const scrollableHistory = useScroll(createHistory);
-
 const dest = document.getElementById('content');
-const store = createStore(reduxReactRouter, makeRouteHooksSafe(getRoutes), scrollableHistory, client, window.__data);
+const store = createStore(getRoutes, browserHistory, client, window.__data);
 
 function initSocket() {
   const socket = io('', {path: '/ws'});
@@ -40,7 +35,9 @@ function initSocket() {
 global.socket = initSocket();
 
 const component = (
-  <ReduxRouter routes={getRoutes(store)} />
+  <Router render={(props) => <AsyncProps {...props} resolver={asyncPropsResolver} params={{store}} />} history={browserHistory}>
+    {getRoutes(store)}
+  </Router>
 );
 
 ReactDOM.render(
diff --git a/src/containers/App/App.js b/src/containers/App/App.js
index 5222ef2f7..bbdc31b37 100644
--- a/src/containers/App/App.js
+++ b/src/containers/App/App.js
@@ -9,25 +9,12 @@ import Helmet from 'react-helmet';
 import { isLoaded as isInfoLoaded, load as loadInfo } from 'redux/modules/info';
 import { isLoaded as isAuthLoaded, load as loadAuth, logout } from 'redux/modules/auth';
 import { InfoBar } from 'components';
-import { pushState } from 'redux-router';
-import connectData from 'helpers/connectData';
+import { routeActions } from 'redux-simple-router';
 import config from '../../config';
 
-function fetchData(getState, dispatch) {
-  const promises = [];
-  if (!isInfoLoaded(getState())) {
-    promises.push(dispatch(loadInfo()));
-  }
-  if (!isAuthLoaded(getState())) {
-    promises.push(dispatch(loadAuth()));
-  }
-  return Promise.all(promises);
-}
-
-@connectData(fetchData)
 @connect(
   state => ({user: state.auth.user}),
-  {logout, pushState})
+  {logout, pushState: routeActions.push})
 export default class App extends Component {
   static propTypes = {
     children: PropTypes.object.isRequired,
@@ -43,17 +30,30 @@ export default class App extends Component {
   componentWillReceiveProps(nextProps) {
     if (!this.props.user && nextProps.user) {
       // login
-      this.props.pushState(null, '/loginSuccess');
+      this.props.pushState('/loginSuccess');
     } else if (this.props.user && !nextProps.user) {
       // logout
-      this.props.pushState(null, '/');
+      this.props.pushState('/');
     }
   }
 
+  static loadProps(params) {
+    const {dispatch, getState} = params.store;
+    const promises = [];
+
+    if (!isInfoLoaded(getState())) {
+      promises.push(dispatch(loadInfo()));
+    }
+    if (!isAuthLoaded(getState())) {
+      promises.push(dispatch(loadAuth()));
+    }
+    return Promise.all(promises);
+  }
+
   handleLogout = (event) => {
     event.preventDefault();
     this.props.logout();
-  }
+  };
 
   render() {
     const {user} = this.props;
diff --git a/src/containers/Widgets/Widgets.js b/src/containers/Widgets/Widgets.js
index 001e3a758..77284931b 100644
--- a/src/containers/Widgets/Widgets.js
+++ b/src/containers/Widgets/Widgets.js
@@ -4,16 +4,8 @@ import {connect} from 'react-redux';
 import * as widgetActions from 'redux/modules/widgets';
 import {isLoaded, load as loadWidgets} from 'redux/modules/widgets';
 import {initializeWithKey} from 'redux-form';
-import connectData from 'helpers/connectData';
 import { WidgetForm } from 'components';
 
-function fetchDataDeferred(getState, dispatch) {
-  if (!isLoaded(getState())) {
-    return dispatch(loadWidgets());
-  }
-}
-
-@connectData(null, fetchDataDeferred)
 @connect(
   state => ({
     widgets: state.widgets.data,
@@ -31,6 +23,13 @@ export default class Widgets extends Component {
     editing: PropTypes.object.isRequired,
     load: PropTypes.func.isRequired,
     editStart: PropTypes.func.isRequired
+  };
+
+  static loadProps(params) {
+    const {dispatch, getState} = params.store;
+    if (!isLoaded(getState())) {
+      return dispatch(loadWidgets());
+    }
   }
 
   render() {
diff --git a/src/helpers/Html.js b/src/helpers/Html.js
index 9e415a994..3f694eeaa 100644
--- a/src/helpers/Html.js
+++ b/src/helpers/Html.js
@@ -16,11 +16,12 @@ export default class Html extends Component {
   static propTypes = {
     assets: PropTypes.object,
     component: PropTypes.node,
-    store: PropTypes.object
-  }
+    store: PropTypes.object,
+    asyncProps: PropTypes.object
+  };
 
   render() {
-    const {assets, component, store} = this.props;
+    const {assets, component, store, asyncProps} = this.props;
     const content = component ? ReactDOM.renderToString(component) : '';
     const head = Helmet.rewind();
 
@@ -49,6 +50,8 @@ export default class Html extends Component {
         </head>
         <body>
           <div id="content" dangerouslySetInnerHTML={{__html: content}}/>
+          {asyncProps && <script dangerouslySetInnerHTML={{__html: `window.__ASYNC_PROPS__=${serialize(asyncProps.propsArray)};`}}
+                                 charSet="UTF-8"/>}
           <script dangerouslySetInnerHTML={{__html: `window.__data=${serialize(store.getState())};`}} charSet="UTF-8"/>
           <script src={assets.javascript.main} charSet="UTF-8"/>
         </body>
diff --git a/src/helpers/__tests__/connectData-test.js b/src/helpers/__tests__/connectData-test.js
deleted file mode 100644
index d61d73bf4..000000000
--- a/src/helpers/__tests__/connectData-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { expect } from 'chai';
-import React from 'react';
-import { div } from 'react-dom';
-import connectData from '../connectData';
-
-describe('connectData', () => {
-  let fetchData;
-  let fetchDataDeferred;
-  let WrappedComponent;
-  let DataComponent;
-
-  beforeEach(() => {
-    fetchData = 'fetchDataFunction';
-    fetchDataDeferred = 'fetchDataDeferredFunction';
-
-    WrappedComponent = () =>
-      <div />;
-
-    DataComponent = connectData(fetchData, fetchDataDeferred)(WrappedComponent);
-  });
-
-  it('should set fetchData as a static property of the final component', () => {
-    expect(DataComponent.fetchData).to.equal(fetchData);
-  });
-
-  it('should set fetchDataDeferred as a static property of the final component', () => {
-    expect(DataComponent.fetchDataDeferred).to.equal(fetchDataDeferred);
-  });
-});
diff --git a/src/helpers/__tests__/getDataDependencies-test.js b/src/helpers/__tests__/getDataDependencies-test.js
deleted file mode 100644
index fb2a066f1..000000000
--- a/src/helpers/__tests__/getDataDependencies-test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { expect } from 'chai';
-import React from 'react';
-import { div } from 'react-dom';
-import getDataDependencies from '../getDataDependencies';
-
-describe('getDataDependencies', () => {
-  let getState;
-  let dispatch;
-  let location;
-  let params;
-  let CompWithFetchData;
-  let CompWithNoData;
-  let CompWithFetchDataDeferred;
-  const NullComponent = null;
-
-  beforeEach(() => {
-    getState = 'getState';
-    dispatch = 'dispatch';
-    location = 'location';
-    params = 'params';
-
-    CompWithNoData = () =>
-      <div />;
-
-    CompWithFetchData = () =>
-      <div />;
-
-    CompWithFetchData.fetchData = (_getState, _dispatch, _location, _params) => {
-      return `fetchData ${_getState} ${_dispatch} ${_location} ${_params}`;
-    };
-    CompWithFetchDataDeferred = () =>
-      <div />;
-
-    CompWithFetchDataDeferred.fetchDataDeferred = (_getState, _dispatch, _location, _params) => {
-      return `fetchDataDeferred ${_getState} ${_dispatch} ${_location} ${_params}`;
-    };
-  });
-
-  it('should get fetchDatas', () => {
-    const deps = getDataDependencies([
-      NullComponent,
-      CompWithFetchData,
-      CompWithNoData,
-      CompWithFetchDataDeferred
-    ], getState, dispatch, location, params);
-
-    expect(deps).to.deep.equal([
-      'fetchData getState dispatch location params'
-    ]);
-  });
-
-  it('should get fetchDataDeferreds', () => {
-    const deps = getDataDependencies([
-      NullComponent,
-      CompWithFetchData,
-      CompWithNoData,
-      CompWithFetchDataDeferred
-    ], getState, dispatch, location, params, true);
-
-    expect(deps).to.deep.equal([
-      'fetchDataDeferred getState dispatch location params'
-    ]);
-  });
-});
diff --git a/src/helpers/__tests__/getStatusFromRoutes-test.js b/src/helpers/__tests__/getStatusFromRoutes-test.js
deleted file mode 100644
index db41083e6..000000000
--- a/src/helpers/__tests__/getStatusFromRoutes-test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { expect } from 'chai';
-import getStatusFromRoutes from '../getStatusFromRoutes';
-
-describe('getStatusFromRoutes', () => {
-  it('should return null when no routes have status code', () => {
-    const status = getStatusFromRoutes([
-        {}, {}
-    ]);
-
-    expect(status).to.equal(null);
-  });
-
-  it('should return the only status code', () => {
-    const status = getStatusFromRoutes([
-        {status: 404}
-    ]);
-
-    expect(status).to.equal(404);
-  });
-
-  it('should return the only status code when other routes have none', () => {
-    const status = getStatusFromRoutes([
-        {status: 404}, {}, {}
-    ]);
-
-    expect(status).to.equal(404);
-  });
-
-  it('should return the last status code when later routes have none', () => {
-    const status = getStatusFromRoutes([
-        {status: 200}, {status: 404}, {}
-    ]);
-
-    expect(status).to.equal(404);
-  });
-
-  it('should return the last status code when previous routes have one', () => {
-    const status = getStatusFromRoutes([
-        {status: 200}, {}, {status: 404}
-    ]);
-
-    expect(status).to.equal(404);
-  });
-
-  it('should return the last status code', () => {
-    const status = getStatusFromRoutes([
-        {}, {}, {status: 404}
-    ]);
-
-    expect(status).to.equal(404);
-  });
-});
diff --git a/src/helpers/__tests__/makeRouteHooksSafe-test.js b/src/helpers/__tests__/makeRouteHooksSafe-test.js
deleted file mode 100644
index 9c49dd7e9..000000000
--- a/src/helpers/__tests__/makeRouteHooksSafe-test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import { expect } from 'chai';
-import React from 'react';
-import { IndexRoute, Route } from 'react-router';
-import makeRouteHooksSafe from '../makeRouteHooksSafe';
-
-
-describe('makeRouteHooksSafe', () => {
-  it('should work with JSX routes', () => {
-    const onEnter = () => {
-      throw new Error('Shouldn\'t call onEnter');
-    };
-
-    const getRoutes = makeRouteHooksSafe(() => {
-      return (
-        <Route path="/" >
-          <IndexRoute onEnter={onEnter} />
-          <Route path="1" />
-          <Route onEnter={onEnter}>
-            <Route path="2" />
-            <Route path="3" onEnter={onEnter}/>
-          </Route>
-        </Route>
-      );
-    });
-
-    const routes = getRoutes(null);
-
-    expect(routes[0].indexRoute.onEnter).to.not.throw(Error);
-    expect(routes[0].childRoutes[1].onEnter).to.not.throw(Error);
-    expect(routes[0].childRoutes[1].childRoutes[1].onEnter).to.not.throw(Error);
-  });
-
-  it('should work with JS routes', () => {
-    const onEnter = () => {
-      throw new Error('Shouldn\'t call onEnter');
-    };
-
-    const getRoutes = makeRouteHooksSafe(() => {
-      return {
-        path: '/',
-        indexRoute: {
-          onEnter: onEnter
-        },
-        onEnter: onEnter,
-        childRoutes: [
-          {path: '1'},
-          {
-            onEnter: onEnter,
-            childRoutes: [
-              {path: '2'},
-              {path: '3'}
-            ],
-          }
-        ]
-      };
-    });
-
-    const routes = getRoutes(null);
-
-    expect(routes[0].indexRoute.onEnter).to.not.throw(Error);
-    expect(routes[0].onEnter).to.not.throw(Error);
-    expect(routes[0].childRoutes[1].onEnter).to.not.throw(Error);
-  });
-
-  it('should call onEnter if store is initialised', (done) => {
-    const store = {
-      getState: () => {}
-    };
-
-    const getRoutes = makeRouteHooksSafe(() => {
-      return {
-        onEnter: () => {
-          done();
-        }
-      };
-    });
-
-    const routes = getRoutes(store);
-
-    routes[0].onEnter();
-  });
-
-  it('should call callback', (done) => {
-    const getRoutes = makeRouteHooksSafe(() => {
-      return {
-        onEnter: (nextState, replaceState, cb) => {} // eslint-disable-line no-unused-vars
-      };
-    });
-
-    const routes = getRoutes(null);
-
-    routes[0].onEnter(null, null, done);
-  });
-
-  it('should not call callback', () => {
-    const callback = () => {
-      throw new Error('Should not be called');
-    };
-
-    const getRoutes = makeRouteHooksSafe(() => {
-      return {
-        onEnter: (nextState, replaceState) => {} // eslint-disable-line no-unused-vars
-      };
-    });
-
-    const routes = getRoutes(null);
-
-    routes[0].onEnter(null, null, callback);
-  });
-});
diff --git a/src/helpers/asyncPropsResolver.js b/src/helpers/asyncPropsResolver.js
new file mode 100644
index 000000000..12629d4cd
--- /dev/null
+++ b/src/helpers/asyncPropsResolver.js
@@ -0,0 +1,4 @@
+export default (Component, params, cb) => {
+  const result = Component.loadProps(params);
+  return result ? Component.loadProps(params).then(cb, cb) : cb();
+};
diff --git a/src/helpers/connectData.js b/src/helpers/connectData.js
deleted file mode 100644
index a67510292..000000000
--- a/src/helpers/connectData.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, { Component } from 'react';
-
-/*
-  Note:
-    When this decorator is used, it MUST be the first (outermost) decorator.
-    Otherwise, we cannot find and call the fetchData and fetchDataDeffered methods.
-*/
-
-export default function connectData(fetchData, fetchDataDeferred) {
-  return function wrapWithFetchData(WrappedComponent) {
-    class ConnectData extends Component {
-
-      static fetchData = fetchData;
-      static fetchDataDeferred = fetchDataDeferred;
-
-      render() {
-        return <WrappedComponent {...this.props} />;
-      }
-    }
-
-    return ConnectData;
-  };
-}
diff --git a/src/helpers/getDataDependencies.js b/src/helpers/getDataDependencies.js
deleted file mode 100644
index 9559c51f3..000000000
--- a/src/helpers/getDataDependencies.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-  * 1. Skip holes in route component chain and
-  * only consider components that implement
-  * fetchData or fetchDataDeferred
-  *
-  * 2. Pull out fetch data methods
-  *
-  * 3. Call fetch data methods and gather promises
-  */
-export default (components, getState, dispatch, location, params, deferred) => {
-  const methodName = deferred ? 'fetchDataDeferred' : 'fetchData';
-
-  return components
-    .filter((component) => component && component[methodName]) // 1
-    .map((component) => component[methodName]) // 2
-    .map(fetchData =>
-      fetchData(getState, dispatch, location, params)); // 3
-};
diff --git a/src/helpers/getStatusFromRoutes.js b/src/helpers/getStatusFromRoutes.js
deleted file mode 100644
index af952a2a8..000000000
--- a/src/helpers/getStatusFromRoutes.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Return the status code from the last matched route with a status property.
- *
- * @param matchedRoutes
- * @returns {Number|null}
- */
-export default (matchedRoutes) => {
-  return matchedRoutes.reduce((prev, cur) => cur.status || prev, null);
-};
diff --git a/src/helpers/makeRouteHooksSafe.js b/src/helpers/makeRouteHooksSafe.js
deleted file mode 100644
index 7c9f8c539..000000000
--- a/src/helpers/makeRouteHooksSafe.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { createRoutes } from 'react-router/lib/RouteUtils';
-
-// Wrap the hooks so they don't fire if they're called before
-// the store is initialised. This only happens when doing the first
-// client render of a route that has an onEnter hook
-function makeHooksSafe(routes, store) {
-  if (Array.isArray(routes)) {
-    return routes.map((route) => makeHooksSafe(route, store));
-  }
-
-  const onEnter = routes.onEnter;
-
-  if (onEnter) {
-    routes.onEnter = function safeOnEnter(...args) {
-      try {
-        store.getState();
-      } catch (err) {
-        if (onEnter.length === 3) {
-          args[2]();
-        }
-
-        // There's no store yet so ignore the hook
-        return;
-      }
-
-      onEnter.apply(null, args);
-    };
-  }
-
-  if (routes.childRoutes) {
-    makeHooksSafe(routes.childRoutes, store);
-  }
-
-  if (routes.indexRoute) {
-    makeHooksSafe(routes.indexRoute, store);
-  }
-
-  return routes;
-}
-
-export default function makeRouteHooksSafe(_getRoutes) {
-  return (store) => makeHooksSafe(createRoutes(_getRoutes(store)), store);
-}
diff --git a/src/redux/create.js b/src/redux/create.js
index 6a08c9dbb..f9fe83ee5 100644
--- a/src/redux/create.js
+++ b/src/redux/create.js
@@ -1,9 +1,12 @@
 import { createStore as _createStore, applyMiddleware, compose } from 'redux';
 import createMiddleware from './middleware/clientMiddleware';
-import transitionMiddleware from './middleware/transitionMiddleware';
+import { syncHistory } from 'redux-simple-router';
 
-export default function createStore(reduxReactRouter, getRoutes, createHistory, client, data) {
-  const middleware = [createMiddleware(client), transitionMiddleware];
+export default function createStore(getRoutes, history, client, data) {
+  // Sync dispatched route actions to the history
+  const reduxRouterMiddleware = syncHistory(history);
+
+  const middleware = [createMiddleware(client), reduxRouterMiddleware];
 
   let finalCreateStore;
   if (__DEVELOPMENT__ && __CLIENT__ && __DEVTOOLS__) {
@@ -18,11 +21,11 @@ export default function createStore(reduxReactRouter, getRoutes, createHistory,
     finalCreateStore = applyMiddleware(...middleware)(_createStore);
   }
 
-  finalCreateStore = reduxReactRouter({ getRoutes, createHistory })(finalCreateStore);
-
   const reducer = require('./modules/reducer');
   const store = finalCreateStore(reducer, data);
 
+  reduxRouterMiddleware.listenForReplays(store);
+
   if (__DEVELOPMENT__ && module.hot) {
     module.hot.accept('./modules/reducer', () => {
       store.replaceReducer(require('./modules/reducer'));
diff --git a/src/redux/middleware/transitionMiddleware.js b/src/redux/middleware/transitionMiddleware.js
deleted file mode 100644
index 5532f89e2..000000000
--- a/src/redux/middleware/transitionMiddleware.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import {ROUTER_DID_CHANGE} from 'redux-router/lib/constants';
-import getDataDependencies from '../../helpers/getDataDependencies';
-
-const locationsAreEqual = (locA, locB) => (locA.pathname === locB.pathname) && (locA.search === locB.search);
-
-export default ({getState, dispatch}) => next => action => {
-  if (action.type === ROUTER_DID_CHANGE) {
-    if (getState().router && locationsAreEqual(action.payload.location, getState().router.location)) {
-      return next(action);
-    }
-
-    const {components, location, params} = action.payload;
-    const promise = new Promise((resolve) => {
-      const doTransition = () => {
-        next(action);
-        Promise.all(getDataDependencies(components, getState, dispatch, location, params, true))
-          .then(resolve)
-          .catch(error => {
-            // TODO: You may want to handle errors for fetchDataDeferred here
-            console.warn('Warning: Error in fetchDataDeferred', error);
-            return resolve();
-          });
-      };
-
-      Promise.all(getDataDependencies(components, getState, dispatch, location, params))
-        .then(doTransition)
-        .catch(error => {
-          // TODO: You may want to handle errors for fetchData here
-          console.warn('Warning: Error in fetchData', error);
-          return doTransition();
-        });
-    });
-
-    if (__SERVER__) {
-      // router state is null until ReduxRouter is created so we can use this to store
-      // our promise to let the server know when it can render
-      getState().router = promise;
-    }
-
-    return promise;
-  }
-
-  return next(action);
-};
diff --git a/src/redux/modules/reducer.js b/src/redux/modules/reducer.js
index 6efb9e7cb..fbcbc82c5 100644
--- a/src/redux/modules/reducer.js
+++ b/src/redux/modules/reducer.js
@@ -1,6 +1,6 @@
 import { combineReducers } from 'redux';
 import multireducer from 'multireducer';
-import { routerStateReducer } from 'redux-router';
+import { routeReducer } from 'redux-simple-router';
 
 import auth from './auth';
 import counter from './counter';
@@ -9,7 +9,7 @@ import info from './info';
 import widgets from './widgets';
 
 export default combineReducers({
-  router: routerStateReducer,
+  routing: routeReducer,
   auth,
   form,
   multireducer: multireducer({
diff --git a/src/server.js b/src/server.js
index c95a092ec..3951e9216 100644
--- a/src/server.js
+++ b/src/server.js
@@ -12,13 +12,14 @@ import Html from './helpers/Html';
 import PrettyError from 'pretty-error';
 import http from 'http';
 
+import { match } from 'react-router';
+import AsyncProps, { loadPropsOnServer } from 'async-props';
 import {ReduxRouter} from 'redux-router';
 import createHistory from 'history/lib/createMemoryHistory';
-import {reduxReactRouter, match} from 'redux-router/server';
 import {Provider} from 'react-redux';
 import qs from 'query-string';
 import getRoutes from './routes';
-import getStatusFromRoutes from './helpers/getStatusFromRoutes';
+import asyncPropsResolver from './helpers/asyncPropsResolver';
 
 const targetUrl = 'http://' + config.apiHost + ':' + config.apiPort;
 const pretty = new PrettyError();
@@ -68,8 +69,9 @@ app.use((req, res) => {
     webpackIsomorphicTools.refresh();
   }
   const client = new ApiClient(req);
+  const history = createHistory();
 
-  const store = createStore(reduxReactRouter, getRoutes, createHistory, client);
+  const store = createStore(getRoutes, history, client);
 
   function hydrateOnClient() {
     res.send('<!doctype html>\n' +
@@ -81,43 +83,32 @@ app.use((req, res) => {
     return;
   }
 
-  store.dispatch(match(req.originalUrl, (error, redirectLocation, routerState) => {
+  match({ history, routes: getRoutes(store), location: req.originalUrl }, (error, redirectLocation, renderProps) => {
     if (redirectLocation) {
       res.redirect(redirectLocation.pathname + redirectLocation.search);
     } else if (error) {
       console.error('ROUTER ERROR:', pretty.render(error));
       res.status(500);
       hydrateOnClient();
-    } else if (!routerState) {
-      res.status(500);
-      hydrateOnClient();
-    } else {
-      // Workaround redux-router query string issue:
-      // https://github.com/rackt/redux-router/issues/106
-      if (routerState.location.search && !routerState.location.query) {
-        routerState.location.query = qs.parse(routerState.location.search);
-      }
-
-      store.getState().router.then(() => {
+    } else if (renderProps) {
+      loadPropsOnServer({...renderProps, params: {store}}, (err, asyncProps) => {
         const component = (
           <Provider store={store} key="provider">
-            <ReduxRouter/>
+            <AsyncProps {...renderProps} {...asyncProps} />
           </Provider>
         );
 
-        const status = getStatusFromRoutes(routerState.routes);
-        if (status) {
-          res.status(status);
-        }
+        res.status(200);
+
+        global.navigator = {userAgent: req.headers['user-agent']};
+
         res.send('<!doctype html>\n' +
-          ReactDOM.renderToString(<Html assets={webpackIsomorphicTools.assets()} component={component} store={store}/>));
-      }).catch((err) => {
-        console.error('DATA FETCHING ERROR:', pretty.render(err));
-        res.status(500);
-        hydrateOnClient();
-      });
+          ReactDOM.renderToString(<Html asyncProps={asyncProps} assets={webpackIsomorphicTools.assets()} component={component} store={store}/>));
+      }, asyncPropsResolver);
+    } else {
+      res.status(404).send('Not found');
     }
-  }));
+  });
 });
 
 if (config.port) {

From 919a24a9f05bfcde6768facc8d2bbbe9e45b9c63 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Wed, 20 Jan 2016 11:10:02 +0200
Subject: [PATCH 02/10] Migration to redux-async-props

---
 package.json                             |  6 ++----
 src/client.js                            |  7 ++++---
 src/containers/App/App.js                |  4 ++--
 src/containers/Widgets/Widgets.js        |  4 ++--
 src/helpers/Html.js                      |  7 ++-----
 src/helpers/asyncPropsResolver.js        |  4 ----
 src/redux/middleware/clientMiddleware.js |  6 +++++-
 src/redux/modules/reducer.js             |  2 ++
 src/server.js                            | 13 +++++--------
 9 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 src/helpers/asyncPropsResolver.js

diff --git a/package.json b/package.json
index 111afacd0..f1dad9307 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
     }
   },
   "dependencies": {
-    "async-props": "sars/async-props",
     "babel": "~5.8.29",
     "babel-plugin-typecheck": "^2.0.0",
     "body-parser": "^1.14.1",
@@ -100,7 +99,6 @@
     "multireducer": "^2.0.0",
     "piping": "^0.3.0",
     "pretty-error": "^1.2.0",
-    "query-string": "^3.0.0",
     "react": "^0.14.2",
     "react-bootstrap": "^0.28.1",
     "react-dom": "^0.14.1",
@@ -108,10 +106,10 @@
     "react-inline-css": "^2.0.0",
     "react-redux": "^4.0.0",
     "react-router": "2.0.0-rc5",
-    "react-router-bootstrap": "^0.19.3",
+    "react-router-bootstrap": "^0.20.1",
     "redux": "^3.0.4",
     "redux-form": "^3.0.12",
-    "redux-simple-router": "^2.0.2",
+    "redux-simple-router": "^2.0.4",
     "serialize-javascript": "^1.1.2",
     "serve-favicon": "^2.3.0",
     "socket.io": "^1.3.7",
diff --git a/src/client.js b/src/client.js
index 0e17479a6..03e0f78e1 100644
--- a/src/client.js
+++ b/src/client.js
@@ -9,8 +9,7 @@ import ApiClient from './helpers/ApiClient';
 import io from 'socket.io-client';
 import {Provider} from 'react-redux';
 import { Router, browserHistory } from 'react-router';
-import AsyncProps from 'async-props';
-import asyncPropsResolver from './helpers/asyncPropsResolver';
+import { ReduxAsyncConnect } from 'redux-async-connect';
 
 import getRoutes from './routes';
 
@@ -35,7 +34,9 @@ function initSocket() {
 global.socket = initSocket();
 
 const component = (
-  <Router render={(props) => <AsyncProps {...props} resolver={asyncPropsResolver} params={{store}} />} history={browserHistory}>
+  <Router render={(props) =>
+        <ReduxAsyncConnect {...props} helpers={{client}} />
+      } history={browserHistory}>
     {getRoutes(store)}
   </Router>
 );
diff --git a/src/containers/App/App.js b/src/containers/App/App.js
index bbdc31b37..cea2d22fa 100644
--- a/src/containers/App/App.js
+++ b/src/containers/App/App.js
@@ -37,8 +37,8 @@ export default class App extends Component {
     }
   }
 
-  static loadProps(params) {
-    const {dispatch, getState} = params.store;
+  static reduxAsyncConnect(params, store) {
+    const {dispatch, getState} = store;
     const promises = [];
 
     if (!isInfoLoaded(getState())) {
diff --git a/src/containers/Widgets/Widgets.js b/src/containers/Widgets/Widgets.js
index 77284931b..e02c0e84c 100644
--- a/src/containers/Widgets/Widgets.js
+++ b/src/containers/Widgets/Widgets.js
@@ -25,8 +25,8 @@ export default class Widgets extends Component {
     editStart: PropTypes.func.isRequired
   };
 
-  static loadProps(params) {
-    const {dispatch, getState} = params.store;
+  static reduxAsyncConnect(params, store) {
+    const {dispatch, getState} = store;
     if (!isLoaded(getState())) {
       return dispatch(loadWidgets());
     }
diff --git a/src/helpers/Html.js b/src/helpers/Html.js
index 3f694eeaa..ebf5ba436 100644
--- a/src/helpers/Html.js
+++ b/src/helpers/Html.js
@@ -16,12 +16,11 @@ export default class Html extends Component {
   static propTypes = {
     assets: PropTypes.object,
     component: PropTypes.node,
-    store: PropTypes.object,
-    asyncProps: PropTypes.object
+    store: PropTypes.object
   };
 
   render() {
-    const {assets, component, store, asyncProps} = this.props;
+    const {assets, component, store} = this.props;
     const content = component ? ReactDOM.renderToString(component) : '';
     const head = Helmet.rewind();
 
@@ -50,8 +49,6 @@ export default class Html extends Component {
         </head>
         <body>
           <div id="content" dangerouslySetInnerHTML={{__html: content}}/>
-          {asyncProps && <script dangerouslySetInnerHTML={{__html: `window.__ASYNC_PROPS__=${serialize(asyncProps.propsArray)};`}}
-                                 charSet="UTF-8"/>}
           <script dangerouslySetInnerHTML={{__html: `window.__data=${serialize(store.getState())};`}} charSet="UTF-8"/>
           <script src={assets.javascript.main} charSet="UTF-8"/>
         </body>
diff --git a/src/helpers/asyncPropsResolver.js b/src/helpers/asyncPropsResolver.js
deleted file mode 100644
index 12629d4cd..000000000
--- a/src/helpers/asyncPropsResolver.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default (Component, params, cb) => {
-  const result = Component.loadProps(params);
-  return result ? Component.loadProps(params).then(cb, cb) : cb();
-};
diff --git a/src/redux/middleware/clientMiddleware.js b/src/redux/middleware/clientMiddleware.js
index 7ca18f95e..c3403c166 100644
--- a/src/redux/middleware/clientMiddleware.js
+++ b/src/redux/middleware/clientMiddleware.js
@@ -12,13 +12,17 @@ export default function clientMiddleware(client) {
 
       const [REQUEST, SUCCESS, FAILURE] = types;
       next({...rest, type: REQUEST});
-      return promise(client).then(
+
+      const actionPromise = promise(client);
+      actionPromise.then(
         (result) => next({...rest, result, type: SUCCESS}),
         (error) => next({...rest, error, type: FAILURE})
       ).catch((error)=> {
         console.error('MIDDLEWARE ERROR:', error);
         next({...rest, error, type: FAILURE});
       });
+
+      return actionPromise;
     };
   };
 }
diff --git a/src/redux/modules/reducer.js b/src/redux/modules/reducer.js
index fbcbc82c5..1bc0a88d9 100644
--- a/src/redux/modules/reducer.js
+++ b/src/redux/modules/reducer.js
@@ -1,6 +1,7 @@
 import { combineReducers } from 'redux';
 import multireducer from 'multireducer';
 import { routeReducer } from 'redux-simple-router';
+import {reducer as reduxAsyncConnect} from 'redux-async-connect';
 
 import auth from './auth';
 import counter from './counter';
@@ -10,6 +11,7 @@ import widgets from './widgets';
 
 export default combineReducers({
   routing: routeReducer,
+  reduxAsyncConnect,
   auth,
   form,
   multireducer: multireducer({
diff --git a/src/server.js b/src/server.js
index 3951e9216..df08807a0 100644
--- a/src/server.js
+++ b/src/server.js
@@ -13,13 +13,10 @@ import PrettyError from 'pretty-error';
 import http from 'http';
 
 import { match } from 'react-router';
-import AsyncProps, { loadPropsOnServer } from 'async-props';
-import {ReduxRouter} from 'redux-router';
+import { ReduxAsyncConnect, loadOnServer } from 'redux-async-connect';
 import createHistory from 'history/lib/createMemoryHistory';
 import {Provider} from 'react-redux';
-import qs from 'query-string';
 import getRoutes from './routes';
-import asyncPropsResolver from './helpers/asyncPropsResolver';
 
 const targetUrl = 'http://' + config.apiHost + ':' + config.apiPort;
 const pretty = new PrettyError();
@@ -91,10 +88,10 @@ app.use((req, res) => {
       res.status(500);
       hydrateOnClient();
     } else if (renderProps) {
-      loadPropsOnServer({...renderProps, params: {store}}, (err, asyncProps) => {
+      loadOnServer(renderProps, store, {client}).then(() => {
         const component = (
           <Provider store={store} key="provider">
-            <AsyncProps {...renderProps} {...asyncProps} />
+            <ReduxAsyncConnect {...renderProps} />
           </Provider>
         );
 
@@ -103,8 +100,8 @@ app.use((req, res) => {
         global.navigator = {userAgent: req.headers['user-agent']};
 
         res.send('<!doctype html>\n' +
-          ReactDOM.renderToString(<Html asyncProps={asyncProps} assets={webpackIsomorphicTools.assets()} component={component} store={store}/>));
-      }, asyncPropsResolver);
+          ReactDOM.renderToString(<Html assets={webpackIsomorphicTools.assets()} component={component} store={store}/>));
+      });
     } else {
       res.status(404).send('Not found');
     }

From 2f767e506a42e77f5bbd2b4d493f2eb2b3e5b8c0 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Wed, 20 Jan 2016 12:08:33 +0200
Subject: [PATCH 03/10] test infoBar fix

---
 src/components/__tests__/InfoBar-test.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/__tests__/InfoBar-test.js b/src/components/__tests__/InfoBar-test.js
index 6652d6f01..7ebcd8f39 100644
--- a/src/components/__tests__/InfoBar-test.js
+++ b/src/components/__tests__/InfoBar-test.js
@@ -4,8 +4,7 @@ import {renderIntoDocument} from 'react-addons-test-utils';
 import { expect} from 'chai';
 import { InfoBar } from 'components';
 import { Provider } from 'react-redux';
-import {reduxReactRouter} from 'redux-router';
-import createHistory from 'history/lib/createMemoryHistory';
+import { browserHistory } from 'react-router';
 import createStore from 'redux/create';
 import ApiClient from 'helpers/ApiClient';
 const client = new ApiClient();
@@ -22,8 +21,7 @@ describe('InfoBar', () => {
       }
     }
   };
-
-  const store = createStore(reduxReactRouter, null, createHistory, client, mockStore);
+  const store = createStore(null, browserHistory, client, mockStore);
   const renderer = renderIntoDocument(
     <Provider store={store} key="provider">
       <InfoBar/>

From bae54ede4eef982af55a98276c4756c77f42b55f Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Wed, 20 Jan 2016 12:37:06 +0200
Subject: [PATCH 04/10] redux-async-connect 0.1.4

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f1dad9307..1b41a94e5 100644
--- a/package.json
+++ b/package.json
@@ -88,8 +88,8 @@
     "compression": "^1.6.0",
     "express": "^4.13.3",
     "express-session": "^1.12.1",
-    "history": "2.0.0-rc2",
     "file-loader": "^0.8.5",
+    "history": "2.0.0-rc2",
     "http-proxy": "^1.12.0",
     "invariant": "^2.2.0",
     "less": "^2.5.3",
@@ -108,6 +108,7 @@
     "react-router": "2.0.0-rc5",
     "react-router-bootstrap": "^0.20.1",
     "redux": "^3.0.4",
+    "redux-async-connect": "^0.1.4",
     "redux-form": "^3.0.12",
     "redux-simple-router": "^2.0.4",
     "serialize-javascript": "^1.1.2",

From b963ac248da22b5484aaadfdd5c267f628904ac8 Mon Sep 17 00:00:00 2001
From: Dan Schuman <danschuman@gmail.com>
Date: Sun, 24 Jan 2016 18:17:50 -0500
Subject: [PATCH 05/10] Fix duplicate re-render.

---
 src/containers/App/App.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/containers/App/App.js b/src/containers/App/App.js
index cea2d22fa..262ccf44c 100644
--- a/src/containers/App/App.js
+++ b/src/containers/App/App.js
@@ -47,7 +47,9 @@ export default class App extends Component {
     if (!isAuthLoaded(getState())) {
       promises.push(dispatch(loadAuth()));
     }
-    return Promise.all(promises);
+    if (promises.length > 0) {
+      return Promise.all(promises);
+    }
   }
 
   handleLogout = (event) => {

From f5d42fee1d2d3a9dcc030b8d82ee6b4473f15626 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Mon, 25 Jan 2016 19:55:28 +0200
Subject: [PATCH 06/10] redux-async connect updated to 0.1.10
 redux-simple-router updated to react-router-redux 2.1.0

---
 package.json                 | 4 ++--
 src/containers/App/App.js    | 7 +++----
 src/redux/create.js          | 2 +-
 src/redux/modules/reducer.js | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 1b41a94e5..698afb5e8 100644
--- a/package.json
+++ b/package.json
@@ -108,9 +108,9 @@
     "react-router": "2.0.0-rc5",
     "react-router-bootstrap": "^0.20.1",
     "redux": "^3.0.4",
-    "redux-async-connect": "^0.1.4",
+    "redux-async-connect": "^0.1.10",
     "redux-form": "^3.0.12",
-    "redux-simple-router": "^2.0.4",
+    "react-router-redux": "^2.1.0",
     "serialize-javascript": "^1.1.2",
     "serve-favicon": "^2.3.0",
     "socket.io": "^1.3.7",
diff --git a/src/containers/App/App.js b/src/containers/App/App.js
index 262ccf44c..ef117f62c 100644
--- a/src/containers/App/App.js
+++ b/src/containers/App/App.js
@@ -9,7 +9,7 @@ import Helmet from 'react-helmet';
 import { isLoaded as isInfoLoaded, load as loadInfo } from 'redux/modules/info';
 import { isLoaded as isAuthLoaded, load as loadAuth, logout } from 'redux/modules/auth';
 import { InfoBar } from 'components';
-import { routeActions } from 'redux-simple-router';
+import { routeActions } from 'react-router-redux';
 import config from '../../config';
 
 @connect(
@@ -47,9 +47,8 @@ export default class App extends Component {
     if (!isAuthLoaded(getState())) {
       promises.push(dispatch(loadAuth()));
     }
-    if (promises.length > 0) {
-      return Promise.all(promises);
-    }
+
+    return Promise.all(promises);
   }
 
   handleLogout = (event) => {
diff --git a/src/redux/create.js b/src/redux/create.js
index f9fe83ee5..0869a5198 100644
--- a/src/redux/create.js
+++ b/src/redux/create.js
@@ -1,6 +1,6 @@
 import { createStore as _createStore, applyMiddleware, compose } from 'redux';
 import createMiddleware from './middleware/clientMiddleware';
-import { syncHistory } from 'redux-simple-router';
+import { syncHistory } from 'react-router-redux';
 
 export default function createStore(getRoutes, history, client, data) {
   // Sync dispatched route actions to the history
diff --git a/src/redux/modules/reducer.js b/src/redux/modules/reducer.js
index 1bc0a88d9..d260a1632 100644
--- a/src/redux/modules/reducer.js
+++ b/src/redux/modules/reducer.js
@@ -1,6 +1,6 @@
 import { combineReducers } from 'redux';
 import multireducer from 'multireducer';
-import { routeReducer } from 'redux-simple-router';
+import { routeReducer } from 'react-router-redux';
 import {reducer as reduxAsyncConnect} from 'redux-async-connect';
 
 import auth from './auth';

From e327fe495cbd3bb1ed5f50263252dcb0cbc4f8a7 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Thu, 11 Feb 2016 15:09:16 +0200
Subject: [PATCH 07/10] react-router-redux updated to v3.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 698afb5e8..62940c86c 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "redux": "^3.0.4",
     "redux-async-connect": "^0.1.10",
     "redux-form": "^3.0.12",
-    "react-router-redux": "^2.1.0",
+    "react-router-redux": "^3.0.0",
     "serialize-javascript": "^1.1.2",
     "serve-favicon": "^2.3.0",
     "socket.io": "^1.3.7",

From a7a55b72060a3e6df6c934399afe532441e21a76 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Thu, 11 Feb 2016 15:21:20 +0200
Subject: [PATCH 08/10] Removing dependency from history module Better
 initialization of react router redux on server-side (with original url)

---
 package.json  | 1 -
 src/server.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 62940c86c..1d15dbebd 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
     "express": "^4.13.3",
     "express-session": "^1.12.1",
     "file-loader": "^0.8.5",
-    "history": "2.0.0-rc2",
     "http-proxy": "^1.12.0",
     "invariant": "^2.2.0",
     "less": "^2.5.3",
diff --git a/src/server.js b/src/server.js
index df08807a0..cc2be2b1d 100644
--- a/src/server.js
+++ b/src/server.js
@@ -14,7 +14,7 @@ import http from 'http';
 
 import { match } from 'react-router';
 import { ReduxAsyncConnect, loadOnServer } from 'redux-async-connect';
-import createHistory from 'history/lib/createMemoryHistory';
+import createHistory from 'react-router/lib/createMemoryHistory';
 import {Provider} from 'react-redux';
 import getRoutes from './routes';
 
@@ -66,7 +66,7 @@ app.use((req, res) => {
     webpackIsomorphicTools.refresh();
   }
   const client = new ApiClient(req);
-  const history = createHistory();
+  const history = createHistory(req.originalUrl);
 
   const store = createStore(getRoutes, history, client);
 

From 97773e5352dcdec795a19621a22ae7e6f6960bc6 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Sat, 13 Feb 2016 14:07:53 +0200
Subject: [PATCH 09/10] Scroll behavior several modules updated

---
 package.json  | 7 ++++---
 src/client.js | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1d15dbebd..ce8f29661 100644
--- a/package.json
+++ b/package.json
@@ -104,12 +104,13 @@
     "react-helmet": "^2.2.0",
     "react-inline-css": "^2.0.0",
     "react-redux": "^4.0.0",
-    "react-router": "2.0.0-rc5",
+    "react-router": "2.0.0",
     "react-router-bootstrap": "^0.20.1",
+    "react-router-redux": "^3.0.0",
     "redux": "^3.0.4",
-    "redux-async-connect": "^0.1.10",
+    "redux-async-connect": "^0.1.13",
     "redux-form": "^3.0.12",
-    "react-router-redux": "^3.0.0",
+    "scroll-behavior": "^0.3.2",
     "serialize-javascript": "^1.1.2",
     "serve-favicon": "^2.3.0",
     "socket.io": "^1.3.7",
diff --git a/src/client.js b/src/client.js
index 03e0f78e1..9a750a105 100644
--- a/src/client.js
+++ b/src/client.js
@@ -10,13 +10,14 @@ import io from 'socket.io-client';
 import {Provider} from 'react-redux';
 import { Router, browserHistory } from 'react-router';
 import { ReduxAsyncConnect } from 'redux-async-connect';
+import useScroll from 'scroll-behavior/lib/useStandardScroll';
 
 import getRoutes from './routes';
 
 const client = new ApiClient();
-
+const history = useScroll(() => browserHistory)();
 const dest = document.getElementById('content');
-const store = createStore(getRoutes, browserHistory, client, window.__data);
+const store = createStore(getRoutes, history, client, window.__data);
 
 function initSocket() {
   const socket = io('', {path: '/ws'});
@@ -36,7 +37,7 @@ global.socket = initSocket();
 const component = (
   <Router render={(props) =>
         <ReduxAsyncConnect {...props} helpers={{client}} />
-      } history={browserHistory}>
+      } history={history}>
     {getRoutes(store)}
   </Router>
 );

From a4a2c05862445e5755388cd6682bcfa1fc819652 Mon Sep 17 00:00:00 2001
From: rodik <i6@bk.ru>
Date: Sun, 14 Feb 2016 23:25:19 +0200
Subject: [PATCH 10/10] removing unused getRoutes from createStore function

---
 src/client.js                            | 2 +-
 src/components/__tests__/InfoBar-test.js | 2 +-
 src/redux/create.js                      | 2 +-
 src/server.js                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client.js b/src/client.js
index 9a750a105..73f621426 100644
--- a/src/client.js
+++ b/src/client.js
@@ -17,7 +17,7 @@ import getRoutes from './routes';
 const client = new ApiClient();
 const history = useScroll(() => browserHistory)();
 const dest = document.getElementById('content');
-const store = createStore(getRoutes, history, client, window.__data);
+const store = createStore(history, client, window.__data);
 
 function initSocket() {
   const socket = io('', {path: '/ws'});
diff --git a/src/components/__tests__/InfoBar-test.js b/src/components/__tests__/InfoBar-test.js
index 7ebcd8f39..22d458046 100644
--- a/src/components/__tests__/InfoBar-test.js
+++ b/src/components/__tests__/InfoBar-test.js
@@ -21,7 +21,7 @@ describe('InfoBar', () => {
       }
     }
   };
-  const store = createStore(null, browserHistory, client, mockStore);
+  const store = createStore(browserHistory, client, mockStore);
   const renderer = renderIntoDocument(
     <Provider store={store} key="provider">
       <InfoBar/>
diff --git a/src/redux/create.js b/src/redux/create.js
index 0869a5198..0f52727c7 100644
--- a/src/redux/create.js
+++ b/src/redux/create.js
@@ -2,7 +2,7 @@ import { createStore as _createStore, applyMiddleware, compose } from 'redux';
 import createMiddleware from './middleware/clientMiddleware';
 import { syncHistory } from 'react-router-redux';
 
-export default function createStore(getRoutes, history, client, data) {
+export default function createStore(history, client, data) {
   // Sync dispatched route actions to the history
   const reduxRouterMiddleware = syncHistory(history);
 
diff --git a/src/server.js b/src/server.js
index cc2be2b1d..a806783f7 100644
--- a/src/server.js
+++ b/src/server.js
@@ -68,7 +68,7 @@ app.use((req, res) => {
   const client = new ApiClient(req);
   const history = createHistory(req.originalUrl);
 
-  const store = createStore(getRoutes, history, client);
+  const store = createStore(history, client);
 
   function hydrateOnClient() {
     res.send('<!doctype html>\n' +