Skip to content

Process tailwind features together #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2018
Merged

Process tailwind features together #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91286ad
Process all Tailwind features as one big plugin
adamwathan Jul 16, 2018
c0adb29
Be more defensive about fetching input source file
adamwathan Jul 16, 2018
7201c4f
Rename lazyConfig to getConfig
adamwathan Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')()
}
Expand All @@ -32,7 +32,7 @@ const plugin = postcss.plugin('tailwind', config => {

return postcss([
...plugins,
processTailwindFeatures(lazyConfig),
processTailwindFeatures(getConfig),
perfectionist({
cascade: true,
colorShorthand: true,
Expand Down
27 changes: 15 additions & 12 deletions src/processTailwindFeatures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import _ from 'lodash'
import postcss from 'postcss'

import substituteTailwindAtRules from './lib/substituteTailwindAtRules'
Expand All @@ -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') })
}
}