emit errors to devtool instead

yyx990803 · yyx990803 · commit 3d08a0196a7f · 2016-07-06T11:55:02.000-04:00
diff --git a/src/index.js b/src/index.js
@@ -132,10 +132,14 @@ class Store {
       if (!isPromise(res)) {
         res = Promise.resolve(res)
       }
-      return res.catch(err => {
-        console.error(`[vuex] error in Promise returned from action "${type}":`)
-        console.error(err)
-      })
+      if (store._devtoolHook) {
+        return res.catch(err => {
+          store._devtoolHook.emit('vuex:error', err)
+          throw err
+        })
+      } else {
+        return res
+      }
     })
   }
 
diff --git a/src/plugins/devtool.js b/src/plugins/devtool.js
@@ -1,17 +1,19 @@
-const hook =
+const devtoolHook =
   typeof window !== 'undefined' &&
   window.__VUE_DEVTOOLS_GLOBAL_HOOK__
 
 export default function devtoolPlugin (store) {
-  if (!hook) return
+  if (!devtoolHook) return
 
-  hook.emit('vuex:init', store)
+  store._devtoolHook = devtoolHook
 
-  hook.on('vuex:travel-to-state', targetState => {
+  devtoolHook.emit('vuex:init', store)
+
+  devtoolHook.on('vuex:travel-to-state', targetState => {
     store.replaceState(targetState)
   })
 
   store.subscribe((mutation, state) => {
-    hook.emit('vuex:mutation', mutation, state)
+    devtoolHook.emit('vuex:mutation', mutation, state)
   })
 }
diff --git a/test/unit/test.js b/test/unit/test.js
@@ -108,22 +108,29 @@ describe('Vuex', () => {
     })
   })
 
-  it('capturing action Promise errors', done => {
-    const spy = sinon.spy(console, 'error')
+  it('detecting action Promise errors', done => {
     const store = new Vuex.Store({
       actions: {
         [TEST] () {
           return new Promise((resolve, reject) => {
-            reject(new Error())
+            reject('no')
           })
         }
       }
     })
-    store.dispatch(TEST).then(() => {
-      expect(spy).to.have.been.calledWith(`[vuex] error in Promise returned from action "${TEST}":`)
-      spy.restore()
-      done()
-    })
+    const spy = sinon.spy()
+    store._devtoolHook = {
+      emit: spy
+    }
+    const thenSpy = sinon.spy()
+    store.dispatch(TEST)
+      .then(thenSpy)
+      .catch(err => {
+        expect(thenSpy).not.to.have.been.called
+        expect(err).to.equal('no')
+        expect(spy).to.have.been.calledWith('vuex:error', 'no')
+        done()
+      })
   })
 
   it('getters', () => {
