feat: merge ssrPrefetch

Guillaume Chau · Guillaume Chau · commit edc325733cd9 · 2018-11-03T11:13:50.000+09:00
diff --git a/src/server/render.js b/src/server/render.js
@@ -50,13 +50,18 @@ const normalizeRender = vm => {
 }
 
 function waitForSsrPrefetch (vm, resolve, reject) {
-  if (isDef(vm.$options.ssrPrefetch)) {
+  const handlers = vm.$options.ssrPrefetch
+  if (isDef(handlers)) {
     try {
-      const result = vm.$options.ssrPrefetch.call(vm, vm)
-      if (result && typeof result.then === 'function') {
-        result.then(resolve).catch(reject)
-        return
+      const promises = []
+      for (let i = 0, j = handlers.length; i < j; i++) {
+        const result = handlers[i].call(vm, vm)
+        if (result && typeof result.then === 'function') {
+          promises.push(result)
+        }
       }
+      Promise.all(promises).then(resolve).catch(reject)
+      return
     } catch (e) {
       reject(e)
     }
diff --git a/src/shared/constants.js b/src/shared/constants.js
@@ -17,5 +17,6 @@ export const LIFECYCLE_HOOKS = [
   'destroyed',
   'activated',
   'deactivated',
-  'errorCaptured'
+  'errorCaptured',
+  'ssrPrefetch'
 ]

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ export const LIFECYCLE_HOOKS = [`
`17`	`17`	`'destroyed',`
`18`	`18`	`'activated',`
`19`	`19`	`'deactivated',`
`20`		`- 'errorCaptured'`
	`20`	`+ 'errorCaptured',`
	`21`	`+ 'ssrPrefetch'`
`21`	`22`	`]`