Commitedc3257

Guillaume Chau

committed

feat: merge ssrPrefetch

1 parent27b4799 commitedc3257Copy full SHA for edc3257

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,18 @@ const normalizeRender = vm => {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`functionwaitForSsrPrefetch(vm,resolve,reject){`
`53`		`-if(isDef(vm.$options.ssrPrefetch)){`
	`53`	`+consthandlers=vm.$options.ssrPrefetch`
	`54`	`+if(isDef(handlers)){`
`54`	`55`	`try{`
`55`		`-constresult=vm.$options.ssrPrefetch.call(vm,vm)`
`56`		`-if(result&&typeofresult.then==='function'){`
`57`		`-result.then(resolve).catch(reject)`
`58`		`-return`
	`56`	`+constpromises=[]`
	`57`	`+for(leti=0,j=handlers.length;i<j;i++){`
	`58`	`+constresult=handlers[i].call(vm,vm)`
	`59`	`+if(result&&typeofresult.then==='function'){`
	`60`	`+promises.push(result)`
	`61`	`+}`
`59`	`62`	`}`
	`63`	`+Promise.all(promises).then(resolve).catch(reject)`
	`64`	`+return`
`60`	`65`	`}catch(e){`
`61`	`66`	`reject(e)`
`62`	`67`	`}`

Lines changed: 2 additions & 1 deletion

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`	`]`

Comments

(0)