tailwindcss 3.0.24 → 3.1.2

package/lib/lib/setupContextUtils.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+exports.isValidVariantFormatString = isValidVariantFormatString;
+exports.parseVariant = parseVariant;
 exports.getFileModifiedMap = getFileModifiedMap;
 exports.createContext = createContext;
 exports.getContext = getContext;
@@ -10,6 +12,7 @@ var _url = _interopRequireDefault(require("url"));
 var _postcss = _interopRequireDefault(require("postcss"));
 var _dlv = _interopRequireDefault(require("dlv"));
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
+var _featureFlagsJs = require("../featureFlags.js");
 var _transformThemeValue = _interopRequireDefault(require("../util/transformThemeValue"));
 var _parseObjectStyles = _interopRequireDefault(require("../util/parseObjectStyles"));
 var _prefixSelector = _interopRequireDefault(require("../util/prefixSelector"));
@@ -31,27 +34,46 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
+function _getRequireWildcardCache() {
+    if (typeof WeakMap !== "function") return null;
+    var cache = new WeakMap();
+    _getRequireWildcardCache = function() {
+        return cache;
+    };
+    return cache;
+}
 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];
-                    }
-                }
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache();
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
             }
         }
-        newObj.default = obj;
-        return newObj;
     }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
+let MATCH_VARIANT = Symbol();
 function prefix(context, selector) {
     let prefix1 = context.tailwindConfig.prefix;
     return typeof prefix1 === "function" ? prefix1(selector) : prefix1 + selector;
@@ -59,8 +81,7 @@ function prefix(context, selector) {
 function parseVariantFormatString(input) {
     if (input.includes("{")) {
         if (!isBalanced(input)) throw new Error(`Your { and } are unbalanced.`);
-        return input.split(/{(.*)}/gim).flatMap((line)=>parseVariantFormatString(line)
-        ).filter(Boolean);
+        return input.split(/{(.*)}/gim).flatMap((line)=>parseVariantFormatString(line)).filter(Boolean);
     }
     return [
         input.trim()
@@ -147,8 +168,7 @@ function extractCandidates(node, state = {
         }
     } else if (node.type === "atrule") {
         node.walkRules((rule)=>{
-            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector)
-            )){
+            for (let classCandidate of rule.selectors.flatMap((selector)=>getClasses(selector))){
                 classes.push(classCandidate);
             }
         });
@@ -183,6 +203,27 @@ function withIdentifiers(styles) {
         });
     });
 }
+function isValidVariantFormatString(format) {
+    return format.startsWith("@") || format.includes("&");
+}
+function parseVariant(variant) {
+    variant = variant.replace(/\n+/g, "").replace(/\s{1,}/g, " ").trim();
+    let fns = parseVariantFormatString(variant).map((str)=>{
+        if (!str.startsWith("@")) {
+            return ({ format  })=>format(str);
+        }
+        let [, name, params] = /@(.*?)( .+|[({].*)/g.exec(str);
+        return ({ wrap  })=>wrap(_postcss.default.atRule({
+                name,
+                params: params.trim()
+            }));
+    }).reverse();
+    return (api)=>{
+        for (let fn of fns){
+            fn(api);
+        }
+    };
+}
 function buildPluginApi(tailwindConfig, context, { variantList , variantMap , offsets , classList  }) {
     function getConfigValue(path, defaultValue) {
         return path ? (0, _dlv).default(tailwindConfig, path, defaultValue) : tailwindConfig;
@@ -199,54 +240,26 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         }
         return context.tailwindConfig.prefix + identifier;
     }
-    return {
-        addVariant (variantName, variantFunctions, options = {}) {
-            variantFunctions = [].concat(variantFunctions).map((variantFunction)=>{
-                if (typeof variantFunction !== "string") {
-                    // Safelist public API functions
-                    return ({ modifySelectors , container , separator  })=>{
-                        return variantFunction({
-                            modifySelectors,
-                            container,
-                            separator
-                        });
-                    };
-                }
-                variantFunction = variantFunction.replace(/\n+/g, "").replace(/\s{1,}/g, " ").trim();
-                let fns = parseVariantFormatString(variantFunction).map((str)=>{
-                    if (!str.startsWith("@")) {
-                        return ({ format  })=>format(str)
-                        ;
-                    }
-                    let [, name, params] = /@(.*?) (.*)/g.exec(str);
-                    return ({ wrap  })=>wrap(_postcss.default.atRule({
-                            name,
-                            params
-                        }))
-                    ;
-                }).reverse();
-                return (api)=>{
-                    for (let fn of fns){
-                        fn(api);
-                    }
-                };
-            });
-            insertInto(variantList, variantName, options);
-            variantMap.set(variantName, variantFunctions);
-        },
+    function resolveThemeValue(path, defaultValue, opts = {}) {
+        const [pathRoot, ...subPaths] = (0, _toPath).toPath(path);
+        const value = getConfigValue([
+            "theme",
+            pathRoot,
+            ...subPaths
+        ], defaultValue);
+        return (0, _transformThemeValue).default(pathRoot)(value, opts);
+    }
+    const theme = Object.assign((path, defaultValue = undefined)=>resolveThemeValue(path, defaultValue), {
+        withAlpha: (path, opacityValue)=>resolveThemeValue(path, undefined, {
+                opacityValue
+            })
+    });
+    let api1 = {
         postcss: _postcss.default,
         prefix: applyConfiguredPrefix,
         e: _escapeClassName.default,
         config: getConfigValue,
-        theme (path, defaultValue) {
-            const [pathRoot, ...subPaths] = (0, _toPath).toPath(path);
-            const value = getConfigValue([
-                "theme",
-                pathRoot,
-                ...subPaths
-            ], defaultValue);
-            return (0, _transformThemeValue).default(pathRoot)(value);
-        },
+        theme,
         corePlugins: (path)=>{
             if (Array.isArray(tailwindConfig.corePlugins)) {
                 return tailwindConfig.corePlugins.includes(path);
@@ -373,8 +386,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                     }
                     let ruleSets = [].concat(rule(value)).filter(Boolean).map((declaration)=>({
                             [(0, _nameClass).default(identifier, modifier)]: declaration
-                        })
-                    );
+                        }));
                     return ruleSets;
                 }
                 let withOffsets = [
@@ -430,8 +442,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                     }
                     let ruleSets = [].concat(rule(value)).filter(Boolean).map((declaration)=>({
                             [(0, _nameClass).default(identifier, modifier)]: declaration
-                        })
-                    );
+                        }));
                     return ruleSets;
                 }
                 let withOffsets = [
@@ -447,8 +458,55 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 }
                 context.candidateRuleMap.get(prefixedIdentifier).push(withOffsets);
             }
+        },
+        addVariant (variantName, variantFunctions, options = {}) {
+            variantFunctions = [].concat(variantFunctions).map((variantFunction)=>{
+                if (typeof variantFunction !== "string") {
+                    // Safelist public API functions
+                    return (api)=>{
+                        let { args , modifySelectors , container , separator , wrap , format  } = api;
+                        let result = variantFunction(Object.assign({
+                            modifySelectors,
+                            container,
+                            separator
+                        }, variantFunction[MATCH_VARIANT] && {
+                            args,
+                            wrap,
+                            format
+                        }));
+                        if (typeof result === "string" && !isValidVariantFormatString(result)) {
+                            throw new Error(`Your custom variant \`${variantName}\` has an invalid format string. Make sure it's an at-rule or contains a \`&\` placeholder.`);
+                        }
+                        if (Array.isArray(result)) {
+                            return result.map((variant)=>parseVariant(variant));
+                        }
+                        // result may be undefined with legacy variants that use APIs like `modifySelectors`
+                        return result && parseVariant(result)(api);
+                    };
+                }
+                if (!isValidVariantFormatString(variantFunction)) {
+                    throw new Error(`Your custom variant \`${variantName}\` has an invalid format string. Make sure it's an at-rule or contains a \`&\` placeholder.`);
+                }
+                return parseVariant(variantFunction);
+            });
+            insertInto(variantList, variantName, options);
+            variantMap.set(variantName, variantFunctions);
         }
     };
+    if ((0, _featureFlagsJs).flagEnabled(tailwindConfig, "matchVariant")) {
+        api1.matchVariant = function(variants, options) {
+            for(let variant in variants){
+                var ref;
+                for (let [k, v] of Object.entries((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {})){
+                    api1.addVariant(`${variant}-${k}`, variants[variant](v));
+                }
+                api1.addVariant(variant, Object.assign(({ args  })=>variants[variant](args), {
+                    [MATCH_VARIANT]: true
+                }), options);
+            }
+        };
+    }
+    return api1;
 }
 let fileModifiedMapCache = new WeakMap();
 function getFileModifiedMap(context) {
@@ -561,6 +619,7 @@ function resolvePlugins(context, root) {
     let afterVariants = [
         _corePlugins.variantPlugins["directionVariants"],
         _corePlugins.variantPlugins["reducedMotionVariants"],
+        _corePlugins.variantPlugins["prefersContrastVariants"],
         _corePlugins.variantPlugins["darkVariants"],
         _corePlugins.variantPlugins["printVariant"],
         _corePlugins.variantPlugins["screenVariants"],
@@ -600,9 +659,7 @@ function registerPlugins(plugins, context) {
             plugin === null || plugin === void 0 ? void 0 : plugin(pluginApi);
         }
     }
-    let highestOffset = ((args)=>args.reduce((m, e)=>e > m ? e : m
-        )
-    )([
+    let highestOffset = ((args)=>args.reduce((m, e)=>e > m ? e : m))([
         offsets.base,
         offsets.defaults,
         offsets.components,
@@ -630,8 +687,7 @@ function registerPlugins(plugins, context) {
             variant,
             bits
         ];
-    }).sort(([, a], [, z])=>(0, _bigSign).default(a - z)
-    ));
+    }).sort(([, a], [, z])=>(0, _bigSign).default(a - z)));
     context.minimumScreen = [
         ...context.variantOrder.values()
     ].shift();
@@ -641,8 +697,7 @@ function registerPlugins(plugins, context) {
         context.variantMap.set(variantName, variantFunctions1.map((variantFunction, idx)=>[
                 sort << BigInt(idx),
                 variantFunction
-            ]
-        ));
+            ]));
     }
     var _safelist;
     let safelist = ((_safelist = context.tailwindConfig.safelist) !== null && _safelist !== void 0 ? _safelist : []).filter(Boolean);
@@ -674,15 +729,13 @@ function registerPlugins(plugins, context) {
                     let [utilName, options] = util;
                     var ref;
                     let values = Object.keys((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {});
-                    let classes = values.map((value)=>(0, _nameClass).formatClass(utilName, value)
-                    );
+                    let classes = values.map((value)=>(0, _nameClass).formatClass(utilName, value));
                     if (options === null || options === void 0 ? void 0 : options.supportsNegativeValues) {
                         // This is the normal negated version
                         // 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
                         // e.g. `tw--inset-1`
@@ -690,8 +743,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)), 
                         ];
                     }
                     return classes;

package/lib/lib/setupTrackingContext.js

@@ -15,6 +15,7 @@ var _resolveConfigPath = _interopRequireDefault(require("../util/resolveConfigPa
 var _sharedState = require("./sharedState");
 var _setupContextUtils = require("./setupContextUtils");
 var _parseDependency = _interopRequireDefault(require("../util/parseDependency"));
+var _validateConfigJs = require("../util/validateConfig.js");
 function setupTrackingContext(configOrPath) {
     return ({ tailwindDirectives , registerDependency  })=>{
         return (root, result)=>{
@@ -79,9 +80,7 @@ function getCandidateFiles(context, tailwindConfig) {
     if (candidateFilesCache.has(context)) {
         return candidateFilesCache.get(context);
     }
-    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === "string"
-    ).map((contentPath)=>(0, _normalizePath).default(contentPath)
-    );
+    let candidateFiles = tailwindConfig.content.files.filter((item)=>typeof item === "string").map((contentPath)=>(0, _normalizePath).default(contentPath));
     return candidateFilesCache.set(context, candidateFiles).get(context);
 }
 // Get the config object based on a path
@@ -89,8 +88,7 @@ function getTailwindConfig(configOrPath) {
     let userConfigPath = (0, _resolveConfigPath).default(configOrPath);
     if (userConfigPath !== null) {
         let [prevConfig, prevConfigHash, prevDeps, prevModified] = configPathCache.get(userConfigPath) || [];
-        let newDeps = (0, _getModuleDependencies).default(userConfigPath).map((dep)=>dep.file
-        );
+        let newDeps = (0, _getModuleDependencies).default(userConfigPath).map((dep)=>dep.file);
         let modified = false;
         let newModified = new Map();
         for (let file of newDeps){
@@ -114,6 +112,7 @@ function getTailwindConfig(configOrPath) {
             delete require.cache[file1];
         }
         let newConfig = (0, _resolveConfig).default(require(userConfigPath));
+        newConfig = (0, _validateConfigJs).validateConfig(newConfig);
         let newHash = (0, _hashConfig).default(newConfig);
         configPathCache.set(userConfigPath, [
             newConfig,
@@ -130,6 +129,7 @@ function getTailwindConfig(configOrPath) {
     }
     // It's a plain object, not a path
     let newConfig = (0, _resolveConfig).default(configOrPath.config === undefined ? configOrPath : configOrPath.config);
+    newConfig = (0, _validateConfigJs).validateConfig(newConfig);
     return [
         newConfig,
         null,
@@ -138,12 +138,10 @@ function getTailwindConfig(configOrPath) {
     ];
 }
 function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
-    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === "string"
-    ).map(({ raw , extension ="html"  })=>({
+    let changedContent = context.tailwindConfig.content.files.filter((item)=>typeof item.raw === "string").map(({ raw , extension ="html"  })=>({
             content: raw,
             extension
-        })
-    );
+        }));
     for (let changedFile of resolveChangedFiles(candidateFiles, fileModifiedMap)){
         let content = _fs.default.readFileSync(changedFile, "utf8");
         let extension = _path.default.extname(changedFile).slice(1);

package/lib/lib/sharedState.js

@@ -38,8 +38,7 @@ function resolveDebug(debug) {
     if (debug === "*") {
         return true;
     }
-    let debuggers = debug.split(",").map((d)=>d.split(":")[0]
-    );
+    let debuggers = debug.split(",").map((d)=>d.split(":")[0]);
     // Ignoring tailwindcss
     if (debuggers.includes("-tailwindcss")) {
         return false;

package/lib/lib/substituteScreenAtRules.js

@@ -15,8 +15,7 @@ function _default({ tailwindConfig: { theme  }  }) {
         css.walkAtRules("screen", (atRule)=>{
             let screen = atRule.params;
             let screens = (0, _normalizeScreens).normalizeScreens(theme.screens);
-            let screenDefinition = screens.find(({ name  })=>name === screen
-            );
+            let screenDefinition = screens.find(({ name  })=>name === screen);
             if (!screenDefinition) {
                 throw atRule.error(`No \`${screen}\` screen found.`);
             }

package/lib/postcss-plugins/nesting/plugin.js

@@ -67,8 +67,7 @@ function nesting(opts = _postcssNested.default) {
             }
             // Traverse the tree down to the leaf nodes
             if (node.nodes) {
-                node.nodes.forEach((n)=>markDirty(n)
-                );
+                node.nodes.forEach((n)=>markDirty(n));
             }
             // If it's a leaf node mark it as dirty
             // We do this here because marking a node as dirty

package/lib/util/buildMediaQuery.js

@@ -15,6 +15,5 @@ function buildMediaQuery(screens) {
                 screen.min && `(min-width: ${screen.min})`,
                 screen.max && `(max-width: ${screen.max})`, 
             ].filter(Boolean).join(" and ");
-        })
-    ).join(", ");
+        })).join(", ");
 }

package/lib/util/cloneDeep.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.cloneDeep = cloneDeep;
 function cloneDeep(value) {
     if (Array.isArray(value)) {
-        return value.map((child)=>cloneDeep(child)
-        );
+        return value.map((child)=>cloneDeep(child));
     }
     if (typeof value === "object" && value !== null) {
         return Object.fromEntries(Object.entries(value).map(([k, v])=>[
                 k,
                 cloneDeep(v)
-            ]
-        ));
+            ]));
     }
     return value;
 }

package/lib/util/color.js

@@ -16,9 +16,10 @@ let VALUE = /(?:\d+|\d*\.\d+)%?/;
 let SEP = /(?:\s*,\s*|\s+)/;
 let ALPHA_SEP = /\s*[,/]\s*/;
 let CUSTOM_PROPERTY = /var\(--(?:[^ )]*?)\)/;
-let RGB = new RegExp(`^rgba?\\(\\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(`^hsla?\\(\\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) {
+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;
     }
@@ -37,8 +38,7 @@ function parseColor(value) {
     if (value in _colorName.default) {
         return {
             mode: "rgb",
-            color: _colorName.default[value].map((v)=>v.toString()
-            )
+            color: _colorName.default[value].map((v)=>v.toString())
         };
     }
     let hex = value.replace(SHORT_HEX, (_, r, g, b, a)=>[
@@ -50,8 +50,7 @@ function parseColor(value) {
             b,
             b,
             a ? a + a : ""
-        ].join("")
-    ).match(HEX);
+        ].join("")).match(HEX);
     if (hex !== null) {
         return {
             mode: "rgb",
@@ -59,40 +58,31 @@ function parseColor(value) {
                 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;

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

@@ -36,8 +36,7 @@ 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)
             });
         }
     };

package/lib/util/dataTypes.js

@@ -41,27 +41,29 @@ function normalize(value, isRoot = true) {
         }).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(");
 }
 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 value.split(UNDERSCORE).every((part)=>{
-        return /%$/g.test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?%`).test(part)
-        );
+        return /%$/g.test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?%`).test(part));
     });
 }
 let lengthUnits = [
@@ -85,8 +87,7 @@ let lengthUnits = [
 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([
@@ -111,7 +112,9 @@ function color(value) {
     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 ((0, _color).parseColor(part, {
+            loose: true
+        }) !== null) return colors++, true;
         return false;
     });
     if (!result) return false;
@@ -127,8 +130,7 @@ function image(value) {
             "image(",
             "cross-fade(",
             "image-set("
-        ].some((fn)=>part.startsWith(fn)
-        )) {
+        ].some((fn)=>part.startsWith(fn))) {
             images++;
             return true;
         }

package/lib/util/flattenColorPalette.js

@@ -5,13 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 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
-            })
-        ) : [
+            })) : [
             {
                 [`${color}`]: values
             }
-        ]
-    ))
-;
+        ]));
 var _default = flattenColorPalette;
 exports.default = _default;