fix multiple data hooks handling

Author: yyx990803

src/pipeline.js

@@ -260,21 +260,14 @@ export function reuse (view, transition) {
 
 function loadData (component, transition, hook, cb, cleanup) {
   component.$loadingRouteData = true
-  transition.callHooks(hook, component, cb, {
+  transition.callHooks(hook, component, () => {
+    component.$loadingRouteData = false
+    component.$emit('route-data-loaded', component)
+    cb && cb()
+  }, {
     cleanup,
     postActivate: true,
     processData: (data) => {
-      // merge data from multiple data hooks
-      if (Array.isArray(data) && data._needMerge) {
-        data = data.reduce((res, obj) => {
-          if (isPlainObject(obj)) {
-            Object.keys(obj).forEach(key => {
-              res[key] = obj[key]
-            })
-          }
-          return res
-        }, Object.create(null))
-      }
       // handle promise sugar syntax
       const promises = []
       if (isPlainObject(data)) {
@@ -289,14 +282,8 @@ function loadData (component, transition, hook, cb, cleanup) {
           }
         })
       }
-      const onDataLoaded = () => {
-        component.$loadingRouteData = false
-        component.$emit('route-data-loaded', component)
-      }
-      if (!promises.length) {
-        onDataLoaded()
-      } else {
-        return promises[0].constructor.all(promises).then(onDataLoaded)
+      if (promises.length) {
+        return promises[0].constructor.all(promises)
       }
     }
   })

src/transition.js

@@ -213,11 +213,7 @@ export default class RouteTransition {
 
     // handle errors
     const onError = err => {
-      if (postActivate) {
-        if (!nextCalled) next()
-      } else {
-        abort()
-      }
+      postActivate ? next() : abort()
       if (err && !transition.router._suppress) {
         warn('Uncaught error during transition: ')
         throw err instanceof Error ? err : new Error(err)
@@ -324,18 +320,11 @@ export default class RouteTransition {
 
   callHooks (hooks, context, cb, options) {
     if (Array.isArray(hooks)) {
-      const res = []
-      res._needMerge = true
       this.runQueue(hooks, (hook, _, next) => {
         if (!this.aborted) {
-          this.callHook(hook, context, r => {
-            if (r) res.push(r)
-            next()
-          }, options)
+          this.callHook(hook, context, next, options)
         }
-      }, () => {
-        cb(res)
-      })
+      }, cb)
     } else {
       this.callHook(hooks, context, cb, options)
     }

test/unit/specs/pipeline/data.js

@@ -141,8 +141,8 @@ describe('data', function () {
       assertCalls(calls, ['data.data'])
       expect(router.app.$el.textContent).toBe('loading...')
       setTimeout(function () {
-        // should not abort, but nor should finish loading data
-        expect(router.app.$el.textContent).toBe('loading...')
+        // should not abort
+        expect(router.app.$el.textContent).toBe('default')
         done()
       }, wait * 2)
     })
@@ -190,8 +190,8 @@ describe('data', function () {
       assertCalls(calls, ['data.data'])
       expect(router.app.$el.textContent).toBe('loading...')
       setTimeout(function () {
-        // should not abort, but nor should finish loading data
-        expect(router.app.$el.textContent).toBe('loading...')
+        // should not abort
+        expect(router.app.$el.textContent).toBe('default')
         done()
       }, wait * 2)
     })
@@ -238,7 +238,7 @@ describe('data', function () {
       setTimeout(function () {
         expect(router.app.$el.textContent).toBe('hello hello2 hello3')
         done()
-      }, wait * 3)
+      }, wait * 4)
     })
   })
 })