tailwindcss 3.0.11 → 3.0.12

package/lib/lib/expandApplyAtRules.js

@@ -75,45 +75,6 @@ function extractApplyCandidates(params) {
         false
     ];
 }
-function partitionApplyParents(root) {
-    let applyParents = new Set();
-    root.walkAtRules('apply', (rule)=>{
-        applyParents.add(rule.parent);
-    });
-    for (let rule1 of applyParents){
-        let nodeGroups = [];
-        let lastGroup = [];
-        for (let node of rule1.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 newParent = rule1.clone({
-                nodes: []
-            });
-            newParent.append(group);
-            rule1.after(newParent);
-        }
-        rule1.remove();
-    }
-}
 function processApply(root, context) {
     let applyCandidates = new Set();
     // Collect all @apply rules and candidates
@@ -311,7 +272,6 @@ function processApply(root, context) {
 }
 function expandApplyAtRules(context) {
     return (root)=>{
-        partitionApplyParents(root);
         processApply(root, context);
     };
 }

package/lib/lib/expandTailwindAtRules.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = expandTailwindAtRules;
-exports.DEFAULTS_LAYER = void 0;
 var _quickLru = _interopRequireDefault(require("quick-lru"));
 var sharedState = _interopRequireWildcard(require("./sharedState"));
 var _generateRules = require("./generateRules");
@@ -133,8 +132,6 @@ function buildStylesheet(rules, context) {
     }
     return returnValue;
 }
-const DEFAULTS_LAYER = Symbol('defaults-layer');
-exports.DEFAULTS_LAYER = DEFAULTS_LAYER;
 function expandTailwindAtRules(context) {
     return (root)=>{
         let layerNodes = {
@@ -143,7 +140,6 @@ function expandTailwindAtRules(context) {
             utilities: null,
             variants: null
         };
-        // let hasApply = false
         root.walkAtRules((rule)=>{
             // Make sure this file contains Tailwind directives. If not, we can save
             // a lot of work and bail early. Also we don't have to register our touch
@@ -154,12 +150,6 @@ function expandTailwindAtRules(context) {
                     layerNodes[rule.params] = rule;
                 }
             }
-        // We also want to check for @apply because the user can
-        // apply classes in an isolated environment like CSS
-        // modules and we still need to inject defaults
-        // if (rule.name === 'apply') {
-        //   hasApply = true
-        // }
         });
         if (Object.values(layerNodes).every((n)=>n === null
         )) {
@@ -177,6 +167,7 @@ function expandTailwindAtRules(context) {
             let extractor = getExtractor(context.tailwindConfig, extension);
             getClassCandidates(transformer(content), extractor, candidates, seen);
         }
+        env.DEBUG && console.timeEnd('Reading changed files');
         // ---
         // Generate the actual CSS
         let classCacheCount = context.classCache.size;
@@ -199,23 +190,10 @@ function expandTailwindAtRules(context) {
         // Replace any Tailwind directives with generated CSS
         if (layerNodes.base) {
             layerNodes.base.before((0, _cloneNodes).default([
-                ...baseNodes
+                ...baseNodes,
+                ...defaultNodes
             ], layerNodes.base.source));
         }
-        // @defaults rules are unconditionally added first to ensure that
-        // using any utility that relies on defaults will work even when
-        // compiled in an isolated environment like CSS modules
-        if (context.tailwindConfig[DEFAULTS_LAYER] !== false) {
-            if (layerNodes.base) {
-                layerNodes.base.after((0, _cloneNodes).default([
-                    ...defaultNodes
-                ], root.source));
-            } else {
-                root.prepend((0, _cloneNodes).default([
-                    ...defaultNodes
-                ], root.source));
-            }
-        }
         if (layerNodes.base) {
             layerNodes.base.remove();
         }

package/lib/lib/resolveDefaultsAtRules.js

@@ -109,11 +109,11 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                     selectors.add(selector);
                 }
             }
-            if (selectorGroups.size === 0) {
-                universal.remove();
-                continue;
-            }
             if ((0, _featureFlags).flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
+                if (selectorGroups.size === 0) {
+                    universal.remove();
+                    continue;
+                }
                 for (let [, selectors] of selectorGroups){
                     let universalRule = _postcss.default.rule();
                     universalRule.selectors = [

package/lib/lib/setupContextUtils.js

@@ -52,6 +52,55 @@ function _interopRequireWildcard(obj) {
         return newObj;
     }
 }
+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 rule1 of applyParents){
+        let nodeGroups = [];
+        let lastGroup = [];
+        for (let node of rule1.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(rule1);
+            continue;
+        }
+        for (let group of [
+            ...nodeGroups
+        ].reverse()){
+            let clone = rule1.clone({
+                nodes: []
+            });
+            clone.append(group);
+            rules.unshift(clone);
+            rule1.after(clone);
+        }
+        rule1.remove();
+    }
+    return rules;
+}
 function parseVariantFormatString(input) {
     if (input.includes('{')) {
         if (!isBalanced(input)) throw new Error(`Your { and } are unbalanced.`);
@@ -112,44 +161,49 @@ function getClasses(selector) {
     });
     return parser.transformSync(selector);
 }
-function extractCandidates(node) {
+function extractCandidates(node, state = {
+    containsNonOnDemandable: false
+}, depth = 0) {
     let classes = [];
+    // Handle normal rules
     if (node.type === 'rule') {
         for (let selector of node.selectors){
             let classCandidates = getClasses(selector);
             // At least one of the selectors contains non-"on-demandable" candidates.
-            if (classCandidates.length === 0) return [];
-            classes = [
-                ...classes,
-                ...classCandidates
-            ];
+            if (classCandidates.length === 0) {
+                state.containsNonOnDemandable = true;
+            }
+            for (let classCandidate of classCandidates){
+                classes.push(classCandidate);
+            }
         }
-        return classes;
-    }
-    if (node.type === 'atrule') {
+    } else if (node.type === 'atrule') {
         node.walkRules((rule)=>{
-            classes = [
-                ...classes,
-                ...rule.selectors.flatMap((selector)=>getClasses(selector)
-                )
-            ];
+            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector, state, depth + 1)
+            )){
+                classes.push(classCandidate);
+            }
         });
     }
+    if (depth === 0) {
+        return [
+            state.containsNonOnDemandable || classes.length === 0,
+            classes
+        ];
+    }
     return classes;
 }
 function withIdentifiers(styles) {
     return parseStyles(styles).flatMap((node)=>{
         let nodeMap = new Map();
-        let candidates = extractCandidates(node);
-        // If this isn't "on-demandable", assign it a universal candidate.
-        if (candidates.length === 0) {
-            return [
-                [
-                    '*',
-                    node
-                ]
-            ];
+        let [containsNonOnDemandableSelectors, candidates] = extractCandidates(node);
+        // If this isn't "on-demandable", assign it a universal candidate to always include it.
+        if (containsNonOnDemandableSelectors) {
+            candidates.unshift('*');
         }
+        // However, it could be that it also contains "on-demandable" candidates.
+        // E.g.: `span, .foo {}`, in that case it should still be possible to use
+        // `@apply foo` for example.
         return candidates.map((c)=>{
             if (!nodeMap.has(node)) {
                 nodeMap.set(node, node);
@@ -240,35 +294,37 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             return [];
         },
         addUserCss (userCss) {
-            for (let [identifier, rule] of withIdentifiers(userCss)){
+            for (let [identifier, rule2] of withIdentifiers(userCss)){
                 let offset = offsets.user++;
                 if (!context.candidateRuleMap.has(identifier)) {
                     context.candidateRuleMap.set(identifier, []);
                 }
-                context.candidateRuleMap.get(identifier).push([
-                    {
-                        sort: offset,
-                        layer: 'user'
-                    },
-                    rule
-                ]);
+                context.candidateRuleMap.get(identifier).push(...partitionRules(rule2).map((rule)=>[
+                        {
+                            sort: offset,
+                            layer: 'user'
+                        },
+                        rule
+                    ]
+                ));
             }
         },
         addBase (base) {
-            for (let [identifier, rule] of withIdentifiers(base)){
+            for (let [identifier, rule3] of withIdentifiers(base)){
                 let prefixedIdentifier = prefixIdentifier(identifier, {
                 });
                 let offset = offsets.base++;
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
-                context.candidateRuleMap.get(prefixedIdentifier).push([
-                    {
-                        sort: offset,
-                        layer: 'base'
-                    },
-                    rule
-                ]);
+                context.candidateRuleMap.get(prefixedIdentifier).push(...partitionRules(rule3).map((rule)=>[
+                        {
+                            sort: offset,
+                            layer: 'base'
+                        },
+                        rule
+                    ]
+                ));
             }
         },
         /**
@@ -278,20 +334,20 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             const groups = {
                 [`@defaults ${group}`]: declarations
             };
-            for (let [identifier, rule] of withIdentifiers(groups)){
+            for (let [identifier, rule4] of withIdentifiers(groups)){
                 let prefixedIdentifier = prefixIdentifier(identifier, {
                 });
-                let offset = offsets.base++;
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
-                context.candidateRuleMap.get(prefixedIdentifier).push([
-                    {
-                        sort: offset,
-                        layer: 'defaults'
-                    },
-                    rule
-                ]);
+                context.candidateRuleMap.get(prefixedIdentifier).push(...partitionRules(rule4).map((rule)=>[
+                        {
+                            sort: offsets.base++,
+                            layer: 'defaults'
+                        },
+                        rule, 
+                    ]
+                ));
             }
         },
         addComponents (components, options) {
@@ -302,21 +358,21 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             options = Object.assign({
             }, defaultOptions, Array.isArray(options) ? {
             } : options);
-            for (let [identifier, rule] of withIdentifiers(components)){
+            for (let [identifier, rule5] of withIdentifiers(components)){
                 let prefixedIdentifier = prefixIdentifier(identifier, options);
-                let offset = offsets.components++;
                 classList.add(prefixedIdentifier);
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
-                context.candidateRuleMap.get(prefixedIdentifier).push([
-                    {
-                        sort: offset,
-                        layer: 'components',
-                        options
-                    },
-                    rule
-                ]);
+                context.candidateRuleMap.get(prefixedIdentifier).push(...partitionRules(rule5).map((rule)=>[
+                        {
+                            sort: offsets.components++,
+                            layer: 'components',
+                            options
+                        },
+                        rule, 
+                    ]
+                ));
             }
         },
         addUtilities (utilities, options) {
@@ -327,21 +383,21 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             options = Object.assign({
             }, defaultOptions, Array.isArray(options) ? {
             } : options);
-            for (let [identifier, rule] of withIdentifiers(utilities)){
+            for (let [identifier, rule6] of withIdentifiers(utilities)){
                 let prefixedIdentifier = prefixIdentifier(identifier, options);
-                let offset = offsets.utilities++;
                 classList.add(prefixedIdentifier);
                 if (!context.candidateRuleMap.has(prefixedIdentifier)) {
                     context.candidateRuleMap.set(prefixedIdentifier, []);
                 }
-                context.candidateRuleMap.get(prefixedIdentifier).push([
-                    {
-                        sort: offset,
-                        layer: 'utilities',
-                        options
-                    },
-                    rule
-                ]);
+                context.candidateRuleMap.get(prefixedIdentifier).push(...partitionRules(rule6).map((rule)=>[
+                        {
+                            sort: offsets.utilities++,
+                            layer: 'utilities',
+                            options
+                        },
+                        rule, 
+                    ]
+                ));
             }
         },
         matchUtilities: function(utilities, options) {

package/lib/processTailwindFeatures.js

@@ -22,6 +22,7 @@ function _interopRequireDefault(obj) {
 function processTailwindFeatures(setupContext) {
     return function(root, result) {
         let { tailwindDirectives , applyDirectives  } = (0, _normalizeTailwindDirectives).default(root);
+        (0, _detectNesting).default()(root, result);
         let context = setupContext({
             tailwindDirectives,
             applyDirectives,
@@ -40,7 +41,6 @@ function processTailwindFeatures(setupContext) {
             throw new Error("The '-' character cannot be used as a custom separator in JIT mode due to parsing ambiguity. Please use another character like '_' instead.");
         }
         (0, _featureFlags).issueFlagNotices(context.tailwindConfig);
-        (0, _detectNesting).default(context)(root, result);
         (0, _expandTailwindAtRules).default(context)(root, result);
         (0, _expandApplyAtRules).default(context)(root, result);
         (0, _evaluateTailwindFunctions).default(context)(root, result);

package/lib/util/pluginUtils.js

@@ -177,7 +177,7 @@ function coerceValue(types, modifier, options, tailwindConfig) {
         let result = typeMap[type](modifier, options, {
             tailwindConfig
         });
-        if (result) return [
+        if (result !== undefined) return [
             result,
             type
         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -47,7 +47,7 @@
     "@swc/core": "^1.2.118",
     "@swc/jest": "^0.2.15",
     "@swc/register": "^0.1.7",
-    "autoprefixer": "^10.4.0",
+    "autoprefixer": "^10.4.1",
     "cross-env": "^7.0.3",
     "cssnano": "^5.0.14",
     "esbuild": "^0.14.2",
@@ -82,7 +82,7 @@
     "postcss-js": "^4.0.0",
     "postcss-load-config": "^3.1.0",
     "postcss-nested": "5.0.6",
-    "postcss-selector-parser": "^6.0.7",
+    "postcss-selector-parser": "^6.0.8",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
     "resolve": "^1.20.0"