Merge pull request #520 from tailwindcss/process-tailwind-features-together
Process tailwind features together
This commit is contained in:
commit
37493edfc7
2 changed files with 17 additions and 14 deletions
|
|
@ -15,7 +15,7 @@ const plugin = postcss.plugin('tailwind', config => {
|
|||
plugins.push(registerConfigAsDependency(path.resolve(config)))
|
||||
}
|
||||
|
||||
const lazyConfig = () => {
|
||||
const getConfig = () => {
|
||||
if (_.isUndefined(config)) {
|
||||
return require('../defaultConfig')()
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ const plugin = postcss.plugin('tailwind', config => {
|
|||
|
||||
return postcss([
|
||||
...plugins,
|
||||
processTailwindFeatures(lazyConfig),
|
||||
processTailwindFeatures(getConfig),
|
||||
perfectionist({
|
||||
cascade: true,
|
||||
colorShorthand: true,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import _ from 'lodash'
|
||||
import postcss from 'postcss'
|
||||
|
||||
import substituteTailwindAtRules from './lib/substituteTailwindAtRules'
|
||||
|
|
@ -10,17 +11,19 @@ import substituteClassApplyAtRules from './lib/substituteClassApplyAtRules'
|
|||
import generateUtilities from './util/generateUtilities'
|
||||
import processPlugins from './util/processPlugins'
|
||||
|
||||
export default function(lazyConfig) {
|
||||
const config = lazyConfig()
|
||||
const processedPlugins = processPlugins(config)
|
||||
const utilities = generateUtilities(config, processedPlugins.utilities)
|
||||
export default function(getConfig) {
|
||||
return function(css) {
|
||||
const config = getConfig()
|
||||
const processedPlugins = processPlugins(config)
|
||||
const utilities = generateUtilities(config, processedPlugins.utilities)
|
||||
|
||||
return postcss([
|
||||
substituteTailwindAtRules(config, processedPlugins, utilities),
|
||||
evaluateTailwindFunctions(config),
|
||||
substituteVariantsAtRules(config, processedPlugins),
|
||||
substituteResponsiveAtRules(config),
|
||||
substituteScreenAtRules(config),
|
||||
substituteClassApplyAtRules(config, utilities),
|
||||
])
|
||||
return postcss([
|
||||
substituteTailwindAtRules(config, processedPlugins, utilities),
|
||||
evaluateTailwindFunctions(config),
|
||||
substituteVariantsAtRules(config, processedPlugins),
|
||||
substituteResponsiveAtRules(config),
|
||||
substituteScreenAtRules(config),
|
||||
substituteClassApplyAtRules(config, utilities),
|
||||
]).process(css, { from: _.get(css, 'source.input.file') })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue