tailwindcss 0.0.0-insiders.28e8fdf → 0.0.0-insiders.28e96ba

package/lib/cli/build/plugin.js

@@ -61,7 +61,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -96,14 +98,11 @@ async function lightningcss(result, { map = true, minify = true } = {}) {
             sourceMap: result.map === undefined ? map : !!result.map,
             inputSourceMap: result.map ? result.map.toString() : undefined,
             targets: _lightningcss.default.browserslistToTargets((0, _browserslist.default)(browsersListConfig)),
-            drafts: {
-                nesting: true
-            },
             include: _lightningcss.Features.Nesting,
             exclude: _lightningcss.Features.LogicalProperties
         });
         return Object.assign(result, {
-            css: transformed.code.toString('utf8'),
+            css: transformed.code.toString(),
             map: result.map ? Object.assign(result.map, {
                 toString () {
                     var _transformed_map;
@@ -180,7 +179,6 @@ let state = {
         };
     },
     loadConfig (configPath, content) {
-        var _content;
         if (this.watcher && configPath) {
             this.refreshConfigDependencies();
         }
@@ -197,7 +195,7 @@ let state = {
         };
         this.configBag.config = (0, _validateConfig.validateConfig)((0, _resolveConfig.default)(this.configBag.config));
         // Override content files if `--content` has been passed explicitly
-        if (((_content = content) === null || _content === void 0 ? void 0 : _content.length) > 0) {
+        if ((content === null || content === void 0 ? void 0 : content.length) > 0) {
             this.configBag.config.content.files = content;
         }
         return this.configBag.config;

package/lib/cli/build/utils.js

@@ -10,20 +10,20 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    indentRecursive: function() {
-        return indentRecursive;
+    drainStdin: function() {
+        return drainStdin;
     },
     formatNodes: function() {
         return formatNodes;
     },
-    readFileWithRetries: function() {
-        return readFileWithRetries;
-    },
-    drainStdin: function() {
-        return drainStdin;
+    indentRecursive: function() {
+        return indentRecursive;
     },
     outputFile: function() {
         return outputFile;
+    },
+    readFileWithRetries: function() {
+        return readFileWithRetries;
     }
 });
 const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));

package/lib/cli/build/watching.js

@@ -126,7 +126,7 @@ function createWatcher(args, { state, rebuild }) {
     // This is very likely a chokidar bug but it's one we need to work around
     // We treat this as a change event and rebuild the CSS
     watcher.on('raw', (evt, filePath, meta)=>{
-        if (evt !== 'rename') {
+        if (evt !== 'rename' || filePath === null) {
             return;
         }
         let watchedPath = meta.watchedPath;

package/lib/cli/index.js

@@ -151,8 +151,8 @@ let args = (()=>{
             ...flags,
             ...sharedFlags
         }).filter(([_key, value])=>{
-            var _value_type, _value;
-            return !((_value = value) === null || _value === void 0 ? void 0 : (_value_type = _value.type) === null || _value_type === void 0 ? void 0 : _value_type.manualParsing);
+            var _value_type;
+            return !(value === null || value === void 0 ? void 0 : (_value_type = value.type) === null || _value_type === void 0 ? void 0 : _value_type.manualParsing);
         }).map(([key, value])=>[
                 key,
                 typeof value === 'object' ? value.type : value

package/lib/corePluginList.js

@@ -32,6 +32,7 @@ const _default = [
     "lineClamp",
     "display",
     "aspectRatio",
+    "size",
     "height",
     "maxHeight",
     "minHeight",

package/lib/corePlugins.js

@@ -9,11 +9,11 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    variantPlugins: function() {
-        return variantPlugins;
-    },
     corePlugins: function() {
         return corePlugins;
+    },
+    variantPlugins: function() {
+        return variantPlugins;
     }
 });
 const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
@@ -61,7 +61,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -975,6 +977,15 @@ let corePlugins = {
             ]
         ]
     ]),
+    size: (0, _createUtilityPlugin.default)('size', [
+        [
+            'size',
+            [
+                'width',
+                'height'
+            ]
+        ]
+    ]),
     height: (0, _createUtilityPlugin.default)('height', [
         [
             'h',
@@ -2312,6 +2323,9 @@ let corePlugins = {
             },
             '.text-balance': {
                 'text-wrap': 'balance'
+            },
+            '.text-pretty': {
+                'text-wrap': 'pretty'
             }
         });
     },

package/lib/css/preflight.css

@@ -24,9 +24,11 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
+7. Disable tap highlights on iOS
 */
 
-html {
+html,
+:host {
   line-height: 1.5; /* 1 */
   -webkit-text-size-adjust: 100%; /* 2 */
   -moz-tab-size: 4; /* 3 */
@@ -34,6 +36,7 @@ html {
   font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
   font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
   font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
+  -webkit-tap-highlight-color: transparent; /* 7 */
 }
 
 /*

package/lib/featureFlags.js

@@ -9,6 +9,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    default: function() {
+        return _default;
+    },
     featureFlags: function() {
         return featureFlags;
     },
@@ -17,9 +20,6 @@ _export(exports, {
     },
     issueFlagNotices: function() {
         return issueFlagNotices;
-    },
-    default: function() {
-        return _default;
     }
 });
 const _picocolors = /*#__PURE__*/ _interop_require_default(require("picocolors"));
@@ -51,24 +51,23 @@ let featureFlags = {
 };
 function flagEnabled(config, flag) {
     if (featureFlags.future.includes(flag)) {
-        var _config_future, _config;
+        var _config_future;
         var _config_future_flag, _ref;
-        return config.future === 'all' || ((_ref = (_config_future_flag = (_config = config) === null || _config === void 0 ? void 0 : (_config_future = _config.future) === null || _config_future === void 0 ? void 0 : _config_future[flag]) !== null && _config_future_flag !== void 0 ? _config_future_flag : defaults[flag]) !== null && _ref !== void 0 ? _ref : false);
+        return config.future === 'all' || ((_ref = (_config_future_flag = config === null || config === void 0 ? void 0 : (_config_future = config.future) === null || _config_future === void 0 ? void 0 : _config_future[flag]) !== null && _config_future_flag !== void 0 ? _config_future_flag : defaults[flag]) !== null && _ref !== void 0 ? _ref : false);
     }
     if (featureFlags.experimental.includes(flag)) {
-        var _config_experimental, _config1;
+        var _config_experimental;
         var _config_experimental_flag, _ref1;
-        return config.experimental === 'all' || ((_ref1 = (_config_experimental_flag = (_config1 = config) === null || _config1 === void 0 ? void 0 : (_config_experimental = _config1.experimental) === null || _config_experimental === void 0 ? void 0 : _config_experimental[flag]) !== null && _config_experimental_flag !== void 0 ? _config_experimental_flag : defaults[flag]) !== null && _ref1 !== void 0 ? _ref1 : false);
+        return config.experimental === 'all' || ((_ref1 = (_config_experimental_flag = config === null || config === void 0 ? void 0 : (_config_experimental = config.experimental) === null || _config_experimental === void 0 ? void 0 : _config_experimental[flag]) !== null && _config_experimental_flag !== void 0 ? _config_experimental_flag : defaults[flag]) !== null && _ref1 !== void 0 ? _ref1 : false);
     }
     return false;
 }
 function experimentalFlagsEnabled(config) {
-    var _config;
     if (config.experimental === 'all') {
         return featureFlags.experimental;
     }
     var _config_experimental;
-    return Object.keys((_config_experimental = (_config = config) === null || _config === void 0 ? void 0 : _config.experimental) !== null && _config_experimental !== void 0 ? _config_experimental : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
+    return Object.keys((_config_experimental = config === null || config === void 0 ? void 0 : config.experimental) !== null && _config_experimental !== void 0 ? _config_experimental : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
 }
 function issueFlagNotices(config) {
     if (process.env.JEST_WORKER_ID !== undefined) {

package/lib/lib/cacheInvalidation.js

@@ -36,7 +36,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {

package/lib/lib/collapseAdjacentRules.js

@@ -31,10 +31,12 @@ function collapseAdjacentRules() {
                 return;
             }
             let properties = comparisonMap[node.type];
-            var _node_property, _currentRule_property;
             if (node.type === 'atrule' && node.name === 'font-face') {
                 currentRule = node;
-            } else if (properties.every((property)=>((_node_property = node[property]) !== null && _node_property !== void 0 ? _node_property : '').replace(/\s+/g, ' ') === ((_currentRule_property = currentRule[property]) !== null && _currentRule_property !== void 0 ? _currentRule_property : '').replace(/\s+/g, ' '))) {
+            } else if (properties.every((property)=>{
+                var _node_property, _currentRule_property;
+                return ((_node_property = node[property]) !== null && _node_property !== void 0 ? _node_property : '').replace(/\s+/g, ' ') === ((_currentRule_property = currentRule[property]) !== null && _currentRule_property !== void 0 ? _currentRule_property : '').replace(/\s+/g, ' ');
+            })) {
                 // An AtRule may not have children (for example if we encounter duplicate @import url(…) rules)
                 if (node.nodes) {
                     currentRule.append(node.nodes);

package/lib/lib/defaultExtractor.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "defaultExtractor", {
         return defaultExtractor;
     }
 });
-const _featureFlags = require("../featureFlags");
 const _regex = /*#__PURE__*/ _interop_require_wildcard(require("./regex"));
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
@@ -31,7 +30,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -57,17 +58,15 @@ function defaultExtractor(context) {
         /** @type {(string|string)[]} */ let results = [];
         for (let pattern of patterns){
             var _content_match;
-            results = [
-                ...results,
-                ...(_content_match = content.match(pattern)) !== null && _content_match !== void 0 ? _content_match : []
-            ];
+            for (let result of (_content_match = content.match(pattern)) !== null && _content_match !== void 0 ? _content_match : []){
+                results.push(clipAtBalancedParens(result));
+            }
         }
-        return results.filter((v)=>v !== undefined).map(clipAtBalancedParens);
+        return results;
     };
 }
 function* buildRegExps(context) {
     let separator = context.tailwindConfig.separator;
-    let variantGroupingEnabled = (0, _featureFlags.flagEnabled)(context.tailwindConfig, 'variantGrouping');
     let prefix = context.tailwindConfig.prefix !== '' ? _regex.optional(_regex.pattern([
         /-?/,
         _regex.escape(context.tailwindConfig.prefix)
@@ -79,7 +78,7 @@ function* buildRegExps(context) {
         // This is a targeted fix to continue to allow theme()
         // with square brackets to work in arbitrary properties
         // while fixing a problem with the regex matching too much
-        /\[[^\s:'"`]+:[^\s]+?\[[^\s]+\][^\s]+?\]/,
+        /\[[^\s:'"`\]]+:[^\s]+?\[[^\s]+\][^\s]+?\]/,
         // Utilities
         _regex.pattern([
             // Utility Name / Group Name
@@ -115,6 +114,11 @@ function* buildRegExps(context) {
                 /@\[[^\s"'`]+\](\/[^\s"'`]+)?/,
                 separator
             ]),
+            // With variant modifier (e.g.: group-[..]/modifier)
+            _regex.pattern([
+                /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]\/\w+/,
+                separator
+            ]),
             _regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
                 separator
@@ -126,6 +130,11 @@ function* buildRegExps(context) {
         ]),
         // With quotes allowed
         _regex.any([
+            // With variant modifier (e.g.: group-[..]/modifier)
+            _regex.pattern([
+                /([^\s"'`\[\\]+-)?\[[^\s`]+\]\/\w+/,
+                separator
+            ]),
             _regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s`]+\]/,
                 separator
@@ -145,20 +154,7 @@ function* buildRegExps(context) {
             // Important (optional)
             /!?/,
             prefix,
-            variantGroupingEnabled ? _regex.any([
-                // Or any of those things but grouped separated by commas
-                _regex.pattern([
-                    /\(/,
-                    utility,
-                    _regex.zeroOrMore([
-                        /,/,
-                        utility
-                    ]),
-                    /\)/
-                ]),
-                // Arbitrary properties, constrained utilities, arbitrary values, etc…
-                utility
-            ]) : utility
+            utility
         ]);
     }
     // 5. Inner matches

package/lib/lib/evaluateTailwindFunctions.js

@@ -190,9 +190,9 @@ function _default(context) {
         theme: (node, path, ...defaultValue)=>{
             let { isValid, value, error, alpha } = resolvePath(config, path, defaultValue.length ? defaultValue : undefined);
             if (!isValid) {
-                var _parentNode_raws_tailwind, _parentNode;
+                var _parentNode_raws_tailwind;
                 let parentNode = node.parent;
-                let candidate = (_parentNode = parentNode) === null || _parentNode === void 0 ? void 0 : (_parentNode_raws_tailwind = _parentNode.raws.tailwind) === null || _parentNode_raws_tailwind === void 0 ? void 0 : _parentNode_raws_tailwind.candidate;
+                let candidate = parentNode === null || parentNode === void 0 ? void 0 : (_parentNode_raws_tailwind = parentNode.raws.tailwind) === null || _parentNode_raws_tailwind === void 0 ? void 0 : _parentNode_raws_tailwind.candidate;
                 if (parentNode && candidate !== undefined) {
                     // Remove this utility from any caches
                     context.markInvalidUtilityNode(parentNode);

package/lib/lib/expandApplyAtRules.js

@@ -482,6 +482,12 @@ function processApply(root, context, localCache) {
                         // We do *not* want to do this for user CSS that happens to be structured the same
                         let isGenerated = parent.raws.tailwind !== undefined;
                         let parentSelector = isGenerated && importantSelector && parent.selector.indexOf(importantSelector) === 0 ? parent.selector.slice(importantSelector.length) : parent.selector;
+                        // If the selector becomes empty after replacing the important selector
+                        // This means that it's the same as the parent selector and we don't want to replace it
+                        // Otherwise we'll crash
+                        if (parentSelector === '') {
+                            parentSelector = parent.selector;
+                        }
                         rule.selector = replaceSelector(parentSelector, rule.selector, applyCandidate);
                         // And then re-add it if it was removed
                         if (importantSelector && parentSelector !== parent.selector) {

package/lib/lib/expandTailwindAtRules.js

@@ -43,7 +43,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -161,40 +163,36 @@ function expandTailwindAtRules(context) {
         ]);
         let seen = new Set();
         env.DEBUG && console.time('Reading changed files');
-        if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, 'oxideParser')) {
-            let rustParserContent = [];
-            let regexParserContent = [];
-            for (let item of context.changedContent){
-                var _extractor;
-                let transformer = getTransformer(context.tailwindConfig, item.extension);
-                let extractor = getExtractor(context, item.extension);
-                if (transformer === builtInTransformers.DEFAULT && ((_extractor = extractor) === null || _extractor === void 0 ? void 0 : _extractor.DEFAULT_EXTRACTOR) === true) {
-                    rustParserContent.push(item);
-                } else {
-                    regexParserContent.push([
-                        item,
-                        {
-                            transformer,
-                            extractor
-                        }
-                    ]);
-                }
-            }
-            if (rustParserContent.length > 0) {
-                for (let candidate of (0, _oxide.parseCandidateStrings)(rustParserContent, _oxide.IO.Parallel | _oxide.Parsing.Parallel)){
-                    candidates.add(candidate);
-                }
+        /** @type {[item: {file?: string, content?: string}, meta: {transformer: any, extractor: any}][]} */ let regexParserContent = [];
+        /** @type {{file?: string, content?: string}[]} */ let rustParserContent = [];
+        for (let item of context.changedContent){
+            let transformer = getTransformer(context.tailwindConfig, item.extension);
+            let extractor = getExtractor(context, item.extension);
+            if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, 'oxideParser') && transformer === builtInTransformers.DEFAULT && (extractor === null || extractor === void 0 ? void 0 : extractor.DEFAULT_EXTRACTOR) === true) {
+                rustParserContent.push(item);
+            } else {
+                regexParserContent.push([
+                    item,
+                    {
+                        transformer,
+                        extractor
+                    }
+                ]);
             }
-            if (regexParserContent.length > 0) {
-                await Promise.all(regexParserContent.map(async ([{ file, content }, { transformer, extractor }])=>{
-                    content = file ? await _fs.default.promises.readFile(file, 'utf8') : content;
-                    getClassCandidates(transformer(content), extractor, candidates, seen);
-                }));
+        }
+        // Read files using our newer, faster parser when:
+        // - Oxide is enabled; AND
+        // - The file is using default transfomers and extractors
+        if (rustParserContent.length > 0) {
+            for (let candidate of (0, _oxide.parseCandidateStrings)(rustParserContent, _oxide.IO.Parallel | _oxide.Parsing.Parallel)){
+                candidates.add(candidate);
             }
-        } else {
-            await Promise.all(context.changedContent.map(async ({ file, content, extension })=>{
-                let transformer = getTransformer(context.tailwindConfig, extension);
-                let extractor = getExtractor(context, extension);
+        }
+        // Otherwise, read any files in node and parse with regexes
+        const BATCH_SIZE = 500;
+        for(let i = 0; i < regexParserContent.length; i += BATCH_SIZE){
+            let batch = regexParserContent.slice(i, i + BATCH_SIZE);
+            await Promise.all(batch.map(async ([{ file, content }, { transformer, extractor }])=>{
                 content = file ? await _fs.default.promises.readFile(file, 'utf8') : content;
                 getClassCandidates(transformer(content), extractor, candidates, seen);
             }));

package/lib/lib/generateRules.js

@@ -9,14 +9,14 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    generateRules: function() {
+        return generateRules;
+    },
     getClassNameFromSelector: function() {
         return getClassNameFromSelector;
     },
     resolveMatches: function() {
         return resolveMatches;
-    },
-    generateRules: function() {
-        return generateRules;
     }
 });
 const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
@@ -33,7 +33,6 @@ const _dataTypes = require("../util/dataTypes");
 const _setupContextUtils = require("./setupContextUtils");
 const _isSyntacticallyValidPropertyValue = /*#__PURE__*/ _interop_require_default(require("../util/isSyntacticallyValidPropertyValue"));
 const _splitAtTopLevelOnly = require("../util/splitAtTopLevelOnly.js");
-const _featureFlags = require("../featureFlags");
 const _applyImportantSelector = require("../util/applyImportantSelector");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -61,7 +60,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -497,7 +498,9 @@ function extractArbitraryProperty(classCandidate, context) {
     if (!(0, _isSyntacticallyValidPropertyValue.default)(value)) {
         return null;
     }
-    let normalized = (0, _dataTypes.normalize)(value);
+    let normalized = (0, _dataTypes.normalize)(value, {
+        property
+    });
     if (!isParsableCssValue(property, normalized)) {
         return null;
     }
@@ -575,7 +578,7 @@ function* recordCandidates(matches, classCandidate) {
         yield match;
     }
 }
-function* resolveMatches(candidate, context, original = candidate) {
+function* resolveMatches(candidate, context) {
     let separator = context.tailwindConfig.separator;
     let [classCandidate, ...variants] = splitWithSeparator(candidate, separator).reverse();
     let important = false;
@@ -583,14 +586,6 @@ function* resolveMatches(candidate, context, original = candidate) {
         important = true;
         classCandidate = classCandidate.slice(1);
     }
-    if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, 'variantGrouping')) {
-        if (classCandidate.startsWith('(') && classCandidate.endsWith(')')) {
-            let base = variants.slice().reverse().join(separator);
-            for (let part of (0, _splitAtTopLevelOnly.splitAtTopLevelOnly)(classCandidate.slice(1, -1), ',')){
-                yield* resolveMatches(base + separator + part, context, original);
-            }
-        }
-    }
     // TODO: Reintroduce this in ways that doesn't break on false positives
     // function sortAgainst(toSort, against) {
     //   return toSort.slice().sort((a, z) => {
@@ -695,10 +690,12 @@ function* resolveMatches(candidate, context, original = candidate) {
                         fallback
                     ];
                 } else {
-                    var _typesByMatches_get;
-                    let typesPerPlugin = matches.map((match)=>new Set([
+                    let typesPerPlugin = matches.map((match)=>{
+                        var _typesByMatches_get;
+                        return new Set([
                             ...(_typesByMatches_get = typesByMatches.get(match)) !== null && _typesByMatches_get !== void 0 ? _typesByMatches_get : []
-                        ]));
+                        ]);
+                    });
                     // Remove duplicates, so that we can detect proper unique types for each plugin.
                     for (let pluginTypes of typesPerPlugin){
                         for (let type of pluginTypes){
@@ -750,8 +747,7 @@ function* resolveMatches(candidate, context, original = candidate) {
             // Apply final format selector
             match = applyFinalFormat(match, {
                 context,
-                candidate,
-                original
+                candidate
             });
             // Skip rules with invalid selectors
             // This will cause the candidate to be added to the "not class"
@@ -763,7 +759,7 @@ function* resolveMatches(candidate, context, original = candidate) {
         }
     }
 }
-function applyFinalFormat(match, { context, candidate, original }) {
+function applyFinalFormat(match, { context, candidate }) {
     if (!match[0].collectedFormats) {
         return match;
     }
@@ -772,7 +768,7 @@ function applyFinalFormat(match, { context, candidate, original }) {
     try {
         finalFormat = (0, _formatVariantSelector.formatVariantSelector)(match[0].collectedFormats, {
             context,
-            candidate: original
+            candidate
         });
     } catch (e) {
         // The format selector we produced is invalid
@@ -796,10 +792,17 @@ function applyFinalFormat(match, { context, candidate, original }) {
             return;
         }
         try {
-            rule.selector = (0, _formatVariantSelector.finalizeSelector)(rule.selector, finalFormat, {
+            let selector = (0, _formatVariantSelector.finalizeSelector)(rule.selector, finalFormat, {
                 candidate,
                 context
             });
+            // Finalize Selector determined that this candidate is irrelevant
+            // TODO: This elimination should happen earlier so this never happens
+            if (selector === null) {
+                rule.remove();
+                return;
+            }
+            rule.selector = selector;
         } catch (e) {
             // If this selector is invalid we also want to skip it
             // But it's likely that being invalid here means there's a bug in a plugin rather than too loosely matching content
@@ -840,7 +843,7 @@ function getImportantStrategy(important) {
         };
     }
 }
-function generateRules(candidates, context) {
+function generateRules(candidates, context, isSorting = false) {
     let allRules = [];
     let strategy = getImportantStrategy(context.tailwindConfig.important);
     for (let candidate of candidates){
@@ -871,9 +874,11 @@ function generateRules(candidates, context) {
                 container.walkRules(strategy);
                 rule = container.nodes[0];
             }
+            // Note: We have to clone rules during sorting
+            // so we eliminate some shared mutable state
             let newEntry = [
                 sort,
-                rule
+                isSorting ? rule.clone() : rule
             ];
             rules.add(newEntry);
             context.ruleCache.add(newEntry);

package/lib/lib/regex.js

@@ -9,26 +9,26 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    pattern: function() {
-        return pattern;
-    },
-    withoutCapturing: function() {
-        return withoutCapturing;
-    },
     any: function() {
         return any;
     },
+    escape: function() {
+        return escape;
+    },
+    nestedBrackets: function() {
+        return nestedBrackets;
+    },
     optional: function() {
         return optional;
     },
-    zeroOrMore: function() {
-        return zeroOrMore;
+    pattern: function() {
+        return pattern;
     },
-    nestedBrackets: function() {
-        return nestedBrackets;
+    withoutCapturing: function() {
+        return withoutCapturing;
     },
-    escape: function() {
-        return escape;
+    zeroOrMore: function() {
+        return zeroOrMore;
     }
 });
 const REGEX_SPECIAL = /[\\^$.*+?()[\]{}|]/g;