Clean stuff up

Author: adamwathan

src/jit/lib/generateRules.js

@@ -3,16 +3,7 @@ import selectorParser from 'postcss-selector-parser'
 import parseObjectStyles from '../../util/parseObjectStyles'
 import isPlainObject from '../../util/isPlainObject'
 import prefixSelector from '../../util/prefixSelector'
-import nameClass from '../../util/nameClass'
-import {
-  updateAllClasses,
-  asValue,
-  asList,
-  asColor,
-  asAngle,
-  asLength,
-  asLookupValue,
-} from '../../util/pluginUtils'
+import { updateAllClasses } from '../../util/pluginUtils'
 
 let classNameParser = selectorParser((selectors) => {
   return selectors.first.filter(({ type }) => type === 'class').pop().value
@@ -224,58 +215,15 @@ function* resolveMatches(candidate, context) {
   // }
 
   for (let matchedPlugins of resolveMatchedPlugins(classCandidate, context)) {
-    let pluginHelpers = {
-      candidate: classCandidate,
-      theme: context.tailwindConfig.theme,
-    }
-
-    let asMap = {
-      any: asValue,
-      list: asList,
-      color: asColor,
-      angle: asAngle,
-      length: asLength,
-      lookup: asLookupValue,
-    }
-
     let matches = []
     let [plugins, modifier] = matchedPlugins
 
     for (let [sort, plugin] of plugins) {
       if (typeof plugin === 'function') {
-        if (sort.version === 2) {
-          let { type = 'any' } = sort.options
-          let value = asMap[type](modifier, sort.options.values)
-
-          if (value === undefined) {
-            continue
-          }
-
-          let includedRules = []
-          let ruleSets = []
-            .concat(
-              plugin(value, {
-                includeRules(rules) {
-                  includedRules.push(...rules)
-                },
-              })
-            )
-            .map((declaration) => ({
-              [nameClass(sort.identifier, modifier)]: declaration,
-            }))
-
-          for (let ruleSet of [...includedRules, ...ruleSets]) {
-            let [rules, options] = parseRules(ruleSet, context.postCssNodeCache)
-            for (let rule of rules) {
-              matches.push([{ ...sort, options: { ...sort.options, ...options } }, rule])
-            }
-          }
-        } else {
-          for (let ruleSet of [].concat(plugin(modifier, pluginHelpers))) {
-            let [rules, options] = parseRules(ruleSet, context.postCssNodeCache)
-            for (let rule of rules) {
-              matches.push([{ ...sort, options: { ...sort.options, ...options } }, rule])
-            }
+        for (let ruleSet of [].concat(plugin(modifier))) {
+          let [rules, options] = parseRules(ruleSet, context.postCssNodeCache)
+          for (let rule of rules) {
+            matches.push([{ ...sort, options: { ...sort.options, ...options } }, rule])
           }
         }
       }

src/jit/lib/setupContext.js

@@ -22,6 +22,9 @@ import corePlugins from '../corePlugins'
 import isPlainObject from '../../util/isPlainObject'
 import escapeClassName from '../../util/escapeClassName'
 
+import nameClass from '../../util/nameClass'
+import { coerceValue } from '../../util/pluginUtils'
+
 import * as sharedState from './sharedState'
 
 let contextMap = sharedState.contextMap
@@ -529,10 +532,31 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
         let prefixedIdentifier = prefixIdentifier(identifier, options)
         let rule = utilities[identifier]
 
-        let withOffsets = [
-          { sort: offset, layer: 'utilities', options, identifier, version: 2 },
-          rule,
-        ]
+        function wrapped(modifier) {
+          let { type = 'any' } = options
+          let value = coerceValue(type, modifier, options.values)
+
+          if (value === undefined) {
+            return []
+          }
+
+          let includedRules = []
+          let ruleSets = []
+            .concat(
+              rule(value, {
+                includeRules(rules) {
+                  includedRules.push(...rules)
+                },
+              })
+            )
+            .map((declaration) => ({
+              [nameClass(identifier, modifier)]: declaration,
+            }))
+
+          return [...includedRules, ...ruleSets]
+        }
+
+        let withOffsets = [{ sort: offset, layer: 'utilities', options }, wrapped]
 
         if (!context.candidateRuleMap.has(prefixedIdentifier)) {
           context.candidateRuleMap.set(prefixedIdentifier, [])
@@ -541,16 +565,6 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
         context.candidateRuleMap.get(prefixedIdentifier).push(withOffsets)
       }
     },
-    // ---
-    jit: {
-      e: escapeClassName,
-      config: tailwindConfig,
-      theme: tailwindConfig.theme,
-      addVariant(variantName, applyVariant, options = {}) {
-        insertInto(variantList, variantName, options)
-        variantMap.set(variantName, applyVariant)
-      },
-    },
   }
 }
 

src/util/pluginUtils.js

@@ -194,3 +194,16 @@ export function asLength(modifier, lookup = {}) {
 export function asLookupValue(modifier, lookup = {}) {
   return lookup[modifier]
 }
+
+let typeMap = {
+  any: asValue,
+  list: asList,
+  color: asColor,
+  angle: asAngle,
+  length: asLength,
+  lookup: asLookupValue,
+}
+
+export function coerceValue(type, modifier, values) {
+  return typeMap[type](modifier, values)
+}

tests/plugins/fontSize.test.js

@@ -1,5 +1,4 @@
 import postcss from 'postcss'
-import fs from 'fs'
 import path from 'path'
 import tailwind from '../../src/index.js'