Remove special "modules" merge behavior

Modules key no longer actually exists in the config so this is pointless.
This commit is contained in:
Adam Wathan 2019-01-24 08:06:46 -05:00
parent 3d2a598c0e
commit f10f1825ef
2 changed files with 4 additions and 100 deletions

View file

@ -1,26 +1,5 @@
import _ from 'lodash'
function mergeModules(userModules, defaultModules) {
if (_.isArray(userModules)) {
return _.mapValues(defaultModules, () => userModules)
}
if (userModules === 'all') {
return _.mapValues(defaultModules, () => [
'responsive',
'group-hover',
'hover',
'focus-within',
'focus',
'active',
])
}
return _.defaults(userModules, defaultModules)
}
export default function(userConfig, defaultConfig) {
_.defaults(userConfig, defaultConfig)
userConfig.modules = mergeModules(userConfig.modules, defaultConfig.modules)
return userConfig
return _.defaults(userConfig, defaultConfig)
}