tailwindcss 3.0.21 → 3.0.24

package/lib/lib/resolveDefaultsAtRules.js

@@ -7,80 +7,11 @@ exports.elementSelectorParser = void 0;
 var _postcss = _interopRequireDefault(require("postcss"));
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
 var _featureFlags = require("../featureFlags");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-let getNode = {
-    id (node) {
-        return _postcssSelectorParser.default.attribute({
-            attribute: 'id',
-            operator: '=',
-            value: node.value,
-            quoteMark: '"'
-        });
-    }
-};
-function minimumImpactSelector(nodes) {
-    let rest = nodes.filter((node)=>{
-        // Keep non-pseudo nodes
-        if (node.type !== 'pseudo') return true;
-        // Keep pseudo nodes that have subnodes
-        // E.g.: `:not()` contains subnodes inside the parentheses
-        if (node.nodes.length > 0) return true;
-        // Keep pseudo `elements`
-        // This implicitly means that we ignore pseudo `classes`
-        return node.value.startsWith('::') || [
-            ':before',
-            ':after',
-            ':first-line',
-            ':first-letter'
-        ].includes(node.value);
-    }).reverse();
-    let searchFor = new Set([
-        'tag',
-        'class',
-        'id',
-        'attribute'
-    ]);
-    let splitPointIdx = rest.findIndex((n)=>searchFor.has(n.type)
-    );
-    if (splitPointIdx === -1) return rest.reverse().join('').trim();
-    let node1 = rest[splitPointIdx];
-    let bestNode = getNode[node1.type] ? getNode[node1.type](node1) : node1;
-    rest = rest.slice(0, splitPointIdx);
-    let combinatorIdx = rest.findIndex((n)=>n.type === 'combinator' && n.value === '>'
-    );
-    if (combinatorIdx !== -1) {
-        rest.splice(0, combinatorIdx);
-        rest.unshift(_postcssSelectorParser.default.universal());
-    }
-    return [
-        bestNode,
-        ...rest.reverse()
-    ].join('').trim();
-}
-let elementSelectorParser = (0, _postcssSelectorParser).default((selectors)=>{
-    return selectors.map((s)=>{
-        let nodes = s.split((n)=>n.type === 'combinator' && n.value === ' '
-        ).pop();
-        return minimumImpactSelector(nodes);
-    });
-});
-exports.elementSelectorParser = elementSelectorParser;
-let cache = new Map();
-function extractElementSelector(selector) {
-    if (!cache.has(selector)) {
-        cache.set(selector, elementSelectorParser.transformSync(selector));
-    }
-    return cache.get(selector);
-}
 function resolveDefaultsAtRules({ tailwindConfig  }) {
     return (root)=>{
         let variableNodeMap = new Map();
         /** @type {Set<import('postcss').AtRule>} */ let universals = new Set();
-        root.walkAtRules('defaults', (rule)=>{
+        root.walkAtRules("defaults", (rule)=>{
             if (rule.nodes && rule.nodes.length > 0) {
                 universals.add(rule);
                 return;
@@ -102,20 +33,22 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                     // we consider them separately because merging the declarations into
                     // a single rule will cause browsers that do not understand the
                     // vendor prefix to throw out the whole rule
-                    let selectorGroupName = selector.includes(':-') || selector.includes('::-') ? selector : '__DEFAULT__';
+                    let selectorGroupName = selector.includes(":-") || selector.includes("::-") ? selector : "__DEFAULT__";
                     var ref1;
                     let selectors = (ref1 = selectorGroups.get(selectorGroupName)) !== null && ref1 !== void 0 ? ref1 : new Set();
                     selectorGroups.set(selectorGroupName, selectors);
                     selectors.add(selector);
                 }
             }
-            if ((0, _featureFlags).flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
+            if ((0, _featureFlags).flagEnabled(tailwindConfig, "optimizeUniversalDefaults")) {
                 if (selectorGroups.size === 0) {
                     universal.remove();
                     continue;
                 }
                 for (let [, selectors] of selectorGroups){
-                    let universalRule = _postcss.default.rule();
+                    let universalRule = _postcss.default.rule({
+                        source: universal.source
+                    });
                     universalRule.selectors = [
                         ...selectors
                     ];
@@ -124,11 +57,13 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                     universal.before(universalRule);
                 }
             } else {
-                let universalRule = _postcss.default.rule();
+                let universalRule = _postcss.default.rule({
+                    source: universal.source
+                });
                 universalRule.selectors = [
-                    '*',
-                    '::before',
-                    '::after'
+                    "*",
+                    "::before",
+                    "::after"
                 ];
                 universalRule.append(universal.nodes);
                 universal.before(universalRule);
@@ -137,3 +72,72 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
         }
     };
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let getNode = {
+    id (node) {
+        return _postcssSelectorParser.default.attribute({
+            attribute: "id",
+            operator: "=",
+            value: node.value,
+            quoteMark: '"'
+        });
+    }
+};
+function minimumImpactSelector(nodes) {
+    let rest = nodes.filter((node)=>{
+        // Keep non-pseudo nodes
+        if (node.type !== "pseudo") return true;
+        // Keep pseudo nodes that have subnodes
+        // E.g.: `:not()` contains subnodes inside the parentheses
+        if (node.nodes.length > 0) return true;
+        // Keep pseudo `elements`
+        // This implicitly means that we ignore pseudo `classes`
+        return node.value.startsWith("::") || [
+            ":before",
+            ":after",
+            ":first-line",
+            ":first-letter"
+        ].includes(node.value);
+    }).reverse();
+    let searchFor = new Set([
+        "tag",
+        "class",
+        "id",
+        "attribute"
+    ]);
+    let splitPointIdx = rest.findIndex((n)=>searchFor.has(n.type)
+    );
+    if (splitPointIdx === -1) return rest.reverse().join("").trim();
+    let node1 = rest[splitPointIdx];
+    let bestNode = getNode[node1.type] ? getNode[node1.type](node1) : node1;
+    rest = rest.slice(0, splitPointIdx);
+    let combinatorIdx = rest.findIndex((n)=>n.type === "combinator" && n.value === ">"
+    );
+    if (combinatorIdx !== -1) {
+        rest.splice(0, combinatorIdx);
+        rest.unshift(_postcssSelectorParser.default.universal());
+    }
+    return [
+        bestNode,
+        ...rest.reverse()
+    ].join("").trim();
+}
+let elementSelectorParser = (0, _postcssSelectorParser).default((selectors)=>{
+    return selectors.map((s)=>{
+        let nodes = s.split((n)=>n.type === "combinator" && n.value === " "
+        ).pop();
+        return minimumImpactSelector(nodes);
+    });
+});
+exports.elementSelectorParser = elementSelectorParser;
+let cache = new Map();
+function extractElementSelector(selector) {
+    if (!cache.has(selector)) {
+        cache.set(selector, elementSelectorParser.transformSync(selector));
+    }
+    return cache.get(selector);
+}

package/lib/lib/setupContextUtils.js

@@ -25,6 +25,7 @@ var _log = _interopRequireDefault(require("../util/log"));
 var _negateValue = _interopRequireDefault(require("../util/negateValue"));
 var _isValidArbitraryValue = _interopRequireDefault(require("../util/isValidArbitraryValue"));
 var _generateRules = require("./generateRules");
+var _cacheInvalidationJs = require("./cacheInvalidation.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -53,10 +54,10 @@ function _interopRequireWildcard(obj) {
 }
 function prefix(context, selector) {
     let prefix1 = context.tailwindConfig.prefix;
-    return typeof prefix1 === 'function' ? prefix1(selector) : prefix1 + selector;
+    return typeof prefix1 === "function" ? prefix1(selector) : prefix1 + selector;
 }
 function parseVariantFormatString(input) {
-    if (input.includes('{')) {
+    if (input.includes("{")) {
         if (!isBalanced(input)) throw new Error(`Your { and } are unbalanced.`);
         return input.split(/{(.*)}/gim).flatMap((line)=>parseVariantFormatString(line)
         ).filter(Boolean);
@@ -68,9 +69,9 @@ function parseVariantFormatString(input) {
 function isBalanced(input) {
     let count = 0;
     for (let char of input){
-        if (char === '{') {
+        if (char === "{") {
             count++;
-        } else if (char === '}') {
+        } else if (char === "}") {
             if (--count < 0) {
                 return false // unbalanced
                 ;
@@ -104,9 +105,12 @@ function parseStyles(styles) {
         return isNode ? style : (0, _parseObjectStyles).default(style);
     });
 }
-function getClasses(selector) {
+function getClasses(selector, mutate) {
     let parser = (0, _postcssSelectorParser).default((selectors)=>{
         let allClasses = [];
+        if (mutate) {
+            mutate(selectors);
+        }
         selectors.walkClasses((classNode)=>{
             allClasses.push(classNode.value);
         });
@@ -119,9 +123,20 @@ function extractCandidates(node, state = {
 }, depth = 0) {
     let classes = [];
     // Handle normal rules
-    if (node.type === 'rule') {
+    if (node.type === "rule") {
+        // Ignore everything inside a :not(...). This allows you to write code like
+        // `div:not(.foo)`. If `.foo` is never found in your code, then we used to
+        // not generated it. But now we will ignore everything inside a `:not`, so
+        // that it still gets generated.
+        function ignoreNot(selectors) {
+            selectors.walkPseudos((pseudo)=>{
+                if (pseudo.value === ":not") {
+                    pseudo.remove();
+                }
+            });
+        }
         for (let selector of node.selectors){
-            let classCandidates = getClasses(selector);
+            let classCandidates = getClasses(selector, ignoreNot);
             // At least one of the selectors contains non-"on-demandable" candidates.
             if (classCandidates.length === 0) {
                 state.containsNonOnDemandable = true;
@@ -130,9 +145,9 @@ function extractCandidates(node, state = {
                 classes.push(classCandidate);
             }
         }
-    } else if (node.type === 'atrule') {
+    } else if (node.type === "atrule") {
         node.walkRules((rule)=>{
-            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector, state, depth + 1)
+            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector)
             )){
                 classes.push(classCandidate);
             }
@@ -152,7 +167,7 @@ function withIdentifiers(styles) {
         let [containsNonOnDemandableSelectors, candidates] = extractCandidates(node);
         // If this isn't "on-demandable", assign it a universal candidate to always include it.
         if (containsNonOnDemandableSelectors) {
-            candidates.unshift('*');
+            candidates.unshift(sharedState.NOT_ON_DEMAND);
         }
         // 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
@@ -176,8 +191,8 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         return (0, _prefixSelector).default(tailwindConfig.prefix, selector);
     }
     function prefixIdentifier(identifier, options) {
-        if (identifier === '*') {
-            return '*';
+        if (identifier === sharedState.NOT_ON_DEMAND) {
+            return sharedState.NOT_ON_DEMAND;
         }
         if (!options.respectPrefix) {
             return identifier;
@@ -187,7 +202,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
     return {
         addVariant (variantName, variantFunctions, options = {}) {
             variantFunctions = [].concat(variantFunctions).map((variantFunction)=>{
-                if (typeof variantFunction !== 'string') {
+                if (typeof variantFunction !== "string") {
                     // Safelist public API functions
                     return ({ modifySelectors , container , separator  })=>{
                         return variantFunction({
@@ -197,9 +212,9 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                         });
                     };
                 }
-                variantFunction = variantFunction.replace(/\n+/g, '').replace(/\s{1,}/g, ' ').trim();
+                variantFunction = variantFunction.replace(/\n+/g, "").replace(/\s{1,}/g, " ").trim();
                 let fns = parseVariantFormatString(variantFunction).map((str)=>{
-                    if (!str.startsWith('@')) {
+                    if (!str.startsWith("@")) {
                         return ({ format  })=>format(str)
                         ;
                     }
@@ -226,7 +241,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         theme (path, defaultValue) {
             const [pathRoot, ...subPaths] = (0, _toPath).toPath(path);
             const value = getConfigValue([
-                'theme',
+                "theme",
                 pathRoot,
                 ...subPaths
             ], defaultValue);
@@ -237,7 +252,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 return tailwindConfig.corePlugins.includes(path);
             }
             return getConfigValue([
-                'corePlugins',
+                "corePlugins",
                 path
             ], true);
         },
@@ -245,21 +260,6 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             // Preserved for backwards compatibility but not used in v3.0+
             return [];
         },
-        addUserCss (userCss) {
-            for (let [identifier, rule] 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
-                ]);
-            }
-        },
         addBase (base) {
             for (let [identifier, rule] of withIdentifiers(base)){
                 let prefixedIdentifier = prefixIdentifier(identifier, {});
@@ -270,7 +270,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
                         sort: offset,
-                        layer: 'base'
+                        layer: "base"
                     },
                     rule
                 ]);
@@ -291,7 +291,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
                         sort: offsets.base++,
-                        layer: 'defaults'
+                        layer: "defaults"
                     },
                     rule
                 ]);
@@ -312,7 +312,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
                         sort: offsets.components++,
-                        layer: 'components',
+                        layer: "components",
                         options
                     },
                     rule
@@ -334,7 +334,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 context.candidateRuleMap.get(prefixedIdentifier).push([
                     {
                         sort: offsets.utilities++,
-                        layer: 'utilities',
+                        layer: "utilities",
                         options
                     },
                     rule
@@ -359,7 +359,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                     options
                 ]);
                 function wrapped(modifier, { isOnlyPlugin  }) {
-                    let { type ='any'  } = options;
+                    let { type ="any"  } = options;
                     type = [].concat(type);
                     let [value, coercedType] = (0, _pluginUtils).coerceValue(type, modifier, options, tailwindConfig);
                     if (value === undefined) {
@@ -380,7 +380,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 let withOffsets = [
                     {
                         sort: offset,
-                        layer: 'utilities',
+                        layer: "utilities",
                         options
                     },
                     wrapped
@@ -409,7 +409,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                     options
                 ]);
                 function wrapped(modifier, { isOnlyPlugin  }) {
-                    let { type ='any'  } = options;
+                    let { type ="any"  } = options;
                     type = [].concat(type);
                     let [value, coercedType] = (0, _pluginUtils).coerceValue(type, modifier, options, tailwindConfig);
                     if (value === undefined) {
@@ -419,7 +419,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                         if (isOnlyPlugin) {
                             _log.default.warn([
                                 `Unnecessary typehint \`${coercedType}\` in \`${identifier}-${modifier}\`.`,
-                                `You can safely update it to \`${identifier}-${modifier.replace(coercedType + ':', '')}\`.`, 
+                                `You can safely update it to \`${identifier}-${modifier.replace(coercedType + ":", "")}\`.`, 
                             ]);
                         } else {
                             return [];
@@ -437,7 +437,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 let withOffsets = [
                     {
                         sort: offset,
-                        layer: 'components',
+                        layer: "components",
                         options
                     },
                     wrapped
@@ -463,8 +463,8 @@ function trackModified(files, fileModifiedMap) {
         var ref;
         if (!file) continue;
         let parsed = _url.default.parse(file);
-        let pathname = parsed.hash ? parsed.href.replace(parsed.hash, '') : parsed.href;
-        pathname = parsed.search ? pathname.replace(parsed.search, '') : pathname;
+        let pathname = parsed.hash ? parsed.href.replace(parsed.hash, "") : parsed.href;
+        pathname = parsed.search ? pathname.replace(parsed.search, "") : pathname;
         let newModified = (ref = _fs.default.statSync(decodeURIComponent(pathname), {
             throwIfNoEntry: false
         })) === null || ref === void 0 ? void 0 : ref.mtimeMs;
@@ -481,8 +481,8 @@ function trackModified(files, fileModifiedMap) {
 function extractVariantAtRules(node) {
     node.walkAtRules((atRule)=>{
         if ([
-            'responsive',
-            'variants'
+            "responsive",
+            "variants"
         ].includes(atRule.name)) {
             extractVariantAtRules(atRule);
             atRule.before(atRule.nodes);
@@ -493,18 +493,18 @@ function extractVariantAtRules(node) {
 function collectLayerPlugins(root) {
     let layerPlugins = [];
     root.each((node)=>{
-        if (node.type === 'atrule' && [
-            'responsive',
-            'variants'
+        if (node.type === "atrule" && [
+            "responsive",
+            "variants"
         ].includes(node.name)) {
-            node.name = 'layer';
-            node.params = 'utilities';
+            node.name = "layer";
+            node.params = "utilities";
         }
     });
     // Walk @layer rules and treat them like plugins
-    root.walkAtRules('layer', (layerRule)=>{
+    root.walkAtRules("layer", (layerRule)=>{
         extractVariantAtRules(layerRule);
-        if (layerRule.params === 'base') {
+        if (layerRule.params === "base") {
             for (let node of layerRule.nodes){
                 layerPlugins.push(function({ addBase  }) {
                     addBase(node, {
@@ -513,7 +513,7 @@ function collectLayerPlugins(root) {
                 });
             }
             layerRule.remove();
-        } else if (layerRule.params === 'components') {
+        } else if (layerRule.params === "components") {
             for (let node of layerRule.nodes){
                 layerPlugins.push(function({ addComponents  }) {
                     addComponents(node, {
@@ -522,7 +522,7 @@ function collectLayerPlugins(root) {
                 });
             }
             layerRule.remove();
-        } else if (layerRule.params === 'utilities') {
+        } else if (layerRule.params === "utilities") {
             for (let node of layerRule.nodes){
                 layerPlugins.push(function({ addUtilities  }) {
                     addUtilities(node, {
@@ -533,16 +533,6 @@ function collectLayerPlugins(root) {
             layerRule.remove();
         }
     });
-    root.walkRules((rule)=>{
-        // At this point it is safe to include all the left-over css from the
-        // user's css file. This is because the `@tailwind` and `@layer` directives
-        // will already be handled and will be removed from the css tree.
-        layerPlugins.push(function({ addUserCss  }) {
-            addUserCss(rule, {
-                respectPrefix: false
-            });
-        });
-    });
     return layerPlugins;
 }
 function resolvePlugins(context, root) {
@@ -559,22 +549,22 @@ function resolvePlugins(context, root) {
         if (plugin.__isOptionsFunction) {
             plugin = plugin();
         }
-        return typeof plugin === 'function' ? plugin : plugin.handler;
+        return typeof plugin === "function" ? plugin : plugin.handler;
     });
     let layerPlugins = collectLayerPlugins(root);
     // TODO: This is a workaround for backwards compatibility, since custom variants
     // were historically sorted before screen/stackable variants.
     let beforeVariants = [
-        _corePlugins.variantPlugins['pseudoElementVariants'],
-        _corePlugins.variantPlugins['pseudoClassVariants'], 
+        _corePlugins.variantPlugins["pseudoElementVariants"],
+        _corePlugins.variantPlugins["pseudoClassVariants"], 
     ];
     let afterVariants = [
-        _corePlugins.variantPlugins['directionVariants'],
-        _corePlugins.variantPlugins['reducedMotionVariants'],
-        _corePlugins.variantPlugins['darkVariants'],
-        _corePlugins.variantPlugins['printVariant'],
-        _corePlugins.variantPlugins['screenVariants'],
-        _corePlugins.variantPlugins['orientationVariants'], 
+        _corePlugins.variantPlugins["directionVariants"],
+        _corePlugins.variantPlugins["reducedMotionVariants"],
+        _corePlugins.variantPlugins["darkVariants"],
+        _corePlugins.variantPlugins["printVariant"],
+        _corePlugins.variantPlugins["screenVariants"],
+        _corePlugins.variantPlugins["orientationVariants"], 
     ];
     return [
         ...corePluginList,
@@ -659,18 +649,18 @@ function registerPlugins(plugins, context) {
     if (safelist.length > 0) {
         let checks = [];
         for (let value1 of safelist){
-            if (typeof value1 === 'string') {
+            if (typeof value1 === "string") {
                 context.changedContent.push({
                     content: value1,
-                    extension: 'html'
+                    extension: "html"
                 });
                 continue;
             }
             if (value1 instanceof RegExp) {
-                _log.default.warn('root-regex', [
-                    'Regular expressions in `safelist` work differently in Tailwind CSS v3.0.',
-                    'Update your `safelist` configuration to eliminate this warning.',
-                    'https://tailwindcss.com/docs/content-configuration#safelisting-classes', 
+                _log.default.warn("root-regex", [
+                    "Regular expressions in `safelist` work differently in Tailwind CSS v3.0.",
+                    "Update your `safelist` configuration to eliminate this warning.",
+                    "https://tailwindcss.com/docs/content-configuration#safelisting-classes", 
                 ]);
                 continue;
             }
@@ -691,7 +681,7 @@ function registerPlugins(plugins, context) {
                         // e.g. `-inset-1` or `-tw-inset-1`
                         classes = [
                             ...classes,
-                            ...classes.map((cls)=>'-' + cls
+                            ...classes.map((cls)=>"-" + cls
                             )
                         ];
                         // This is the negated version *after* the prefix
@@ -700,7 +690,7 @@ function registerPlugins(plugins, context) {
                         // So we add the negative after the prefix
                         classes = [
                             ...classes,
-                            ...classes.map((cls)=>cls.slice(0, prefixLength) + '-' + cls.slice(prefixLength)
+                            ...classes.map((cls)=>cls.slice(0, prefixLength) + "-" + cls.slice(prefixLength)
                             ), 
                         ];
                     }
@@ -720,12 +710,12 @@ function registerPlugins(plugins, context) {
                         patternMatchingCount.set(pattern, patternMatchingCount.get(pattern) + 1);
                         context.changedContent.push({
                             content: util1,
-                            extension: 'html'
+                            extension: "html"
                         });
                         for (let variant of variants){
                             context.changedContent.push({
                                 content: variant + context.tailwindConfig.separator + util1,
-                                extension: 'html'
+                                extension: "html"
                             });
                         }
                     }
@@ -735,8 +725,8 @@ function registerPlugins(plugins, context) {
                 if (count !== 0) continue;
                 _log.default.warn([
                     `The safelist pattern \`${regex}\` doesn't match any Tailwind CSS classes.`,
-                    'Fix this pattern or remove it from your `safelist` configuration.',
-                    'https://tailwindcss.com/docs/content-configuration#safelisting-classes', 
+                    "Fix this pattern or remove it from your `safelist` configuration.",
+                    "https://tailwindcss.com/docs/content-configuration#safelisting-classes", 
                 ]);
             }
         }
@@ -746,10 +736,10 @@ function registerPlugins(plugins, context) {
     // sorting could be weird since you still require them in order to make the
     // host utitlies work properly. (Thanks Biology)
     let parasiteUtilities = new Set([
-        prefix(context, 'group'),
-        prefix(context, 'peer')
+        prefix(context, "group"),
+        prefix(context, "peer")
     ]);
-    context.sortClassList = function sortClassList(classes) {
+    context.getClassOrder = function getClassOrder(classes) {
         let sortedClassNames = new Map();
         for (let [sort, rule] of (0, _generateRules).generateRules(new Set(classes), context)){
             if (sortedClassNames.has(rule.raws.tailwind.candidate)) continue;
@@ -768,13 +758,7 @@ function registerPlugins(plugins, context) {
                 className,
                 order
             ];
-        }).sort(([, a], [, z])=>{
-            if (a === z) return 0;
-            if (a === null) return -1;
-            if (z === null) return 1;
-            return (0, _bigSign).default(a - z);
-        }).map(([className])=>className
-        );
+        });
     };
     // Generate a list of strings for autocompletion purposes, e.g.
     // ['uppercase', 'lowercase', ...]
@@ -823,7 +807,7 @@ let contextSourcesMap = sharedState.contextSourcesMap;
 function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies) {
     let sourcePath = result.opts.from;
     let isConfigFile = userConfigPath !== null;
-    sharedState.env.DEBUG && console.log('Source path:', sourcePath);
+    sharedState.env.DEBUG && console.log("Source path:", sourcePath);
     let existingContext;
     if (isConfigFile && contextMap.has(sourcePath)) {
         existingContext = contextMap.get(sourcePath);
@@ -833,13 +817,14 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
         contextMap.set(sourcePath, context);
         existingContext = context;
     }
+    let cssDidChange = (0, _cacheInvalidationJs).hasContentChanged(sourcePath, root);
     // If there's already a context in the cache and we don't need to
     // reset the context, return the cached context.
     if (existingContext) {
         let contextDependenciesChanged = trackModified([
             ...contextDependencies
         ], getFileModifiedMap(existingContext));
-        if (!contextDependenciesChanged) {
+        if (!contextDependenciesChanged && !cssDidChange) {
             return [
                 existingContext,
                 false
@@ -868,7 +853,7 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
             }
         }
     }
-    sharedState.env.DEBUG && console.log('Setting up new context...');
+    sharedState.env.DEBUG && console.log("Setting up new context...");
     let context = createContext(tailwindConfig, [], root);
     trackModified([
         ...contextDependencies