rename history

svsool · svsool · commit 19f149476ac6 · 2016-02-23T23:10:41.000+03:00
diff --git a/src/client.js b/src/client.js
@@ -16,10 +16,10 @@ import useScroll from 'scroll-behavior/lib/useStandardScroll';
 import getRoutes from './routes';
 
 const client = new ApiClient();
-const history = useScroll(() => browserHistory)();
+const _browserHistory = useScroll(() => browserHistory)();
 const dest = document.getElementById('content');
-const store = createStore(history, client, window.__data);
-const syncedHistory = syncHistoryWithStore(history, store);
+const store = createStore(_browserHistory, client, window.__data);
+const history = syncHistoryWithStore(_browserHistory, store);
 
 function initSocket() {
   const socket = io('', {path: '/ws'});
@@ -39,7 +39,7 @@ global.socket = initSocket();
 const component = (
   <Router render={(props) =>
         <ReduxAsyncConnect {...props} helpers={{client}} filter={item => !item.deferred} />
-      } history={syncedHistory}>
+      } history={history}>
     {getRoutes(store)}
   </Router>
 );
diff --git a/src/server.js b/src/server.js
@@ -67,11 +67,9 @@ app.use((req, res) => {
     webpackIsomorphicTools.refresh();
   }
   const client = new ApiClient(req);
-  const history = createHistory(req.originalUrl);
-
-  const store = createStore(history, client);
-
-  const syncedHistory = syncHistoryWithStore(history, store);
+  const memoryHistory = createHistory(req.originalUrl);
+  const store = createStore(memoryHistory, client);
+  const history = syncHistoryWithStore(memoryHistory, store);
 
   function hydrateOnClient() {
     res.send('<!doctype html>\n' +
@@ -83,7 +81,7 @@ app.use((req, res) => {
     return;
   }
 
-  match({ syncedHistory, routes: getRoutes(store), location: req.originalUrl }, (error, redirectLocation, renderProps) => {
+  match({ history, routes: getRoutes(store), location: req.originalUrl }, (error, redirectLocation, renderProps) => {
     if (redirectLocation) {
       res.redirect(redirectLocation.pathname + redirectLocation.search);
     } else if (error) {
