Skip to content

Commit 10ad965

Browse files
committed
fix: fix option merge global mixins presence check
1 parent dbbd999 commit 10ad965

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

packages/runtime-core/src/apiOptions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,9 @@ export function resolveMergedOptions(
516516
const { __merged, mixins, extends: extendsOptions } = raw
517517
if (__merged) return __merged
518518
const globalMixins = instance.appContext.mixins
519-
if (!globalMixins && !mixins && !extendsOptions) return raw
519+
if (!globalMixins.length && !mixins && !extendsOptions) return raw
520520
const options = {}
521-
globalMixins && globalMixins.forEach(m => mergeOptions(options, m, instance))
521+
globalMixins.forEach(m => mergeOptions(options, m, instance))
522522
extendsOptions && mergeOptions(options, extendsOptions, instance)
523523
mixins && mixins.forEach(m => mergeOptions(options, m, instance))
524524
mergeOptions(options, raw, instance)

0 commit comments

Comments
 (0)