wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge user config with default config

Browse source 
Not recursively so values won't get combined, but missing keys will get
their default values which makes upgrading a non-breaking change if we
add new options.
This commit is contained in:
Adam Wathan 2017-11-22 13:26:18 -05:00
parent 89300a60db
commit 9202ecf104
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/index.js
View file

@ -14,6 +14,14 @@ import substituteResponsiveAtRules from './lib/substituteResponsiveAtRules'
import substituteScreenAtRules from './lib/substituteScreenAtRules'
import substituteClassApplyAtRules from './lib/substituteClassApplyAtRules'
function mergeConfigWithDefaults(config) {
const defaultConfig = require('../defaultConfig')()
_.defaults(config, defaultConfig)
config.options = _.defaults(config.options, defaultConfig.options)
config.options.modules = _.defaults(config.options.modules, defaultConfig.options.modules)
return config
}
const plugin = postcss.plugin('tailwind', config => {
const plugins = []
@ -27,7 +35,7 @@ const plugin = postcss.plugin('tailwind', config => {
}
delete require.cache[require.resolve(path.resolve(config))]
return require(path.resolve(config))
return mergeConfigWithDefaults(require(path.resolve(config)))
}
return postcss(