Don't store options on actual PostCSS node

Author: adamwathan

src/lib/generateRules.js

@@ -37,11 +37,9 @@ function applyVariant(variant, matches, { variantMap }) {
     let [variantSort, applyThisVariant] = variantMap.get(variant)
     let result = []
 
-    for (let [{ sort, layer }, rule] of matches) {
-      let options = rule.__tailwind ?? {}
-
+    for (let [{ sort, layer, options }, rule] of matches) {
       if (options.respectVariants === false) {
-        result.push([{ sort, layer }, rule])
+        result.push([{ sort, layer, options }, rule])
         continue
       }
 
@@ -53,7 +51,7 @@ function applyVariant(variant, matches, { variantMap }) {
         continue
       }
 
-      let withOffset = [{ sort: variantSort | sort, layer }, container.nodes[0]]
+      let withOffset = [{ sort: variantSort | sort, layer, options }, container.nodes[0]]
       result.push(withOffset)
     }
 
@@ -115,16 +113,20 @@ function generateRules(tailwindConfig, candidates, context) {
     for (let [sort, plugin] of plugins) {
       if (typeof plugin === 'function') {
         for (let result of plugin(modifier, pluginHelpers)) {
+          let options = {}
           if (Array.isArray(result)) {
+            ;[, , options = {}] = result
             result = toPostCssNode(result, context.postCssNodeCache)
           }
-          matches.push([sort, result])
+          matches.push([{ ...sort, options }, result])
         }
       } else {
+        let options = {}
         if (Array.isArray(plugin)) {
+          ;[, , options = {}] = plugin
           plugin = toPostCssNode(plugin, context.postCssNodeCache)
         }
-        matches.push([sort, plugin])
+        matches.push([{ ...sort, options }, plugin])
       }
     }
 

src/lib/utils.js

@@ -11,7 +11,7 @@ function toPostCssNode(rule, postCssNodeCache) {
     return postCssNodeCache.get(rule)
   }
 
-  let [selector, childRule, options = {}] = rule
+  let [selector, childRule] = rule
   let node
 
   if (selector[0] === '@') {
@@ -48,10 +48,6 @@ function toPostCssNode(rule, postCssNodeCache) {
     })
   }
 
-  if (options.respectVariants === false) {
-    node.__tailwind = Object.assign({}, node.__tailwind, { respectVariants: false })
-  }
-
   postCssNodeCache.set(rule, node)
 
   return node