tailwindcss 0.0.0-insiders.ddec022 → 0.0.0-insiders.de00a62

package/lib/cli/build/plugin.js

@@ -192,14 +192,14 @@ let state = {
         return content;
     },
     getContext ({ createContext , cliConfigPath , root , result , content  }) {
-        if (this.context) {
-            this.context.changedContent = this.changedContent.splice(0);
-            return this.context;
-        }
         _sharedState.env.DEBUG && console.time("Searching for config");
         var _findAtConfigPath1;
         let configPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : cliConfigPath;
         _sharedState.env.DEBUG && console.timeEnd("Searching for config");
+        if (this.context) {
+            this.context.changedContent = this.changedContent.splice(0);
+            return this.context;
+        }
         _sharedState.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
         _sharedState.env.DEBUG && console.timeEnd("Loading config");
@@ -245,9 +245,9 @@ async function createProcessor(args, cliConfigPath) {
     let tailwindPlugin = ()=>{
         return {
             postcssPlugin: "tailwindcss",
-            Once (root, { result  }) {
+            async Once (root, { result  }) {
                 _sharedState.env.DEBUG && console.time("Compiling CSS");
-                (0, _processTailwindFeatures.default)(({ createContext  })=>{
+                await (0, _processTailwindFeatures.default)(({ createContext  })=>{
                     console.error();
                     console.error("Rebuilding...");
                     return ()=>{

package/lib/cli/build/watching.js

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

package/lib/corePluginList.js

@@ -32,6 +32,7 @@ const _default = [
     "lineClamp",
     "display",
     "aspectRatio",
+    "size",
     "height",
     "maxHeight",
     "minHeight",
@@ -98,6 +99,7 @@ const _default = [
     "textOverflow",
     "hyphens",
     "whitespace",
+    "textWrap",
     "wordBreak",
     "borderRadius",
     "borderWidth",
@@ -183,5 +185,7 @@ const _default = [
     "transitionDuration",
     "transitionTimingFunction",
     "willChange",
-    "content"
+    "contain",
+    "content",
+    "forcedColorAdjust"
 ];

package/lib/corePlugins.js

@@ -35,6 +35,7 @@ const _parseBoxShadowValue = require("./util/parseBoxShadowValue");
 const _removeAlphaVariables = require("./util/removeAlphaVariables");
 const _featureFlags = require("./featureFlags");
 const _dataTypes = require("./util/dataTypes");
+const _setupContextUtils = require("./lib/setupContextUtils");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -80,6 +81,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 let variantPlugins = {
+    childVariant: ({ addVariant  })=>{
+        addVariant("*", "& > *");
+    },
     pseudoElementVariants: ({ addVariant  })=>{
         addVariant("first-letter", "&::first-letter");
         addVariant("first-line", "&::first-line");
@@ -135,7 +139,7 @@ let variantPlugins = {
             return "&::after";
         });
     },
-    pseudoClassVariants: ({ addVariant , matchVariant , config  })=>{
+    pseudoClassVariants: ({ addVariant , matchVariant , config , prefix  })=>{
         let pseudoVariants = [
             // Positional
             [
@@ -216,17 +220,17 @@ let variantPlugins = {
         }
         let variants = {
             group: (_, { modifier  })=>modifier ? [
-                    `:merge(.group\\/${(0, _escapeClassName.default)(modifier)})`,
+                    `:merge(${prefix(".group")}\\/${(0, _escapeClassName.default)(modifier)})`,
                     " &"
                 ] : [
-                    `:merge(.group)`,
+                    `:merge(${prefix(".group")})`,
                     " &"
                 ],
             peer: (_, { modifier  })=>modifier ? [
-                    `:merge(.peer\\/${(0, _escapeClassName.default)(modifier)})`,
+                    `:merge(${prefix(".peer")}\\/${(0, _escapeClassName.default)(modifier)})`,
                     " ~ &"
                 ] : [
-                    `:merge(.peer)`,
+                    `:merge(${prefix(".peer")})`,
                     " ~ &"
                 ]
         };
@@ -255,20 +259,23 @@ let variantPlugins = {
                 // result.replace(/&(\S+)?/g, (_, pseudo = '') => a + pseudo + b)
                 return result.slice(0, start) + a + result.slice(start + 1, end) + b + result.slice(end);
             }, {
-                values: Object.fromEntries(pseudoVariants)
+                values: Object.fromEntries(pseudoVariants),
+                [_setupContextUtils.INTERNAL_FEATURES]: {
+                    respectPrefix: false
+                }
             });
         }
     },
     directionVariants: ({ addVariant  })=>{
-        addVariant("ltr", ':is([dir="ltr"] &)');
-        addVariant("rtl", ':is([dir="rtl"] &)');
+        addVariant("ltr", '&:where([dir="ltr"], [dir="ltr"] *)');
+        addVariant("rtl", '&:where([dir="rtl"], [dir="rtl"] *)');
     },
     reducedMotionVariants: ({ addVariant  })=>{
         addVariant("motion-safe", "@media (prefers-reduced-motion: no-preference)");
         addVariant("motion-reduce", "@media (prefers-reduced-motion: reduce)");
     },
     darkVariants: ({ config , addVariant  })=>{
-        let [mode, className = ".dark"] = [].concat(config("darkMode", "media"));
+        let [mode, selector = ".dark"] = [].concat(config("darkMode", "media"));
         if (mode === false) {
             mode = "media";
             _log.default.warn("darkmode-false", [
@@ -277,10 +284,48 @@ let variantPlugins = {
                 "https://tailwindcss.com/docs/upgrade-guide#remove-dark-mode-configuration"
             ]);
         }
-        if (mode === "class") {
-            addVariant("dark", `:is(${className} &)`);
+        if (mode === "variant") {
+            let formats;
+            if (Array.isArray(selector)) {
+                formats = selector;
+            } else if (typeof selector === "function") {
+                formats = selector;
+            } else if (typeof selector === "string") {
+                formats = [
+                    selector
+                ];
+            }
+            // TODO: We could also add these warnings if the user passes a function that returns string | string[]
+            // But this is an advanced enough use case that it's probably not necessary
+            if (Array.isArray(formats)) {
+                for (let format of formats){
+                    if (format === ".dark") {
+                        mode = false;
+                        _log.default.warn("darkmode-variant-without-selector", [
+                            "When using `variant` for `darkMode`, you must provide a selector.",
+                            'Example: `darkMode: ["variant", ".your-selector &"]`'
+                        ]);
+                    } else if (!format.includes("&")) {
+                        mode = false;
+                        _log.default.warn("darkmode-variant-without-ampersand", [
+                            "When using `variant` for `darkMode`, your selector must contain `&`.",
+                            'Example `darkMode: ["variant", ".your-selector &"]`'
+                        ]);
+                    }
+                }
+            }
+            selector = formats;
+        }
+        if (mode === "selector") {
+            // New preferred behavior
+            addVariant("dark", `&:where(${selector}, ${selector} *)`);
         } else if (mode === "media") {
             addVariant("dark", "@media (prefers-color-scheme: dark)");
+        } else if (mode === "variant") {
+            addVariant("dark", selector);
+        } else if (mode === "class") {
+            // Old behavior
+            addVariant("dark", `:is(${selector} &)`);
         }
     },
     printVariant: ({ addVariant  })=>{
@@ -415,6 +460,17 @@ let variantPlugins = {
             values: (_theme = theme("supports")) !== null && _theme !== void 0 ? _theme : {}
         });
     },
+    hasVariants: ({ matchVariant  })=>{
+        matchVariant("has", (value)=>`&:has(${(0, _dataTypes.normalize)(value)})`, {
+            values: {}
+        });
+        matchVariant("group-has", (value, { modifier  })=>modifier ? `:merge(.group\\/${modifier}):has(${(0, _dataTypes.normalize)(value)}) &` : `:merge(.group):has(${(0, _dataTypes.normalize)(value)}) &`, {
+            values: {}
+        });
+        matchVariant("peer-has", (value, { modifier  })=>modifier ? `:merge(.peer\\/${modifier}):has(${(0, _dataTypes.normalize)(value)}) ~ &` : `:merge(.peer):has(${(0, _dataTypes.normalize)(value)}) ~ &`, {
+            values: {}
+        });
+    },
     ariaVariants: ({ matchVariant , theme  })=>{
         var _theme;
         matchVariant("aria", (value)=>`&[aria-${(0, _dataTypes.normalize)(value)}]`, {
@@ -450,6 +506,9 @@ let variantPlugins = {
     prefersContrastVariants: ({ addVariant  })=>{
         addVariant("contrast-more", "@media (prefers-contrast: more)");
         addVariant("contrast-less", "@media (prefers-contrast: less)");
+    },
+    forcedColorsVariants: ({ addVariant  })=>{
+        addVariant("forced-colors", "@media (forced-colors: active)");
     }
 };
 let cssTransformValue = [
@@ -770,6 +829,12 @@ let corePlugins = {
     ]),
     float: ({ addUtilities  })=>{
         addUtilities({
+            ".float-start": {
+                float: "inline-start"
+            },
+            ".float-end": {
+                float: "inline-end"
+            },
             ".float-right": {
                 float: "right"
             },
@@ -783,6 +848,12 @@ let corePlugins = {
     },
     clear: ({ addUtilities  })=>{
         addUtilities({
+            ".clear-start": {
+                clear: "inline-start"
+            },
+            ".clear-end": {
+                clear: "inline-end"
+            },
             ".clear-left": {
                 clear: "left"
             },
@@ -966,6 +1037,15 @@ let corePlugins = {
             ]
         ]
     ]),
+    size: (0, _createUtilityPlugin.default)("size", [
+        [
+            "size",
+            [
+                "width",
+                "height"
+            ]
+        ]
+    ]),
     height: (0, _createUtilityPlugin.default)("height", [
         [
             "h",
@@ -1283,7 +1363,7 @@ let corePlugins = {
         });
     },
     animation: ({ matchUtilities , theme , config  })=>{
-        let prefixName = (name)=>`${config("prefix")}${(0, _escapeClassName.default)(name)}`;
+        let prefixName = (name)=>(0, _escapeClassName.default)(config("prefix") + name);
         var _theme;
         let keyframes = Object.fromEntries(Object.entries((_theme = theme("keyframes")) !== null && _theme !== void 0 ? _theme : {}).map(([key, value])=>{
             return [
@@ -1609,6 +1689,9 @@ let corePlugins = {
         addUtilities({
             ".appearance-none": {
                 appearance: "none"
+            },
+            ".appearance-auto": {
+                appearance: "auto"
             }
         });
     },
@@ -2293,6 +2376,22 @@ let corePlugins = {
             }
         });
     },
+    textWrap: ({ addUtilities  })=>{
+        addUtilities({
+            ".text-wrap": {
+                "text-wrap": "wrap"
+            },
+            ".text-nowrap": {
+                "text-wrap": "nowrap"
+            },
+            ".text-balance": {
+                "text-wrap": "balance"
+            },
+            ".text-pretty": {
+                "text-wrap": "pretty"
+            }
+        });
+    },
     wordBreak: ({ addUtilities  })=>{
         addUtilities({
             ".break-normal": {
@@ -3593,6 +3692,9 @@ let corePlugins = {
             ".mix-blend-luminosity": {
                 "mix-blend-mode": "luminosity"
             },
+            ".mix-blend-plus-darker": {
+                "mix-blend-mode": "plus-darker"
+            },
             ".mix-blend-plus-lighter": {
                 "mix-blend-mode": "plus-lighter"
             }
@@ -4158,6 +4260,51 @@ let corePlugins = {
             ]
         ]
     ]),
+    contain: ({ addDefaults , addUtilities  })=>{
+        let cssContainValue = "var(--tw-contain-size) var(--tw-contain-layout) var(--tw-contain-paint) var(--tw-contain-style)";
+        addDefaults("contain", {
+            "--tw-contain-size": " ",
+            "--tw-contain-layout": " ",
+            "--tw-contain-paint": " ",
+            "--tw-contain-style": " "
+        });
+        addUtilities({
+            ".contain-none": {
+                contain: "none"
+            },
+            ".contain-content": {
+                contain: "content"
+            },
+            ".contain-strict": {
+                contain: "strict"
+            },
+            ".contain-size": {
+                "@defaults contain": {},
+                "--tw-contain-size": "size",
+                contain: cssContainValue
+            },
+            ".contain-inline-size": {
+                "@defaults contain": {},
+                "--tw-contain-size": "inline-size",
+                contain: cssContainValue
+            },
+            ".contain-layout": {
+                "@defaults contain": {},
+                "--tw-contain-layout": "layout",
+                contain: cssContainValue
+            },
+            ".contain-paint": {
+                "@defaults contain": {},
+                "--tw-contain-paint": "paint",
+                contain: cssContainValue
+            },
+            ".contain-style": {
+                "@defaults contain": {},
+                "--tw-contain-style": "style",
+                contain: cssContainValue
+            }
+        });
+    },
     content: (0, _createUtilityPlugin.default)("content", [
         [
             "content",
@@ -4169,5 +4316,15 @@ let corePlugins = {
                 ]
             ]
         ]
-    ])
+    ]),
+    forcedColorAdjust: ({ addUtilities  })=>{
+        addUtilities({
+            ".forced-color-adjust-auto": {
+                "forced-color-adjust": "auto"
+            },
+            ".forced-color-adjust-none": {
+                "forced-color-adjust": "none"
+            }
+        });
+    }
 };

package/lib/css/preflight.css

@@ -24,16 +24,19 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
+7. Disable tap highlights on iOS
 */
 
-html {
+html,
+:host {
   line-height: 1.5; /* 1 */
   -webkit-text-size-adjust: 100%; /* 2 */
   -moz-tab-size: 4; /* 3 */
   tab-size: 4; /* 3 */
-  font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
+  font-family: theme('fontFamily.sans', ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"); /* 4 */
   font-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
   font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
+  -webkit-tap-highlight-color: transparent; /* 7 */
 }
 
 /*
@@ -99,8 +102,10 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font family by default.
-2. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font-family by default.
+2. Use the user's configured `mono` font-feature-settings by default.
+3. Use the user's configured `mono` font-variation-settings by default.
+4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -108,7 +113,9 @@ kbd,
 samp,
 pre {
   font-family: theme('fontFamily.mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace); /* 1 */
-  font-size: 1em; /* 2 */
+  font-feature-settings: theme('fontFamily.mono[1].fontFeatureSettings', normal); /* 2 */
+  font-variation-settings: theme('fontFamily.mono[1].fontVariationSettings', normal); /* 3 */
+  font-size: 1em; /* 4 */
 }
 
 /*
@@ -163,6 +170,8 @@ optgroup,
 select,
 textarea {
   font-family: inherit; /* 1 */
+  font-feature-settings: inherit; /* 1 */
+  font-variation-settings: inherit; /* 1 */
   font-size: 100%; /* 1 */
   font-weight: inherit; /* 1 */
   line-height: inherit; /* 1 */
@@ -186,9 +195,9 @@ select {
 */
 
 button,
-[type='button'],
-[type='reset'],
-[type='submit'] {
+input:where([type='button']),
+input:where([type='reset']),
+input:where([type='submit']) {
   -webkit-appearance: button; /* 1 */
   background-color: transparent; /* 2 */
   background-image: none; /* 2 */
@@ -300,6 +309,13 @@ menu {
   padding: 0;
 }
 
+/*
+Reset default styling for dialogs.
+*/
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */

package/lib/lib/content.js

@@ -21,7 +21,6 @@ const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _isglob = /*#__PURE__*/ _interop_require_default(require("is-glob"));
 const _fastglob = /*#__PURE__*/ _interop_require_default(require("fast-glob"));
-const _normalizepath = /*#__PURE__*/ _interop_require_default(require("normalize-path"));
 const _parseGlob = require("../util/parseGlob");
 const _sharedState = require("./sharedState");
 function _interop_require_default(obj) {
@@ -29,11 +28,42 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
+/*!
+ * Modified version of normalize-path, original license below
+ *
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Copyright (c) 2014-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */ function normalizePath(path) {
+    if (typeof path !== "string") {
+        throw new TypeError("expected path to be a string");
+    }
+    if (path === "\\" || path === "/") return "/";
+    var len = path.length;
+    if (len <= 1) return path;
+    // ensure that win32 namespaces has two leading slashes, so that the path is
+    // handled properly by the win32 version of path.parse() after being normalized
+    // https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+    var prefix = "";
+    if (len > 4 && path[3] === "\\") {
+        var ch = path[2];
+        if ((ch === "?" || ch === ".") && path.slice(0, 2) === "\\\\") {
+            path = path.slice(2);
+            prefix = "//";
+        }
+    }
+    // Modified part: instead of purely splitting on `\\` and `/`, we split on
+    // `/` and `\\` that is _not_ followed by any of the following characters: ()[]
+    // This is to ensure that we keep the escaping of brackets and parentheses
+    let segs = path.split(/[/\\]+(?![\(\)\[\]])/);
+    return prefix + segs.join("/");
+}
 function parseCandidateFiles(context, tailwindConfig) {
     let files = tailwindConfig.content.files;
     // Normalize the file globs
     files = files.filter((filePath)=>typeof filePath === "string");
-    files = files.map(_normalizepath.default);
+    files = files.map(normalizePath);
     // Split into included and excluded globs
     let tasks = _fastglob.default.generateTasks(files);
     /** @type {ContentPath[]} */ let included = [];
@@ -60,6 +90,9 @@ function parseCandidateFiles(context, tailwindConfig) {
  * @param {boolean} ignore
  * @returns {ContentPath}
  */ function parseFilePath(filePath, ignore) {
+    // Escape special characters in the file path such as: ()[]
+    // But only if the special character isn't already escaped
+    filePath = filePath.replace(/(?<!\\)([\[\]\(\)])/g, "\\$1");
     let contentPath = {
         original: filePath,
         base: filePath,
@@ -81,7 +114,7 @@ function parseCandidateFiles(context, tailwindConfig) {
     // Afaik, this technically shouldn't be needed but there's probably
     // some internal, direct path matching with a normalized path in
     // a package which can't handle mixed directory separators
-    let base = (0, _normalizepath.default)(contentPath.base);
+    let base = normalizePath(contentPath.base);
     // If the user's file path contains any special characters (like parens) for instance fast-glob
     // is like "OOOH SHINY" and treats them as such. So we have to escape the base path to fix this
     base = _fastglob.default.escapePath(base);

package/lib/lib/defaultExtractor.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "defaultExtractor", {
         return defaultExtractor;
     }
 });
-const _featureFlags = require("../featureFlags");
 const _regex = /*#__PURE__*/ _interop_require_wildcard(require("./regex"));
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
@@ -57,17 +56,15 @@ function defaultExtractor(context) {
         /** @type {(string|string)[]} */ let results = [];
         for (let pattern of patterns){
             var _content_match;
-            results = [
-                ...results,
-                ...(_content_match = content.match(pattern)) !== null && _content_match !== void 0 ? _content_match : []
-            ];
+            for (let result of (_content_match = content.match(pattern)) !== null && _content_match !== void 0 ? _content_match : []){
+                results.push(clipAtBalancedParens(result));
+            }
         }
-        return results.filter((v)=>v !== undefined).map(clipAtBalancedParens);
+        return results;
     };
 }
 function* buildRegExps(context) {
     let separator = context.tailwindConfig.separator;
-    let variantGroupingEnabled = (0, _featureFlags.flagEnabled)(context.tailwindConfig, "variantGrouping");
     let prefix = context.tailwindConfig.prefix !== "" ? _regex.optional(_regex.pattern([
         /-?/,
         _regex.escape(context.tailwindConfig.prefix)
@@ -79,16 +76,25 @@ function* buildRegExps(context) {
         // This is a targeted fix to continue to allow theme()
         // with square brackets to work in arbitrary properties
         // while fixing a problem with the regex matching too much
-        /\[[^\s:'"`]+:[^\s]+?\[[^\s]+\][^\s]+?\]/,
+        /\[[^\s:'"`\]]+:[^\s]+?\[[^\s]+\][^\s]+?\]/,
         // Utilities
         _regex.pattern([
             // Utility Name / Group Name
-            /-?(?:\w+)/,
+            _regex.any([
+                /-?(?:\w+)/,
+                // This is here to make sure @container supports everything that other utilities do
+                /@(?:\w+)/
+            ]),
             // Normal/Arbitrary values
             _regex.optional(_regex.any([
                 _regex.pattern([
                     // Arbitrary values
-                    /-(?:\w+-)*\[[^\s:]+\]/,
+                    _regex.any([
+                        /-(?:\w+-)*\['[^\s]+'\]/,
+                        /-(?:\w+-)*\["[^\s]+"\]/,
+                        /-(?:\w+-)*\[`[^\s]+`\]/,
+                        /-(?:\w+-)*\[(?:[^\s\[\]]+\[[^\s\[\]]+\])*[^\s:\[\]]+\]/
+                    ]),
                     // Not immediately followed by an `{[(`
                     /(?![{([]])/,
                     // optionally followed by an opacity modifier
@@ -96,7 +102,12 @@ function* buildRegExps(context) {
                 ]),
                 _regex.pattern([
                     // Arbitrary values
-                    /-(?:\w+-)*\[[^\s]+\]/,
+                    _regex.any([
+                        /-(?:\w+-)*\['[^\s]+'\]/,
+                        /-(?:\w+-)*\["[^\s]+"\]/,
+                        /-(?:\w+-)*\[`[^\s]+`\]/,
+                        /-(?:\w+-)*\[(?:[^\s\[\]]+\[[^\s\[\]]+\])*[^\s\[\]]+\]/
+                    ]),
                     // Not immediately followed by an `{[(`
                     /(?![{([]])/,
                     // optionally followed by an opacity modifier
@@ -115,6 +126,11 @@ function* buildRegExps(context) {
                 /@\[[^\s"'`]+\](\/[^\s"'`]+)?/,
                 separator
             ]),
+            // With variant modifier (e.g.: group-[..]/modifier)
+            _regex.pattern([
+                /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]\/\w+/,
+                separator
+            ]),
             _regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
                 separator
@@ -126,6 +142,11 @@ function* buildRegExps(context) {
         ]),
         // With quotes allowed
         _regex.any([
+            // With variant modifier (e.g.: group-[..]/modifier)
+            _regex.pattern([
+                /([^\s"'`\[\\]+-)?\[[^\s`]+\]\/\w+/,
+                separator
+            ]),
             _regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s`]+\]/,
                 separator
@@ -145,20 +166,7 @@ function* buildRegExps(context) {
             // Important (optional)
             /!?/,
             prefix,
-            variantGroupingEnabled ? _regex.any([
-                // Or any of those things but grouped separated by commas
-                _regex.pattern([
-                    /\(/,
-                    utility,
-                    _regex.zeroOrMore([
-                        /,/,
-                        utility
-                    ]),
-                    /\)/
-                ]),
-                // Arbitrary properties, constrained utilities, arbitrary values, etc…
-                utility
-            ]) : utility
+            utility
         ]);
     }
     // 5. Inner matches

package/lib/lib/evaluateTailwindFunctions.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
 const _dlv = /*#__PURE__*/ _interop_require_default(require("dlv"));
 const _didyoumean = /*#__PURE__*/ _interop_require_default(require("didyoumean"));
 const _transformThemeValue = /*#__PURE__*/ _interop_require_default(require("../util/transformThemeValue"));
-const _postcssvalueparser = /*#__PURE__*/ _interop_require_default(require("postcss-value-parser"));
+const _index = /*#__PURE__*/ _interop_require_default(require("../value-parser/index"));
 const _normalizeScreens = require("../util/normalizeScreens");
 const _buildMediaQuery = /*#__PURE__*/ _interop_require_default(require("../util/buildMediaQuery"));
 const _toPath = require("../util/toPath");
@@ -121,7 +121,7 @@ function extractArgs(node, vNodes, functions) {
         if (vNode.type === "div" && vNode.value === ",") {
             args.push("");
         } else {
-            args[args.length - 1] += _postcssvalueparser.default.stringify(vNode);
+            args[args.length - 1] += _index.default.stringify(vNode);
         }
     }
     return args;
@@ -135,7 +135,9 @@ function resolveVNode(node, vNode, functions) {
     return vNode;
 }
 function resolveFunctions(node, input, functions) {
-    return (0, _postcssvalueparser.default)(input).walk((vNode)=>{
+    let hasAnyFn = Object.keys(functions).some((fn)=>input.includes(`${fn}(`));
+    if (!hasAnyFn) return input;
+    return (0, _index.default)(input).walk((vNode)=>{
         resolveVNode(node, vNode, functions);
     }).toString();
 }