Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
RobinMalfait committed Oct 28, 2020
1 parent 584316f commit fe9e49d
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/util/resolveConfig.js
Expand Up @@ -7,6 +7,8 @@ import map from 'lodash/map'
import get from 'lodash/get'
import uniq from 'lodash/uniq'
import toPath from 'lodash/toPath'
import head from 'lodash/head'
import isPlainObject from 'lodash/isPlainObject'
import negateValue from './negateValue'
import { corePluginList } from '../corePluginList'
import configurePlugins from './configurePlugins'
Expand Down Expand Up @@ -67,7 +69,13 @@ function mergeThemes(themes) {
}
}

function mergeExtensionCustomizer(_merged, value) {
function mergeExtensionCustomizer(merged, value) {
// When we have an array of objects, we do want to merge it
if (Array.isArray(merged) && isPlainObject(head(merged))) {
return merged.concat(value)
}

// Override arrays (for example for font-families, box-shadows, ...)
if (Array.isArray(value)) return value
}

Expand Down

0 comments on commit fe9e49d

Please sign in to comment.