tailwindcss 3.0.12 → 3.0.13

package/peers/index.js

@@ -1,5 +1,7 @@
+"use strict";
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
 // node_modules/picocolors/picocolors.js
@@ -1390,7 +1392,7 @@ var require_util = __commonJS({
     }
     exports2.relative = relative;
     var supportsNullProto = function() {
-      var obj = Object.create(null);
+      var obj = /* @__PURE__ */ Object.create(null);
       return !("__proto__" in obj);
     }();
     function identity(s) {
@@ -1595,7 +1597,7 @@ var require_array_set = __commonJS({
     var hasNativeMap = typeof Map !== "undefined";
     function ArraySet() {
       this._array = [];
-      this._set = hasNativeMap ? /* @__PURE__ */ new Map() : Object.create(null);
+      this._set = hasNativeMap ? /* @__PURE__ */ new Map() : /* @__PURE__ */ Object.create(null);
     }
     ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
       var set = new ArraySet();
@@ -1795,7 +1797,7 @@ var require_source_map_generator = __commonJS({
       }
       if (aSourceContent != null) {
         if (!this._sourcesContents) {
-          this._sourcesContents = Object.create(null);
+          this._sourcesContents = /* @__PURE__ */ Object.create(null);
         }
         this._sourcesContents[util.toSetString(source)] = aSourceContent;
       } else if (this._sourcesContents) {
@@ -2054,7 +2056,7 @@ var require_quick_sort = __commonJS({
       let templateFn = new Function(`return ${template}`)();
       return templateFn(comparator);
     }
-    var sortCache = new WeakMap();
+    var sortCache = /* @__PURE__ */ new WeakMap();
     exports2.quickSort = function(ary, comparator, start = 0) {
       let doQuickSort = sortCache.get(comparator);
       if (doQuickSort === void 0) {
@@ -20401,7 +20403,7 @@ ${indent}${s}` : "\n";
         return String(jsKey);
       if (key instanceof Node && ctx && ctx.doc)
         return key.toString({
-          anchors: Object.create(null),
+          anchors: /* @__PURE__ */ Object.create(null),
           doc: ctx.doc,
           indent: "",
           indentStep: ctx.indentStep,
@@ -23073,7 +23075,7 @@ ${ctx.indent}${str}`;
         return node instanceof resolveSeq.Scalar || node instanceof resolveSeq.YAMLSeq || node instanceof resolveSeq.YAMLMap;
       }
       constructor(prefix) {
-        PlainValue._defineProperty(this, "map", Object.create(null));
+        PlainValue._defineProperty(this, "map", /* @__PURE__ */ Object.create(null));
         this.prefix = prefix;
       }
       createAlias(node, name) {
@@ -23521,7 +23523,7 @@ ${cbNode.commentBefore}` : cb;
           lines.unshift(this.commentBefore.replace(/^/gm, "#"));
         }
         const ctx = {
-          anchors: Object.create(null),
+          anchors: /* @__PURE__ */ Object.create(null),
           doc: this,
           indent: "",
           indentStep: " ".repeat(indentSize),
@@ -24519,7 +24521,7 @@ var require_main = __commonJS({
     function _interopNamespace(e) {
       if (e && e.__esModule)
         return e;
-      var n = Object.create(null);
+      var n = /* @__PURE__ */ Object.create(null);
       if (e) {
         Object.keys(e).forEach(function(k) {
           if (k !== "default") {
@@ -26609,8 +26611,8 @@ var require_dist7 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -29926,7 +29928,7 @@ var require_general = __commonJS({
               return false;
             };
           }
-          var isFalseCache_1 = new WeakSet();
+          var isFalseCache_1 = /* @__PURE__ */ new WeakSet();
           return function cachedDescendant(elem) {
             var current = elem;
             while (current = adapter.getParent(current)) {
@@ -33982,8 +33984,8 @@ var require_error2 = __commonJS({
 var require_names2 = __commonJS({
   "node_modules/css-tree/lib/utils/names.js"(exports2, module2) {
     var hasOwnProperty2 = Object.prototype.hasOwnProperty;
-    var keywords = Object.create(null);
-    var properties = Object.create(null);
+    var keywords = /* @__PURE__ */ Object.create(null);
+    var properties = /* @__PURE__ */ Object.create(null);
     var HYPHENMINUS = 45;
     function isCustomProperty(str, offset) {
       offset = offset || 0;
@@ -35729,7 +35731,7 @@ var require_match_graph = __commonJS({
             var term = terms[i];
             if (isEnumCapatible(term)) {
               if (map === null && i > 0 && isEnumCapatible(terms[i - 1])) {
-                map = Object.create(null);
+                map = /* @__PURE__ */ Object.create(null);
                 result = createCondition({
                   type: "Enum",
                   map
@@ -37609,7 +37611,7 @@ var require_util2 = __commonJS({
     }
     exports2.relative = relative;
     var supportsNullProto = function() {
-      var obj = Object.create(null);
+      var obj = /* @__PURE__ */ Object.create(null);
       return !("__proto__" in obj);
     }();
     function identity(s) {
@@ -37773,7 +37775,7 @@ var require_array_set2 = __commonJS({
     var hasNativeMap = typeof Map !== "undefined";
     function ArraySet() {
       this._array = [];
-      this._set = hasNativeMap ? /* @__PURE__ */ new Map() : Object.create(null);
+      this._set = hasNativeMap ? /* @__PURE__ */ new Map() : /* @__PURE__ */ Object.create(null);
     }
     ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
       var set = new ArraySet();
@@ -37973,7 +37975,7 @@ var require_source_map_generator2 = __commonJS({
       }
       if (aSourceContent != null) {
         if (!this._sourcesContents) {
-          this._sourcesContents = Object.create(null);
+          this._sourcesContents = /* @__PURE__ */ Object.create(null);
         }
         this._sourcesContents[util.toSetString(source)] = aSourceContent;
       } else if (this._sourcesContents) {
@@ -50005,12 +50007,12 @@ var require_data = __commonJS({
     var patch = require_patch();
     var extendSyntax = /^\s*\|\s*/;
     function preprocessAtrules(dict) {
-      const result = Object.create(null);
+      const result = /* @__PURE__ */ Object.create(null);
       for (const atruleName in dict) {
         const atrule = dict[atruleName];
         let descriptors = null;
         if (atrule.descriptors) {
-          descriptors = Object.create(null);
+          descriptors = /* @__PURE__ */ Object.create(null);
           for (const descriptor in atrule.descriptors) {
             descriptors[descriptor] = atrule.descriptors[descriptor].syntax;
           }
@@ -53924,7 +53926,7 @@ var require_usage = __commonJS({
   "node_modules/csso/lib/usage.js"(exports2, module2) {
     var hasOwnProperty2 = Object.prototype.hasOwnProperty;
     function buildMap(list, caseInsensitive) {
-      var map = Object.create(null);
+      var map = /* @__PURE__ */ Object.create(null);
       if (!Array.isArray(list)) {
         return null;
       }
@@ -53956,7 +53958,7 @@ var require_usage = __commonJS({
     function buildIndex(data) {
       var scopes = false;
       if (data.scopes && Array.isArray(data.scopes)) {
-        scopes = Object.create(null);
+        scopes = /* @__PURE__ */ Object.create(null);
         for (var i = 0; i < data.scopes.length; i++) {
           var list = data.scopes[i];
           if (!list || !Array.isArray(list)) {
@@ -55089,7 +55091,7 @@ var require_createDeclarationIndexer = __commonJS({
     var generate = require_lib10().generate;
     function Index() {
       this.seed = 0;
-      this.map = Object.create(null);
+      this.map = /* @__PURE__ */ Object.create(null);
     }
     Index.prototype.resolve = function(str) {
       var index = this.map[str];
@@ -55134,7 +55136,7 @@ var require_processSelector = __commonJS({
       "before": true
     };
     module2.exports = function freeze(node, usageData) {
-      var pseudos = Object.create(null);
+      var pseudos = /* @__PURE__ */ Object.create(null);
       var hasPseudo = false;
       node.prelude.children.each(function(simpleSelector) {
         var tagName = "*";
@@ -55247,7 +55249,7 @@ var require_mergeAtrule = __commonJS({
       var name = resolveKeyword(node.name).basename;
       var id = node.name.toLowerCase() + "/" + (node.prelude ? node.prelude.id : null);
       if (!hasOwnProperty2.call(map, name)) {
-        map[name] = Object.create(null);
+        map[name] = /* @__PURE__ */ Object.create(null);
       }
       if (single) {
         delete map[name][id];
@@ -55258,7 +55260,7 @@ var require_mergeAtrule = __commonJS({
       map[name][id].append(list.remove(item));
     }
     function relocateAtrules(ast, options) {
-      var collected = Object.create(null);
+      var collected = /* @__PURE__ */ Object.create(null);
       var topInjectPoint = null;
       ast.children.each(function(node, item, list) {
         if (node.type === "Atrule") {
@@ -55345,8 +55347,8 @@ var require_utils5 = __commonJS({
         ne2: [],
         ne2overrided: []
       };
-      var fingerprints = Object.create(null);
-      var declarations2hash = Object.create(null);
+      var fingerprints = /* @__PURE__ */ Object.create(null);
+      var declarations2hash = /* @__PURE__ */ Object.create(null);
       for (var cursor = declarations2.head; cursor; cursor = cursor.next) {
         declarations2hash[cursor.data.id] = true;
       }
@@ -56081,7 +56083,7 @@ var require_restructBlock = __commonJS({
     }
     module2.exports = function restructBlock(ast) {
       var stylesheetMap = {};
-      var fingerprints = Object.create(null);
+      var fingerprints = /* @__PURE__ */ Object.create(null);
       walk(ast, {
         visit: "Rule",
         reverse: true,
@@ -56194,7 +56196,7 @@ var require_restructRuleset = __commonJS({
       var avoidRulesMerge = this.block !== null ? this.block.avoidRulesMerge : false;
       var selectors = node.prelude.children;
       var block = node.block;
-      var disallowDownMarkers = Object.create(null);
+      var disallowDownMarkers = /* @__PURE__ */ Object.create(null);
       var allowMergeUp = true;
       var allowMergeDown = true;
       list.prevUntil(item.prev, function(prev, prevItem) {
@@ -63659,8 +63661,8 @@ var require_dist9 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -63982,8 +63984,8 @@ var require_dist10 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -64483,7 +64485,7 @@ var require_container2 = __commonJS({
     function _getRequireWildcardCache() {
       if (typeof WeakMap !== "function")
         return null;
-      var cache = new WeakMap();
+      var cache = /* @__PURE__ */ new WeakMap();
       _getRequireWildcardCache = function _getRequireWildcardCache2() {
         return cache;
       };
@@ -66050,7 +66052,7 @@ var require_tokenize2 = __commonJS({
     function _getRequireWildcardCache() {
       if (typeof WeakMap !== "function")
         return null;
-      var cache = new WeakMap();
+      var cache = /* @__PURE__ */ new WeakMap();
       _getRequireWildcardCache = function _getRequireWildcardCache2() {
         return cache;
       };
@@ -66317,7 +66319,7 @@ var require_parser4 = __commonJS({
     function _getRequireWildcardCache() {
       if (typeof WeakMap !== "function")
         return null;
-      var cache = new WeakMap();
+      var cache = /* @__PURE__ */ new WeakMap();
       _getRequireWildcardCache = function _getRequireWildcardCache2() {
         return cache;
       };
@@ -67606,7 +67608,7 @@ var require_dist11 = __commonJS({
     function _getRequireWildcardCache() {
       if (typeof WeakMap !== "function")
         return null;
-      var cache = new WeakMap();
+      var cache = /* @__PURE__ */ new WeakMap();
       _getRequireWildcardCache = function _getRequireWildcardCache2() {
         return cache;
       };
@@ -70104,8 +70106,8 @@ var require_dist13 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -71459,8 +71461,8 @@ var require_dist16 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -75304,8 +75306,8 @@ var require_dist29 = __commonJS({
     function _getRequireWildcardCache(nodeInterop) {
       if (typeof WeakMap !== "function")
         return null;
-      var cacheBabelInterop = new WeakMap();
-      var cacheNodeInterop = new WeakMap();
+      var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+      var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
       return (_getRequireWildcardCache = function(nodeInterop2) {
         return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
       })(nodeInterop);
@@ -76055,7 +76057,6 @@ var require_dist35 = __commonJS({
 });
 
 // lib/cli-peer-dependencies.js
-"use strict";
 Object.defineProperty(exports, "__esModule", {
   value: true
 });

package/src/lib/partitionApplyAtRules.js

@@ -0,0 +1,52 @@
+function partitionRules(root) {
+  if (!root.walkAtRules) return
+
+  let applyParents = new Set()
+
+  root.walkAtRules('apply', (rule) => {
+    applyParents.add(rule.parent)
+  })
+
+  if (applyParents.size === 0) {
+    return
+  }
+
+  for (let rule of applyParents) {
+    let nodeGroups = []
+    let lastGroup = []
+
+    for (let node of rule.nodes) {
+      if (node.type === 'atrule' && node.name === 'apply') {
+        if (lastGroup.length > 0) {
+          nodeGroups.push(lastGroup)
+          lastGroup = []
+        }
+        nodeGroups.push([node])
+      } else {
+        lastGroup.push(node)
+      }
+    }
+
+    if (lastGroup.length > 0) {
+      nodeGroups.push(lastGroup)
+    }
+
+    if (nodeGroups.length === 1) {
+      continue
+    }
+
+    for (let group of [...nodeGroups].reverse()) {
+      let clone = rule.clone({ nodes: [] })
+      clone.append(group)
+      rule.after(clone)
+    }
+
+    rule.remove()
+  }
+}
+
+export default function expandApplyAtRules() {
+  return (root) => {
+    partitionRules(root)
+  }
+}

package/src/lib/setupContextUtils.js

@@ -20,58 +20,6 @@ import log from '../util/log'
 import negateValue from '../util/negateValue'
 import isValidArbitraryValue from '../util/isValidArbitraryValue'
 
-function partitionRules(root) {
-  if (!root.walkAtRules) return [root]
-
-  let applyParents = new Set()
-  let rules = []
-
-  root.walkAtRules('apply', (rule) => {
-    applyParents.add(rule.parent)
-  })
-
-  if (applyParents.size === 0) {
-    rules.push(root)
-  }
-
-  for (let rule of applyParents) {
-    let nodeGroups = []
-    let lastGroup = []
-
-    for (let node of rule.nodes) {
-      if (node.type === 'atrule' && node.name === 'apply') {
-        if (lastGroup.length > 0) {
-          nodeGroups.push(lastGroup)
-          lastGroup = []
-        }
-        nodeGroups.push([node])
-      } else {
-        lastGroup.push(node)
-      }
-    }
-
-    if (lastGroup.length > 0) {
-      nodeGroups.push(lastGroup)
-    }
-
-    if (nodeGroups.length === 1) {
-      rules.push(rule)
-      continue
-    }
-
-    for (let group of [...nodeGroups].reverse()) {
-      let clone = rule.clone({ nodes: [] })
-      clone.append(group)
-      rules.unshift(clone)
-      rule.after(clone)
-    }
-
-    rule.remove()
-  }
-
-  return rules
-}
-
 function parseVariantFormatString(input) {
   if (input.includes('{')) {
     if (!isBalanced(input)) throw new Error(`Your { and } are unbalanced.`)
@@ -284,9 +232,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
           context.candidateRuleMap.set(identifier, [])
         }
 
-        context.candidateRuleMap
-          .get(identifier)
-          .push(...partitionRules(rule).map((rule) => [{ sort: offset, layer: 'user' }, rule]))
+        context.candidateRuleMap.get(identifier).push([{ sort: offset, layer: 'user' }, rule])
       }
     },
     addBase(base) {
@@ -300,7 +246,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
 
         context.candidateRuleMap
           .get(prefixedIdentifier)
-          .push(...partitionRules(rule).map((rule) => [{ sort: offset, layer: 'base' }, rule]))
+          .push([{ sort: offset, layer: 'base' }, rule])
       }
     },
     /**
@@ -321,12 +267,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
 
         context.candidateRuleMap
           .get(prefixedIdentifier)
-          .push(
-            ...partitionRules(rule).map((rule) => [
-              { sort: offsets.base++, layer: 'defaults' },
-              rule,
-            ])
-          )
+          .push([{ sort: offsets.base++, layer: 'defaults' }, rule])
       }
     },
     addComponents(components, options) {
@@ -348,12 +289,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
 
         context.candidateRuleMap
           .get(prefixedIdentifier)
-          .push(
-            ...partitionRules(rule).map((rule) => [
-              { sort: offsets.components++, layer: 'components', options },
-              rule,
-            ])
-          )
+          .push([{ sort: offsets.components++, layer: 'components', options }, rule])
       }
     },
     addUtilities(utilities, options) {
@@ -375,12 +311,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
 
         context.candidateRuleMap
           .get(prefixedIdentifier)
-          .push(
-            ...partitionRules(rule).map((rule) => [
-              { sort: offsets.utilities++, layer: 'utilities', options },
-              rule,
-            ])
-          )
+          .push([{ sort: offsets.utilities++, layer: 'utilities', options }, rule])
       }
     },
     matchUtilities: function (utilities, options) {

package/src/processTailwindFeatures.js

@@ -6,6 +6,7 @@ import substituteScreenAtRules from './lib/substituteScreenAtRules'
 import resolveDefaultsAtRules from './lib/resolveDefaultsAtRules'
 import collapseAdjacentRules from './lib/collapseAdjacentRules'
 import collapseDuplicateDeclarations from './lib/collapseDuplicateDeclarations'
+import partitionApplyAtRules from './lib/partitionApplyAtRules'
 import detectNesting from './lib/detectNesting'
 import { createContext } from './lib/setupContextUtils'
 import { issueFlagNotices } from './featureFlags'
@@ -15,6 +16,7 @@ export default function processTailwindFeatures(setupContext) {
     let { tailwindDirectives, applyDirectives } = normalizeTailwindDirectives(root)
 
     detectNesting()(root, result)
+    partitionApplyAtRules()(root, result)
 
     let context = setupContext({
       tailwindDirectives,