tailwindcss 3.0.23 → 3.1.1

package/lib/util/color.js

@@ -12,88 +12,79 @@ function _interopRequireDefault(obj) {
 }
 let HEX = /^#([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?$/i;
 let SHORT_HEX = /^#([a-f\d])([a-f\d])([a-f\d])([a-f\d])?$/i;
-let VALUE = `(?:\\d+|\\d*\\.\\d+)%?`;
-let SEP = `(?:\\s*,\\s*|\\s+)`;
-let ALPHA_SEP = `\\s*[,/]\\s*`;
-let RGB = new RegExp(`^rgba?\\(\\s*(${VALUE})${SEP}(${VALUE})${SEP}(${VALUE})(?:${ALPHA_SEP}(${VALUE}))?\\s*\\)$`);
-let HSL = new RegExp(`^hsla?\\(\\s*((?:${VALUE})(?:deg|rad|grad|turn)?)${SEP}(${VALUE})${SEP}(${VALUE})(?:${ALPHA_SEP}(${VALUE}))?\\s*\\)$`);
-function parseColor(value) {
-    if (typeof value !== 'string') {
+let VALUE = /(?:\d+|\d*\.\d+)%?/;
+let SEP = /(?:\s*,\s*|\s+)/;
+let ALPHA_SEP = /\s*[,/]\s*/;
+let CUSTOM_PROPERTY = /var\(--(?:[^ )]*?)\)/;
+let RGB = new RegExp(`^(rgb)a?\\(\\s*(${VALUE.source}|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`);
+let HSL = new RegExp(`^(hsl)a?\\(\\s*((?:${VALUE.source})(?:deg|rad|grad|turn)?|${CUSTOM_PROPERTY.source})(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?(?:${ALPHA_SEP.source}(${VALUE.source}|${CUSTOM_PROPERTY.source}))?\\s*\\)$`);
+function parseColor(value, { loose =false  } = {}) {
+    var ref, ref1;
+    if (typeof value !== "string") {
         return null;
     }
     value = value.trim();
-    if (value === 'transparent') {
+    if (value === "transparent") {
         return {
-            mode: 'rgb',
+            mode: "rgb",
             color: [
-                '0',
-                '0',
-                '0'
+                "0",
+                "0",
+                "0"
             ],
-            alpha: '0'
+            alpha: "0"
         };
     }
     if (value in _colorName.default) {
         return {
-            mode: 'rgb',
-            color: _colorName.default[value].map((v)=>v.toString()
-            )
+            mode: "rgb",
+            color: _colorName.default[value].map((v)=>v.toString())
         };
     }
     let hex = value.replace(SHORT_HEX, (_, r, g, b, a)=>[
-            '#',
+            "#",
             r,
             r,
             g,
             g,
             b,
             b,
-            a ? a + a : ''
-        ].join('')
-    ).match(HEX);
+            a ? a + a : ""
+        ].join("")).match(HEX);
     if (hex !== null) {
         return {
-            mode: 'rgb',
+            mode: "rgb",
             color: [
                 parseInt(hex[1], 16),
                 parseInt(hex[2], 16),
                 parseInt(hex[3], 16)
-            ].map((v)=>v.toString()
-            ),
+            ].map((v)=>v.toString()),
             alpha: hex[4] ? (parseInt(hex[4], 16) / 255).toString() : undefined
         };
     }
-    let rgbMatch = value.match(RGB);
-    if (rgbMatch !== null) {
-        var ref, ref1;
-        return {
-            mode: 'rgb',
-            color: [
-                rgbMatch[1],
-                rgbMatch[2],
-                rgbMatch[3]
-            ].map((v)=>v.toString()
-            ),
-            alpha: (ref = rgbMatch[4]) === null || ref === void 0 ? void 0 : (ref1 = ref.toString) === null || ref1 === void 0 ? void 0 : ref1.call(ref)
-        };
+    var ref2;
+    let match = (ref2 = value.match(RGB)) !== null && ref2 !== void 0 ? ref2 : value.match(HSL);
+    if (match === null) {
+        return null;
     }
-    let hslMatch = value.match(HSL);
-    if (hslMatch !== null) {
-        var ref2, ref3;
-        return {
-            mode: 'hsl',
-            color: [
-                hslMatch[1],
-                hslMatch[2],
-                hslMatch[3]
-            ].map((v)=>v.toString()
-            ),
-            alpha: (ref2 = hslMatch[4]) === null || ref2 === void 0 ? void 0 : (ref3 = ref2.toString) === null || ref3 === void 0 ? void 0 : ref3.call(ref2)
-        };
+    let color = [
+        match[2],
+        match[3],
+        match[4]
+    ].filter(Boolean).map((v)=>v.toString());
+    if (!loose && color.length !== 3) {
+        return null;
     }
-    return null;
+    if (color.length < 3 && !color.some((part)=>/^var\(.*?\)$/.test(part))) {
+        return null;
+    }
+    return {
+        mode: match[1],
+        color,
+        alpha: (ref = match[5]) === null || ref === void 0 ? void 0 : (ref1 = ref.toString) === null || ref1 === void 0 ? void 0 : ref1.call(ref)
+    };
 }
 function formatColor({ mode , color , alpha  }) {
     let hasAlpha = alpha !== undefined;
-    return `${mode}(${color.join(' ')}${hasAlpha ? ` / ${alpha}` : ''})`;
+    return `${mode}(${color.join(" ")}${hasAlpha ? ` / ${alpha}` : ""})`;
 }

package/lib/util/createPlugin.js

@@ -9,8 +9,7 @@ function createPlugin(plugin, config) {
         config
     };
 }
-createPlugin.withOptions = function(pluginFunction, configFunction = ()=>({})
-) {
+createPlugin.withOptions = function(pluginFunction, configFunction = ()=>({})) {
     const optionsFunction = function(options) {
         return {
             __options: options,

package/lib/util/createUtilityPlugin.js

@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = createUtilityPlugin;
 var _transformThemeValue = _interopRequireDefault(require("./transformThemeValue"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function createUtilityPlugin(themeKey, utilityVariations = [
     [
         themeKey,
@@ -41,9 +36,13 @@ function createUtilityPlugin(themeKey, utilityVariations = [
                 });
             }, {}), {
                 ...options,
-                values: filterDefault ? Object.fromEntries(Object.entries((ref = theme(themeKey)) !== null && ref !== void 0 ? ref : {}).filter(([modifier])=>modifier !== 'DEFAULT'
-                )) : theme(themeKey)
+                values: filterDefault ? Object.fromEntries(Object.entries((ref = theme(themeKey)) !== null && ref !== void 0 ? ref : {}).filter(([modifier])=>modifier !== "DEFAULT")) : theme(themeKey)
             });
         }
     };
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/util/dataTypes.js

@@ -20,10 +20,10 @@ exports.relativeSize = relativeSize;
 var _color = require("./color");
 var _parseBoxShadowValue = require("./parseBoxShadowValue");
 let cssFunctions = [
-    'min',
-    'max',
-    'clamp',
-    'calc'
+    "min",
+    "max",
+    "clamp",
+    "calc"
 ];
 // Ref: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Types
 let COMMA = /,(?![^(]*\))/g // Comma separator that is not located between brackets. E.g.: `cubiz-bezier(a, b, c)` these don't count.
@@ -32,65 +32,68 @@ let UNDERSCORE = /_(?![^(]*\))/g // Underscore separator that is not located bet
 ;
 function normalize(value, isRoot = true) {
     // Keep raw strings if it starts with `url(`
-    if (value.includes('url(')) {
+    if (value.includes("url(")) {
         return value.split(/(url\(.*?\))/g).filter(Boolean).map((part)=>{
             if (/^url\(.*?\)$/.test(part)) {
                 return part;
             }
             return normalize(part, false);
-        }).join('');
+        }).join("");
     }
     // Convert `_` to ` `, except for escaped underscores `\_`
-    value = value.replace(/([^\\])_+/g, (fullMatch, characterBefore)=>characterBefore + ' '.repeat(fullMatch.length - 1)
-    ).replace(/^_/g, ' ').replace(/\\_/g, '_');
+    value = value.replace(/([^\\])_+/g, (fullMatch, characterBefore)=>characterBefore + " ".repeat(fullMatch.length - 1)).replace(/^_/g, " ").replace(/\\_/g, "_");
     // Remove leftover whitespace
     if (isRoot) {
         value = value.trim();
     }
     // Add spaces around operators inside calc() that do not follow an operator
     // or '('.
-    return value.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, '$1 $2 ');
+    value = value.replace(/calc\(.+\)/g, (match)=>{
+        return match.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ");
+    });
+    // Add spaces around some operators not inside calc() that do not follow an operator
+    // or '('.
+    return value.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([\/])/g, "$1 $2 ");
 }
 function url(value) {
-    return value.startsWith('url(');
+    return value.startsWith("url(");
 }
 function number(value) {
-    return !isNaN(Number(value)) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?`).test(value)
-    );
+    return !isNaN(Number(value)) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?`).test(value));
 }
 function percentage(value) {
-    return /%$/g.test(value) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?%`).test(value)
-    );
+    return value.split(UNDERSCORE).every((part)=>{
+        return /%$/g.test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?%`).test(part));
+    });
 }
 let lengthUnits = [
-    'cm',
-    'mm',
-    'Q',
-    'in',
-    'pc',
-    'pt',
-    'px',
-    'em',
-    'ex',
-    'ch',
-    'rem',
-    'lh',
-    'vw',
-    'vh',
-    'vmin',
-    'vmax', 
+    "cm",
+    "mm",
+    "Q",
+    "in",
+    "pc",
+    "pt",
+    "px",
+    "em",
+    "ex",
+    "ch",
+    "rem",
+    "lh",
+    "vw",
+    "vh",
+    "vmin",
+    "vmax", 
 ];
-let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`;
+let lengthUnitsPattern = `(?:${lengthUnits.join("|")})`;
 function length(value) {
     return value.split(UNDERSCORE).every((part)=>{
-        return part === '0' || new RegExp(`${lengthUnitsPattern}$`).test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(part)
-        );
+        return part === "0" || new RegExp(`${lengthUnitsPattern}$`).test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(part));
     });
 }
 let lineWidths = new Set([
-    'thin',
-    'medium',
-    'thick'
+    "thin",
+    "medium",
+    "thick"
 ]);
 function lineWidth(value) {
     return lineWidths.has(value);
@@ -108,8 +111,10 @@ function color(value) {
     let colors = 0;
     let result = value.split(UNDERSCORE).every((part)=>{
         part = normalize(part);
-        if (part.startsWith('var(')) return true;
-        if ((0, _color).parseColor(part) !== null) return colors++, true;
+        if (part.startsWith("var(")) return true;
+        if ((0, _color).parseColor(part, {
+            loose: true
+        }) !== null) return colors++, true;
         return false;
     });
     if (!result) return false;
@@ -119,14 +124,13 @@ function image(value) {
     let images = 0;
     let result = value.split(COMMA).every((part)=>{
         part = normalize(part);
-        if (part.startsWith('var(')) return true;
+        if (part.startsWith("var(")) return true;
         if (url(part) || gradient(part) || [
-            'element(',
-            'image(',
-            'cross-fade(',
-            'image-set('
-        ].some((fn)=>part.startsWith(fn)
-        )) {
+            "element(",
+            "image(",
+            "cross-fade(",
+            "image-set("
+        ].some((fn)=>part.startsWith(fn))) {
             images++;
             return true;
         }
@@ -136,11 +140,11 @@ function image(value) {
     return images > 0;
 }
 let gradientTypes = new Set([
-    'linear-gradient',
-    'radial-gradient',
-    'repeating-linear-gradient',
-    'repeating-radial-gradient',
-    'conic-gradient', 
+    "linear-gradient",
+    "radial-gradient",
+    "repeating-linear-gradient",
+    "repeating-radial-gradient",
+    "conic-gradient", 
 ]);
 function gradient(value) {
     value = normalize(value);
@@ -152,17 +156,17 @@ function gradient(value) {
     return false;
 }
 let validPositions = new Set([
-    'center',
-    'top',
-    'right',
-    'bottom',
-    'left'
+    "center",
+    "top",
+    "right",
+    "bottom",
+    "left"
 ]);
 function position(value) {
     let positions = 0;
     let result = value.split(UNDERSCORE).every((part)=>{
         part = normalize(part);
-        if (part.startsWith('var(')) return true;
+        if (part.startsWith("var(")) return true;
         if (validPositions.has(part) || length(part) || percentage(part)) {
             positions++;
             return true;
@@ -176,9 +180,9 @@ function familyName(value) {
     let fonts = 0;
     let result = value.split(COMMA).every((part)=>{
         part = normalize(part);
-        if (part.startsWith('var(')) return true;
+        if (part.startsWith("var(")) return true;
         // If it contains spaces, then it should be quoted
-        if (part.includes(' ')) {
+        if (part.includes(" ")) {
             if (!/(['"])([^"']+)\1/g.test(part)) {
                 return false;
             }
@@ -194,39 +198,39 @@ function familyName(value) {
     return fonts > 0;
 }
 let genericNames = new Set([
-    'serif',
-    'sans-serif',
-    'monospace',
-    'cursive',
-    'fantasy',
-    'system-ui',
-    'ui-serif',
-    'ui-sans-serif',
-    'ui-monospace',
-    'ui-rounded',
-    'math',
-    'emoji',
-    'fangsong', 
+    "serif",
+    "sans-serif",
+    "monospace",
+    "cursive",
+    "fantasy",
+    "system-ui",
+    "ui-serif",
+    "ui-sans-serif",
+    "ui-monospace",
+    "ui-rounded",
+    "math",
+    "emoji",
+    "fangsong", 
 ]);
 function genericName(value) {
     return genericNames.has(value);
 }
 let absoluteSizes = new Set([
-    'xx-small',
-    'x-small',
-    'small',
-    'medium',
-    'large',
-    'x-large',
-    'x-large',
-    'xxx-large', 
+    "xx-small",
+    "x-small",
+    "small",
+    "medium",
+    "large",
+    "x-large",
+    "x-large",
+    "xxx-large", 
 ]);
 function absoluteSize(value) {
     return absoluteSizes.has(value);
 }
 let relativeSizes = new Set([
-    'larger',
-    'smaller'
+    "larger",
+    "smaller"
 ]);
 function relativeSize(value) {
     return relativeSizes.has(value);

package/lib/util/escapeClassName.js

@@ -5,11 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = escapeClassName;
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
 var _escapeCommas = _interopRequireDefault(require("./escapeCommas"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function escapeClassName(className) {
     var ref;
     let node = _postcssSelectorParser.default.className();
@@ -17,3 +12,8 @@ function escapeClassName(className) {
     var ref1;
     return (0, _escapeCommas).default((ref1 = node === null || node === void 0 ? void 0 : (ref = node.raws) === null || ref === void 0 ? void 0 : ref.value) !== null && ref1 !== void 0 ? ref1 : node.value);
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/util/escapeCommas.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = escapeCommas;
 function escapeCommas(className) {
-    return className.replace(/\\,/g, '\\2c ');
+    return className.replace(/\\,/g, "\\2c ");
 }

package/lib/util/flattenColorPalette.js

@@ -3,15 +3,12 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = void 0;
-const flattenColorPalette = (colors)=>Object.assign({}, ...Object.entries(colors !== null && colors !== void 0 ? colors : {}).flatMap(([color, values])=>typeof values == 'object' ? Object.entries(flattenColorPalette(values)).map(([number, hex])=>({
-                [color + (number === 'DEFAULT' ? '' : `-${number}`)]: hex
-            })
-        ) : [
+const flattenColorPalette = (colors)=>Object.assign({}, ...Object.entries(colors !== null && colors !== void 0 ? colors : {}).flatMap(([color, values])=>typeof values == "object" ? Object.entries(flattenColorPalette(values)).map(([number, hex])=>({
+                [color + (number === "DEFAULT" ? "" : `-${number}`)]: hex
+            })) : [
             {
                 [`${color}`]: values
             }
-        ]
-    ))
-;
+        ]));
 var _default = flattenColorPalette;
 exports.default = _default;