adjust constructor option resolution timing

yyx990803 · yyx990803 · commit ddac9761b625 · 2016-11-09T18:09:33.000-05:00
diff --git a/src/core/vdom/create-component.js b/src/core/vdom/create-component.js
@@ -34,10 +34,6 @@ export function createComponent (
     return
   }
 
-  // resolve constructor options in case global mixins are applied after
-  // component constructor creation
-  resolveConstructorOptions(Ctor)
-
   // async component
   if (!Ctor.cid) {
     if (Ctor.resolved) {
@@ -56,6 +52,10 @@ export function createComponent (
     }
   }
 
+  // resolve constructor options in case global mixins are applied after
+  // component constructor creation
+  resolveConstructorOptions(Ctor)
+
   data = data || {}
 
   // extract props

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,6 @@ export function createComponent (`
`34`	`34`	`return`
`35`	`35`	`}`
`36`	`36`
`37`		`- // resolve constructor options in case global mixins are applied after`
`38`		`- // component constructor creation`
`39`		`- resolveConstructorOptions(Ctor)`
`40`		`-`
`41`	`37`	`// async component`
`42`	`38`	`if (!Ctor.cid) {`
`43`	`39`	`if (Ctor.resolved) {`
`@@ -56,6 +52,10 @@ export function createComponent (`
`56`	`52`	`}`
`57`	`53`	`}`
`58`	`54`
	`55`	`+ // resolve constructor options in case global mixins are applied after`
	`56`	`+ // component constructor creation`
	`57`	`+ resolveConstructorOptions(Ctor)`
	`58`	`+`
`59`	`59`	`data = data \|\| {}`
`60`	`60`
`61`	`61`	`// extract props`