Merge pull request tailwindlabs#520 from tailwindcss/process-tailwind…

…-features-together Process tailwind features together
rhurling · Jul 16, 2018 · 37493ed · 37493ed
2 parents 2574417 + 7201c4f
commit 37493ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/index.js b/src/index.js
@@ -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,

diff --git a/src/processTailwindFeatures.js b/src/processTailwindFeatures.js
@@ -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') })
+  }
 }