]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
fix: fix option merge global mixins presence check
authorEvan You <yyx990803@gmail.com>
Tue, 24 Mar 2020 16:59:33 +0000 (12:59 -0400)
committerEvan You <yyx990803@gmail.com>
Tue, 24 Mar 2020 16:59:33 +0000 (12:59 -0400)
packages/runtime-core/src/apiOptions.ts

index a33e62fb22db0dd52840b94100e85b3efe5c5f98..8db8b20d027e8ea69bfc1704890b85ad5af14cae 100644 (file)
@@ -516,9 +516,9 @@ export function resolveMergedOptions(
   const { __merged, mixins, extends: extendsOptions } = raw
   if (__merged) return __merged
   const globalMixins = instance.appContext.mixins
-  if (!globalMixins && !mixins && !extendsOptions) return raw
+  if (!globalMixins.length && !mixins && !extendsOptions) return raw
   const options = {}
-  globalMixins && globalMixins.forEach(m => mergeOptions(options, m, instance))
+  globalMixins.forEach(m => mergeOptions(options, m, instance))
   extendsOptions && mergeOptions(options, extendsOptions, instance)
   mixins && mixins.forEach(m => mergeOptions(options, m, instance))
   mergeOptions(options, raw, instance)