File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
packages/runtime-core/src Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -516,9 +516,9 @@ export function resolveMergedOptions(
516
516
const { __merged, mixins, extends : extendsOptions } = raw
517
517
if ( __merged ) return __merged
518
518
const globalMixins = instance . appContext . mixins
519
- if ( ! globalMixins && ! mixins && ! extendsOptions ) return raw
519
+ if ( ! globalMixins . length && ! mixins && ! extendsOptions ) return raw
520
520
const options = { }
521
- globalMixins && globalMixins . forEach ( m => mergeOptions ( options , m , instance ) )
521
+ globalMixins . forEach ( m => mergeOptions ( options , m , instance ) )
522
522
extendsOptions && mergeOptions ( options , extendsOptions , instance )
523
523
mixins && mixins . forEach ( m => mergeOptions ( options , m , instance ) )
524
524
mergeOptions ( options , raw , instance )
You can’t perform that action at this time.
0 commit comments