fix: fix option merge global mixins presence check

vuejs · Mar 24, 2020 · 10ad965 · 10ad965
1 parent dbbd999
commit 10ad965
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/runtime-core/src/apiOptions.ts b/packages/runtime-core/src/apiOptions.ts
@@ -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)