Fix double update on history.pushState

src/index.js

@@ -92,6 +92,7 @@ function syncReduxAndRouter(history, store, selectRouterState = SELECT_STATE) {
   // history update. It's possible for this to happen when something
   // reloads the entire app state such as redux devtools.
   let lastRoute = undefined
+  let historyUpdate = false
 
   if(!getRouterState()) {
     throw new Error(
@@ -132,6 +133,7 @@ function syncReduxAndRouter(history, store, selectRouterState = SELECT_STATE) {
     } else if(!locationsAreEqual(getRouterState(), route)) {
       // The above check avoids dispatching an action if the store is
       // already up-to-date
+      historyUpdate = true;
       const method = location.action === 'REPLACE' ? replacePath : pushPath
       store.dispatch(method(route.path, route.state, { avoidRouterUpdate: true }))
     }
@@ -140,6 +142,11 @@ function syncReduxAndRouter(history, store, selectRouterState = SELECT_STATE) {
   const unsubscribeStore = store.subscribe(() => {
     let routing = getRouterState()
 
+    if (historyUpdate) {
+      historyUpdate = false;
+      return;
+    }
+
     // Only trigger history update if this is a new change or the
     // location has changed.
     if(lastRoute.changeId !== routing.changeId ||

test/createTests.js

@@ -515,6 +515,32 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
 
         storeUnsubscribe()
       })
+
+      it('only triggers history once when updating path via history push', () => {
+        const updates = []
+        const historyUnsubscribe = history.listen(location => {
+          updates.push(location.pathname);
+        })
+
+        history.pushState(null, '/bar')
+        history.pushState(null, '/baz')
+        expect(updates).toEqual(['/', '/bar', '/baz'])
+
+        historyUnsubscribe()
+      })
+
+      it('only triggers store once when updating path via history push', () => {
+        const updates = []
+        const storeUnsubscribe = store.subscribe(() => {
+          updates.push(store.getState().routing.path);
+        })
+
+        history.pushState(null, '/bar')
+        history.pushState(null, '/baz')
+        expect(updates).toEqual(['/bar', '/baz'])
+
+        storeUnsubscribe()
+      })
     })
 
     it('handles basename history option', () => {