tailwindcss 3.0.21 → 3.0.24

package/lib/featureFlags.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.flagEnabled = flagEnabled;
 exports.issueFlagNotices = issueFlagNotices;
 exports.default = void 0;
-var _chalk = _interopRequireDefault(require("chalk"));
+var _picocolors = _interopRequireDefault(require("picocolors"));
 var _log = _interopRequireDefault(require("./util/log"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -18,24 +18,24 @@ let defaults = {
 let featureFlags = {
     future: [],
     experimental: [
-        'optimizeUniversalDefaults'
+        "optimizeUniversalDefaults"
     ]
 };
 function flagEnabled(config, flag) {
     if (featureFlags.future.includes(flag)) {
         var ref;
         var ref1, ref2;
-        return config.future === 'all' || ((ref2 = (ref1 = config === null || config === void 0 ? void 0 : (ref = config.future) === null || ref === void 0 ? void 0 : ref[flag]) !== null && ref1 !== void 0 ? ref1 : defaults[flag]) !== null && ref2 !== void 0 ? ref2 : false);
+        return config.future === "all" || ((ref2 = (ref1 = config === null || config === void 0 ? void 0 : (ref = config.future) === null || ref === void 0 ? void 0 : ref[flag]) !== null && ref1 !== void 0 ? ref1 : defaults[flag]) !== null && ref2 !== void 0 ? ref2 : false);
     }
     if (featureFlags.experimental.includes(flag)) {
         var ref3;
         var ref4, ref5;
-        return config.experimental === 'all' || ((ref5 = (ref4 = config === null || config === void 0 ? void 0 : (ref3 = config.experimental) === null || ref3 === void 0 ? void 0 : ref3[flag]) !== null && ref4 !== void 0 ? ref4 : defaults[flag]) !== null && ref5 !== void 0 ? ref5 : false);
+        return config.experimental === "all" || ((ref5 = (ref4 = config === null || config === void 0 ? void 0 : (ref3 = config.experimental) === null || ref3 === void 0 ? void 0 : ref3[flag]) !== null && ref4 !== void 0 ? ref4 : defaults[flag]) !== null && ref5 !== void 0 ? ref5 : false);
     }
     return false;
 }
 function experimentalFlagsEnabled(config) {
-    if (config.experimental === 'all') {
+    if (config.experimental === "all") {
         return featureFlags.experimental;
     }
     var ref;
@@ -47,11 +47,11 @@ function issueFlagNotices(config) {
         return;
     }
     if (experimentalFlagsEnabled(config).length > 0) {
-        let changes = experimentalFlagsEnabled(config).map((s)=>_chalk.default.yellow(s)
-        ).join(', ');
-        _log.default.warn('experimental-flags-enabled', [
+        let changes = experimentalFlagsEnabled(config).map((s)=>_picocolors.default.yellow(s)
+        ).join(", ");
+        _log.default.warn("experimental-flags-enabled", [
             `You have enabled experimental features: ${changes}`,
-            'Experimental features in Tailwind CSS are not covered by semver, may introduce breaking changes, and can change at any time.', 
+            "Experimental features in Tailwind CSS are not covered by semver, may introduce breaking changes, and can change at any time.", 
         ]);
     }
 }

package/lib/index.js

@@ -9,19 +9,32 @@ function _interopRequireDefault(obj) {
 }
 module.exports = function tailwindcss(configOrPath) {
     return {
-        postcssPlugin: 'tailwindcss',
+        postcssPlugin: "tailwindcss",
         plugins: [
             _sharedState.env.DEBUG && function(root) {
-                console.log('\n');
-                console.time('JIT TOTAL');
+                console.log("\n");
+                console.time("JIT TOTAL");
                 return root;
             },
             function(root, result) {
-                (0, _processTailwindFeatures).default((0, _setupTrackingContext).default(configOrPath))(root, result);
+                let context = (0, _setupTrackingContext).default(configOrPath);
+                /*
+        if (root.type === 'document') {
+          let roots = root.nodes.filter((node) => node.type === 'root')
+
+          for (const root of roots) {
+            if (root.type === 'root') {
+              processTailwindFeatures(context)(root, result)
+            }
+          }
+
+          return
+        }
+        */ (0, _processTailwindFeatures).default(context)(root, result);
             },
             _sharedState.env.DEBUG && function(root) {
-                console.timeEnd('JIT TOTAL');
-                console.log('\n');
+                console.timeEnd("JIT TOTAL");
+                console.log("\n");
                 return root;
             }, 
         ].filter(Boolean)

package/lib/lib/cacheInvalidation.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.hasContentChanged = hasContentChanged;
+var _crypto = _interopRequireDefault(require("crypto"));
+var sharedState = _interopRequireWildcard(require("./sharedState"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _interopRequireWildcard(obj) {
+    if (obj && obj.__esModule) {
+        return obj;
+    } else {
+        var newObj = {};
+        if (obj != null) {
+            for(var key in obj){
+                if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
+                    if (desc.get || desc.set) {
+                        Object.defineProperty(newObj, key, desc);
+                    } else {
+                        newObj[key] = obj[key];
+                    }
+                }
+            }
+        }
+        newObj.default = obj;
+        return newObj;
+    }
+}
+/**
+ * Calculate the hash of a string.
+ *
+ * This doesn't need to be cryptographically secure or
+ * anything like that since it's used only to detect
+ * when the CSS changes to invalidate the context.
+ *
+ * This is wrapped in a try/catch because it's really dependent
+ * on how Node itself is build and the environment and OpenSSL
+ * version / build that is installed on the user's machine.
+ *
+ * Based on the environment this can just outright fail.
+ *
+ * See https://github.com/nodejs/node/issues/40455
+ *
+ * @param {string} str
+ */ function getHash(str) {
+    try {
+        return _crypto.default.createHash("md5").update(str, "utf-8").digest("binary");
+    } catch (err) {
+        return "";
+    }
+}
+function hasContentChanged(sourcePath, root) {
+    let css = root.toString();
+    // We only care about files with @tailwind directives
+    // Other files use an existing context
+    if (!css.includes("@tailwind")) {
+        return false;
+    }
+    let existingHash = sharedState.sourceHashMap.get(sourcePath);
+    let rootHash = getHash(css);
+    let didChange = existingHash !== rootHash;
+    sharedState.sourceHashMap.set(sourcePath, rootHash);
+    return didChange;
+}

package/lib/lib/collapseAdjacentRules.js

@@ -3,18 +3,8 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = collapseAdjacentRules;
-let comparisonMap = {
-    atrule: [
-        'name',
-        'params'
-    ],
-    rule: [
-        'selector'
-    ]
-};
-let types = new Set(Object.keys(comparisonMap));
 function collapseAdjacentRules() {
-    return (root)=>{
+    function collapseRulesIn(root) {
         let currentRule = null;
         root.each((node)=>{
             if (!types.has(node.type)) {
@@ -27,9 +17,9 @@ function collapseAdjacentRules() {
             }
             let properties = comparisonMap[node.type];
             var _property, _property1;
-            if (node.type === 'atrule' && node.name === 'font-face') {
+            if (node.type === "atrule" && node.name === "font-face") {
                 currentRule = node;
-            } else if (properties.every((property)=>((_property = node[property]) !== null && _property !== void 0 ? _property : '').replace(/\s+/g, ' ') === ((_property1 = currentRule[property]) !== null && _property1 !== void 0 ? _property1 : '').replace(/\s+/g, ' ')
+            } else if (properties.every((property)=>((_property = node[property]) !== null && _property !== void 0 ? _property : "").replace(/\s+/g, " ") === ((_property1 = currentRule[property]) !== null && _property1 !== void 0 ? _property1 : "").replace(/\s+/g, " ")
             )) {
                 currentRule.append(node.nodes);
                 node.remove();
@@ -37,5 +27,28 @@ function collapseAdjacentRules() {
                 currentRule = node;
             }
         });
+        // After we've collapsed adjacent rules & at-rules, we need to collapse
+        // adjacent rules & at-rules that are children of at-rules.
+        // We do not care about nesting rules because Tailwind CSS
+        // explicitly does not handle rule nesting on its own as
+        // the user is expected to use a nesting plugin
+        root.each((node)=>{
+            if (node.type === "atrule") {
+                collapseRulesIn(node);
+            }
+        });
+    }
+    return (root)=>{
+        collapseRulesIn(root);
     };
 }
+let comparisonMap = {
+    atrule: [
+        "name",
+        "params"
+    ],
+    rule: [
+        "selector"
+    ]
+};
+let types = new Set(Object.keys(comparisonMap));

package/lib/lib/collapseDuplicateDeclarations.js

@@ -69,7 +69,7 @@ function collapseDuplicateDeclarations() {
         });
     };
 }
-let UNITLESS_NUMBER = Symbol('unitless-number');
+let UNITLESS_NUMBER = Symbol("unitless-number");
 function resolveUnit(input) {
     let result = /^-?\d*.?\d+([\w%]+)?$/g.exec(input);
     if (result) {

package/lib/lib/defaultExtractor.js

@@ -7,22 +7,24 @@ const PATTERNS = [
     /(?:\['([^'\s]+[^<>"'`\s:\\])')/.source,
     /(?:\["([^"\s]+[^<>"'`\s:\\])")/.source,
     /(?:\[`([^`\s]+[^<>"'`\s:\\])`)/.source,
-    /([^<>"'`\s]*\[\w*'[^"`\s]*'?\])/.source,
-    /([^<>"'`\s]*\[\w*"[^'`\s]*"?\])/.source,
+    /([^${(<>"'`\s]*\[\w*'[^"`\s]*'?\])/.source,
+    /([^${(<>"'`\s]*\[\w*"[^'`\s]*"?\])/.source,
     /([^<>"'`\s]*\[\w*\('[^"'`\s]*'\)\])/.source,
     /([^<>"'`\s]*\[\w*\("[^"'`\s]*"\)\])/.source,
     /([^<>"'`\s]*\[\w*\('[^"`\s]*'\)\])/.source,
     /([^<>"'`\s]*\[\w*\("[^'`\s]*"\)\])/.source,
-    /([^<>"'`\s]*\['[^"'`\s]*'\])/.source,
-    /([^<>"'`\s]*\["[^"'`\s]*"\])/.source,
+    /([^<>"'`\s]*\[[^<>"'`\s]*\('[^"`\s]*'\)+\])/.source,
+    /([^<>"'`\s]*\[[^<>"'`\s]*\("[^'`\s]*"\)+\])/.source,
+    /([^${(<>"'`\s]*\['[^"'`\s]*'\])/.source,
+    /([^${(<>"'`\s]*\["[^"'`\s]*"\])/.source,
     /([^<>"'`\s]*\[[^<>"'`\s]*:[^\]\s]*\])/.source,
     /([^<>"'`\s]*\[[^<>"'`\s]*:'[^"'`\s]*'\])/.source,
     /([^<>"'`\s]*\[[^<>"'`\s]*:"[^"'`\s]*"\])/.source,
     /([^<>"'`\s]*\[[^"'`\s]+\][^<>"'`\s]*)/.source,
     /([^"'`\s]*[^<>"'`\s:\\])/.source,
     /([^<>"'`\s]*[^"'`\s:\\])/.source, 
-].join('|');
-const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, 'g');
+].join("|");
+const BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, "g");
 const INNER_MATCH_GLOBAL_REGEXP = /[^<>"'`\s.(){}[\]#=%$]*[^<>"'`\s.(){}[\]#=%:$]/g;
 function defaultExtractor(content) {
     let broadMatches = content.matchAll(BROAD_MATCH_GLOBAL_REGEXP);

package/lib/lib/detectNesting.js

@@ -6,15 +6,15 @@ exports.default = _default;
 function _default(_context) {
     return (root, result)=>{
         let found = false;
-        root.walkAtRules('tailwind', (node)=>{
+        root.walkAtRules("tailwind", (node)=>{
             if (found) return false;
-            if (node.parent && node.parent.type !== 'root') {
+            if (node.parent && node.parent.type !== "root") {
                 found = true;
                 node.warn(result, [
-                    'Nested @tailwind rules were detected, but are not supported.',
+                    "Nested @tailwind rules were detected, but are not supported.",
                     "Consider using a prefix to scope Tailwind's classes: https://tailwindcss.com/docs/configuration#prefix",
-                    'Alternatively, use the important selector strategy: https://tailwindcss.com/docs/configuration#selector-strategy', 
-                ].join('\n'));
+                    "Alternatively, use the important selector strategy: https://tailwindcss.com/docs/configuration#selector-strategy", 
+                ].join("\n"));
                 return false;
             }
         });
@@ -23,10 +23,10 @@ function _default(_context) {
             rule.walkRules((nestedRule)=>{
                 found = true;
                 nestedRule.warn(result, [
-                    'Nested CSS was detected, but CSS nesting has not been configured correctly.',
-                    'Please enable a CSS nesting plugin *before* Tailwind in your configuration.',
-                    'See how here: https://tailwindcss.com/docs/using-with-preprocessors#nesting', 
-                ].join('\n'));
+                    "Nested CSS was detected, but CSS nesting has not been configured correctly.",
+                    "Please enable a CSS nesting plugin *before* Tailwind in your configuration.",
+                    "See how here: https://tailwindcss.com/docs/using-with-preprocessors#nesting", 
+                ].join("\n"));
                 return false;
             });
         });

package/lib/lib/evaluateTailwindFunctions.js

@@ -16,32 +16,32 @@ function _interopRequireDefault(obj) {
     };
 }
 function isObject(input) {
-    return typeof input === 'object' && input !== null;
+    return typeof input === "object" && input !== null;
 }
 function findClosestExistingPath(theme, path) {
     let parts = (0, _toPath).toPath(path);
     do {
         parts.pop();
         if ((0, _dlv).default(theme, parts) !== undefined) break;
-    }while (parts.length)
+    }while (parts.length);
     return parts.length ? parts : undefined;
 }
 function pathToString(path) {
-    if (typeof path === 'string') return path;
+    if (typeof path === "string") return path;
     return path.reduce((acc, cur, i)=>{
-        if (cur.includes('.')) return `${acc}[${cur}]`;
+        if (cur.includes(".")) return `${acc}[${cur}]`;
         return i === 0 ? cur : `${acc}.${cur}`;
-    }, '');
+    }, "");
 }
 function list(items) {
     return items.map((key)=>`'${key}'`
-    ).join(', ');
+    ).join(", ");
 }
 function listKeys(obj) {
     return list(Object.keys(obj));
 }
 function validatePath(config, path, defaultValue) {
-    const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
+    const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+/g, "").replace(/['"]+$/g, "");
     const pathSegments = Array.isArray(path) ? path : (0, _toPath).toPath(pathString);
     const value = (0, _dlv).default(config.theme, pathSegments, defaultValue);
     if (value === undefined) {
@@ -81,7 +81,7 @@ function validatePath(config, path, defaultValue) {
             error
         };
     }
-    if (!(typeof value === 'string' || typeof value === 'number' || typeof value === 'function' || value instanceof String || value instanceof Number || Array.isArray(value))) {
+    if (!(typeof value === "string" || typeof value === "number" || typeof value === "function" || value instanceof String || value instanceof Number || Array.isArray(value))) {
         let error = `'${pathString}' was found but does not resolve to a string.`;
         if (isObject(value)) {
             let validKeys = Object.keys(value).filter((key)=>validatePath(config, [
@@ -111,11 +111,11 @@ function extractArgs(node, vNodes, functions) {
     vNodes = vNodes.map((vNode)=>resolveVNode(node, vNode, functions)
     );
     let args = [
-        ''
+        ""
     ];
     for (let vNode1 of vNodes){
-        if (vNode1.type === 'div' && vNode1.value === ',') {
-            args.push('');
+        if (vNode1.type === "div" && vNode1.value === ",") {
+            args.push("");
         } else {
             args[args.length - 1] += _postcssValueParser.default.stringify(vNode1);
         }
@@ -123,9 +123,9 @@ function extractArgs(node, vNodes, functions) {
     return args;
 }
 function resolveVNode(node, vNode, functions) {
-    if (vNode.type === 'function' && functions[vNode.value] !== undefined) {
+    if (vNode.type === "function" && functions[vNode.value] !== undefined) {
         let args = extractArgs(node, vNode.nodes, functions);
-        vNode.type = 'word';
+        vNode.type = "word";
         vNode.value = functions[vNode.value](node, ...args);
     }
     return vNode;
@@ -136,8 +136,8 @@ function resolveFunctions(node, input, functions) {
     }).toString();
 }
 let nodeTypePropertyMap = {
-    atrule: 'params',
-    decl: 'value'
+    atrule: "params",
+    decl: "value"
 };
 function _default({ tailwindConfig: config  }) {
     let functions = {
@@ -149,7 +149,7 @@ function _default({ tailwindConfig: config  }) {
             return value;
         },
         screen: (node, screen)=>{
-            screen = screen.replace(/^['"]+/g, '').replace(/['"]+$/g, '');
+            screen = screen.replace(/^['"]+/g, "").replace(/['"]+$/g, "");
             let screens = (0, _normalizeScreens).normalizeScreens(config.theme.screens);
             let screenDefinition = screens.find(({ name  })=>name === screen
             );