fix: avoid isPromise check when handler return value is Vue instance

yyx990803 · yyx990803 · commit b6b42ca8c419 · 2019-02-04T15:14:29.000-05:00
fix #9418
diff --git a/src/core/util/error.js b/src/core/util/error.js
@@ -35,7 +35,7 @@ export function invokeWithErrorHandling (
   let res
   try {
     res = args ? handler.apply(context, args) : handler.call(context)
-    if (isPromise(res)) {
+    if (res && !res._isVue && isPromise(res)) {
       res.catch(e => handleError(e, vm, info + ` (Promise/async)`))
     }
   } catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export function invokeWithErrorHandling (`
`35`	`35`	`let res`
`36`	`36`	`try {`
`37`	`37`	`res = args ? handler.apply(context, args) : handler.call(context)`
`38`		`- if (isPromise(res)) {`
	`38`	`+ if (res && !res._isVue && isPromise(res)) {`
`39`	`39`	res.catch(e => handleError(e, vm, info + ` (Promise/async)`))
`40`	`40`	`}`
`41`	`41`	`} catch (e) {`