From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Mar 2020 16:59:33 +0000 (-0400)
Subject: fix: fix option merge global mixins presence check
X-Git-Tag: v3.0.0-alpha.10~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10ad965100a88e28cb528690f2e09070fefc8872;p=thirdparty%2Fvuejs%2Fcore.git

fix: fix option merge global mixins presence check
---

diff --git a/packages/runtime-core/src/apiOptions.ts b/packages/runtime-core/src/apiOptions.ts
index a33e62fb22..8db8b20d02 100644
--- 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)