tailwindcss 3.2.3 → 3.2.5

package/lib/cli.js

@@ -1,229 +1,7 @@
 #!/usr/bin/env node
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _arg = /*#__PURE__*/ _interopRequireDefault(require("arg"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _build = require("./cli/build");
-const _help = require("./cli/help");
-const _init = require("./cli/init");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
+if (process.env.OXIDE) {
+    module.exports = require("./oxide/cli");
+} else {
+    module.exports = require("./cli/index");
 }
-function isESM() {
-    const pkgPath = _path.default.resolve("./package.json");
-    try {
-        let pkg = JSON.parse(_fs.default.readFileSync(pkgPath, "utf8"));
-        return pkg.type && pkg.type === "module";
-    } catch (err) {
-        return false;
-    }
-}
-let configs = isESM() ? {
-    tailwind: "tailwind.config.cjs",
-    postcss: "postcss.config.cjs"
-} : {
-    tailwind: "tailwind.config.js",
-    postcss: "postcss.config.js"
-};
-// ---
-function oneOf(...options) {
-    return Object.assign((value = true)=>{
-        for (let option of options){
-            let parsed = option(value);
-            if (parsed === value) {
-                return parsed;
-            }
-        }
-        throw new Error("...");
-    }, {
-        manualParsing: true
-    });
-}
-let commands = {
-    init: {
-        run: _init.init,
-        args: {
-            "--full": {
-                type: Boolean,
-                description: `Initialize a full \`${configs.tailwind}\` file`
-            },
-            "--postcss": {
-                type: Boolean,
-                description: `Initialize a \`${configs.postcss}\` file`
-            },
-            "-f": "--full",
-            "-p": "--postcss"
-        }
-    },
-    build: {
-        run: _build.build,
-        args: {
-            "--input": {
-                type: String,
-                description: "Input file"
-            },
-            "--output": {
-                type: String,
-                description: "Output file"
-            },
-            "--watch": {
-                type: Boolean,
-                description: "Watch for changes and rebuild as needed"
-            },
-            "--poll": {
-                type: Boolean,
-                description: "Use polling instead of filesystem events when watching"
-            },
-            "--content": {
-                type: String,
-                description: "Content paths to use for removing unused classes"
-            },
-            "--purge": {
-                type: String,
-                deprecated: true
-            },
-            "--postcss": {
-                type: oneOf(String, Boolean),
-                description: "Load custom PostCSS configuration"
-            },
-            "--minify": {
-                type: Boolean,
-                description: "Minify the output"
-            },
-            "--config": {
-                type: String,
-                description: "Path to a custom config file"
-            },
-            "--no-autoprefixer": {
-                type: Boolean,
-                description: "Disable autoprefixer"
-            },
-            "-c": "--config",
-            "-i": "--input",
-            "-o": "--output",
-            "-m": "--minify",
-            "-w": "--watch",
-            "-p": "--poll"
-        }
-    }
-};
-let sharedFlags = {
-    "--help": {
-        type: Boolean,
-        description: "Display usage information"
-    },
-    "-h": "--help"
-};
-if (process.stdout.isTTY /* Detect redirecting output to a file */  && (process.argv[2] === undefined || process.argv.slice(2).every((flag)=>sharedFlags[flag] !== undefined))) {
-    (0, _help.help)({
-        usage: [
-            "tailwindcss [--input input.css] [--output output.css] [--watch] [options...]",
-            "tailwindcss init [--full] [--postcss] [options...]"
-        ],
-        commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
-        options: {
-            ...commands.build.args,
-            ...sharedFlags
-        }
-    });
-    process.exit(0);
-}
-let command = ((arg = "")=>arg.startsWith("-") ? undefined : arg)(process.argv[2]) || "build";
-if (commands[command] === undefined) {
-    if (_fs.default.existsSync(_path.default.resolve(command))) {
-        // TODO: Deprecate this in future versions
-        // Check if non-existing command, might be a file.
-        command = "build";
-    } else {
-        (0, _help.help)({
-            message: `Invalid command: ${command}`,
-            usage: [
-                "tailwindcss <command> [options]"
-            ],
-            commands: Object.keys(commands).filter((command)=>command !== "build").map((command)=>`${command} [options]`),
-            options: sharedFlags
-        });
-        process.exit(1);
-    }
-}
-// Execute command
-let { args: flags , run  } = commands[command];
-let args = (()=>{
-    try {
-        let result = (0, _arg.default)(Object.fromEntries(Object.entries({
-            ...flags,
-            ...sharedFlags
-        }).filter(([_key, value])=>{
-            var ref;
-            return !(value === null || value === void 0 ? void 0 : (ref = value.type) === null || ref === void 0 ? void 0 : ref.manualParsing);
-        }).map(([key, value])=>[
-                key,
-                typeof value === "object" ? value.type : value
-            ])), {
-            permissive: true
-        });
-        // Manual parsing of flags to allow for special flags like oneOf(Boolean, String)
-        for(let i = result["_"].length - 1; i >= 0; --i){
-            let flag = result["_"][i];
-            if (!flag.startsWith("-")) continue;
-            let flagName = flag;
-            let handler = flags[flag];
-            // Resolve flagName & handler
-            while(typeof handler === "string"){
-                flagName = handler;
-                handler = flags[handler];
-            }
-            if (!handler) continue;
-            let args = [];
-            let offset = i + 1;
-            // Parse args for current flag
-            while(result["_"][offset] && !result["_"][offset].startsWith("-")){
-                args.push(result["_"][offset++]);
-            }
-            // Cleanup manually parsed flags + args
-            result["_"].splice(i, 1 + args.length);
-            // Set the resolved value in the `result` object
-            result[flagName] = handler.type(args.length === 0 ? undefined : args.length === 1 ? args[0] : args, flagName);
-        }
-        // Ensure that the `command` is always the first argument in the `args`.
-        // This is important so that we don't have to check if a default command
-        // (build) was used or not from within each plugin.
-        //
-        // E.g.: tailwindcss input.css -> _: ['build', 'input.css']
-        // E.g.: tailwindcss build input.css -> _: ['build', 'input.css']
-        if (result["_"][0] !== command) {
-            result["_"].unshift(command);
-        }
-        return result;
-    } catch (err) {
-        if (err.code === "ARG_UNKNOWN_OPTION") {
-            (0, _help.help)({
-                message: err.message,
-                usage: [
-                    "tailwindcss <command> [options]"
-                ],
-                options: sharedFlags
-            });
-            process.exit(1);
-        }
-        throw err;
-    }
-})();
-if (args["--help"]) {
-    (0, _help.help)({
-        options: {
-            ...flags,
-            ...sharedFlags
-        },
-        usage: [
-            `tailwindcss ${command} [options]`
-        ]
-    });
-    process.exit(0);
-}
-run(args, configs);

package/lib/corePlugins.js

@@ -212,14 +212,14 @@ let variantPlugins = {
         }
         let variants = {
             group: (_, { modifier  })=>modifier ? [
-                    `:merge(.group\\/${modifier})`,
+                    `:merge(.group\\/${(0, _escapeClassName.default)(modifier)})`,
                     " &"
                 ] : [
                     `:merge(.group)`,
                     " &"
                 ],
             peer: (_, { modifier  })=>modifier ? [
-                    `:merge(.peer\\/${modifier})`,
+                    `:merge(.peer\\/${(0, _escapeClassName.default)(modifier)})`,
                     " ~ &"
                 ] : [
                     `:merge(.peer)`,
@@ -231,7 +231,25 @@ let variantPlugins = {
                 let result = (0, _dataTypes.normalize)(typeof value === "function" ? value(extra) : value);
                 if (!result.includes("&")) result = "&" + result;
                 let [a, b] = fn("", extra);
-                return result.replace(/&(\S+)?/g, (_, pseudo = "")=>a + pseudo + b);
+                let start = null;
+                let end = null;
+                let quotes = 0;
+                for(let i = 0; i < result.length; ++i){
+                    let c = result[i];
+                    if (c === "&") {
+                        start = i;
+                    } else if (c === "'" || c === '"') {
+                        quotes += 1;
+                    } else if (start !== null && c === " " && !quotes) {
+                        end = i;
+                    }
+                }
+                if (start !== null && end === null) {
+                    end = result.length;
+                }
+                // Basically this but can handle quotes:
+                // 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)
             });
@@ -277,15 +295,15 @@ let variantPlugins = {
         addVariant("print", "@media print");
     },
     screenVariants: ({ theme , addVariant , matchVariant  })=>{
-        var ref;
-        let rawScreens = (ref = theme("screens")) !== null && ref !== void 0 ? ref : {};
+        var _theme;
+        let rawScreens = (_theme = theme("screens")) !== null && _theme !== void 0 ? _theme : {};
         let areSimpleScreens = Object.values(rawScreens).every((v)=>typeof v === "string");
         let screens = (0, _normalizeScreens.normalizeScreens)(theme("screens"));
         /** @type {Set<string>} */ let unitCache = new Set([]);
         /** @param {string} value */ function units(value) {
-            var ref;
-            var ref1;
-            return (ref1 = (ref = value.match(/(\D+)$/)) === null || ref === void 0 ? void 0 : ref[1]) !== null && ref1 !== void 0 ? ref1 : "(none)";
+            var _value_match;
+            var _value_match_;
+            return (_value_match_ = (_value_match = value.match(/(\D+)$/)) === null || _value_match === void 0 ? void 0 : _value_match[1]) !== null && _value_match_ !== void 0 ? _value_match_ : "(none)";
         }
         /** @param {string} value */ function recordUnits(value) {
             if (value !== undefined) {
@@ -384,7 +402,7 @@ let variantPlugins = {
         });
     },
     supportsVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("supports", (value = "")=>{
             let check = (0, _dataTypes.normalize)(value);
             let isRaw = /^\w*\s*\(/.test(check);
@@ -402,35 +420,35 @@ let variantPlugins = {
             }
             return `@supports ${check}`;
         }, {
-            values: (ref = theme("supports")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("supports")) !== null && _theme !== void 0 ? _theme : {}
         });
     },
     ariaVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("aria", (value)=>`&[aria-${(0, _dataTypes.normalize)(value)}]`, {
-            values: (ref = theme("aria")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("aria")) !== null && _theme !== void 0 ? _theme : {}
         });
-        var ref1;
+        var _theme1;
         matchVariant("group-aria", (value, { modifier  })=>modifier ? `:merge(.group\\/${modifier})[aria-${(0, _dataTypes.normalize)(value)}] &` : `:merge(.group)[aria-${(0, _dataTypes.normalize)(value)}] &`, {
-            values: (ref1 = theme("aria")) !== null && ref1 !== void 0 ? ref1 : {}
+            values: (_theme1 = theme("aria")) !== null && _theme1 !== void 0 ? _theme1 : {}
         });
-        var ref2;
+        var _theme2;
         matchVariant("peer-aria", (value, { modifier  })=>modifier ? `:merge(.peer\\/${modifier})[aria-${(0, _dataTypes.normalize)(value)}] ~ &` : `:merge(.peer)[aria-${(0, _dataTypes.normalize)(value)}] ~ &`, {
-            values: (ref2 = theme("aria")) !== null && ref2 !== void 0 ? ref2 : {}
+            values: (_theme2 = theme("aria")) !== null && _theme2 !== void 0 ? _theme2 : {}
         });
     },
     dataVariants: ({ matchVariant , theme  })=>{
-        var ref;
+        var _theme;
         matchVariant("data", (value)=>`&[data-${(0, _dataTypes.normalize)(value)}]`, {
-            values: (ref = theme("data")) !== null && ref !== void 0 ? ref : {}
+            values: (_theme = theme("data")) !== null && _theme !== void 0 ? _theme : {}
         });
-        var ref1;
+        var _theme1;
         matchVariant("group-data", (value, { modifier  })=>modifier ? `:merge(.group\\/${modifier})[data-${(0, _dataTypes.normalize)(value)}] &` : `:merge(.group)[data-${(0, _dataTypes.normalize)(value)}] &`, {
-            values: (ref1 = theme("data")) !== null && ref1 !== void 0 ? ref1 : {}
+            values: (_theme1 = theme("data")) !== null && _theme1 !== void 0 ? _theme1 : {}
         });
-        var ref2;
+        var _theme2;
         matchVariant("peer-data", (value, { modifier  })=>modifier ? `:merge(.peer\\/${modifier})[data-${(0, _dataTypes.normalize)(value)}] ~ &` : `:merge(.peer)[data-${(0, _dataTypes.normalize)(value)}] ~ &`, {
-            values: (ref2 = theme("data")) !== null && ref2 !== void 0 ? ref2 : {}
+            values: (_theme2 = theme("data")) !== null && _theme2 !== void 0 ? _theme2 : {}
         });
     },
     orientationVariants: ({ addVariant  })=>{
@@ -1223,8 +1241,8 @@ let corePlugins = {
     },
     animation: ({ matchUtilities , theme , config  })=>{
         let prefixName = (name)=>`${config("prefix")}${(0, _escapeClassName.default)(name)}`;
-        var ref;
-        let keyframes = Object.fromEntries(Object.entries((ref = theme("keyframes")) !== null && ref !== void 0 ? ref : {}).map(([key, value])=>{
+        var _theme;
+        let keyframes = Object.fromEntries(Object.entries((_theme = theme("keyframes")) !== null && _theme !== void 0 ? _theme : {}).map(([key, value])=>{
             return [
                 key,
                 {
@@ -3441,15 +3459,15 @@ let corePlugins = {
     },
     ringWidth: ({ matchUtilities , addDefaults , addUtilities , theme , config  })=>{
         let ringColorDefault = (()=>{
-            var ref, ref1;
+            var _theme, _theme1;
             if ((0, _featureFlags.flagEnabled)(config(), "respectDefaultRingColorOpacity")) {
                 return theme("ringColor.DEFAULT");
             }
             let ringOpacityDefault = theme("ringOpacity.DEFAULT", "0.5");
-            if (!((ref = theme("ringColor")) === null || ref === void 0 ? void 0 : ref.DEFAULT)) {
+            if (!((_theme = theme("ringColor")) === null || _theme === void 0 ? void 0 : _theme.DEFAULT)) {
                 return `rgb(147 197 253 / ${ringOpacityDefault})`;
             }
-            return (0, _withAlphaVariable.withAlphaValue)((ref1 = theme("ringColor")) === null || ref1 === void 0 ? void 0 : ref1.DEFAULT, ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})`);
+            return (0, _withAlphaVariable.withAlphaValue)((_theme1 = theme("ringColor")) === null || _theme1 === void 0 ? void 0 : _theme1.DEFAULT, ringOpacityDefault, `rgb(147 197 253 / ${ringOpacityDefault})`);
         })();
         addDefaults("ring-width", {
             "--tw-ring-inset": " ",

package/lib/featureFlags.js

@@ -38,14 +38,14 @@ let featureFlags = {
 };
 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);
+        var _config_future;
+        var _config_future_flag, _ref;
+        return config.future === "all" || ((_ref = (_config_future_flag = config === null || config === void 0 ? void 0 : (_config_future = config.future) === null || _config_future === void 0 ? void 0 : _config_future[flag]) !== null && _config_future_flag !== void 0 ? _config_future_flag : defaults[flag]) !== null && _ref !== void 0 ? _ref : 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);
+        var _config_experimental;
+        var _config_experimental_flag, _ref1;
+        return config.experimental === "all" || ((_ref1 = (_config_experimental_flag = config === null || config === void 0 ? void 0 : (_config_experimental = config.experimental) === null || _config_experimental === void 0 ? void 0 : _config_experimental[flag]) !== null && _config_experimental_flag !== void 0 ? _config_experimental_flag : defaults[flag]) !== null && _ref1 !== void 0 ? _ref1 : false);
     }
     return false;
 }
@@ -53,8 +53,8 @@ function experimentalFlagsEnabled(config) {
     if (config.experimental === "all") {
         return featureFlags.experimental;
     }
-    var ref;
-    return Object.keys((ref = config === null || config === void 0 ? void 0 : config.experimental) !== null && ref !== void 0 ? ref : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
+    var _config_experimental;
+    return Object.keys((_config_experimental = config === null || config === void 0 ? void 0 : config.experimental) !== null && _config_experimental !== void 0 ? _config_experimental : {}).filter((flag)=>featureFlags.experimental.includes(flag) && config.experimental[flag]);
 }
 function issueFlagNotices(config) {
     if (process.env.JEST_WORKER_ID !== undefined) {

package/lib/index.js

@@ -1,48 +1,6 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _setupTrackingContext = /*#__PURE__*/ _interopRequireDefault(require("./lib/setupTrackingContext"));
-const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("./processTailwindFeatures"));
-const _sharedState = require("./lib/sharedState");
-const _findAtConfigPath = require("./lib/findAtConfigPath");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
+if (process.env.OXIDE) {
+    module.exports = require("./oxide/postcss-plugin");
+} else {
+    module.exports = require("./plugin");
 }
-module.exports = function tailwindcss(configOrPath) {
-    return {
-        postcssPlugin: "tailwindcss",
-        plugins: [
-            _sharedState.env.DEBUG && function(root) {
-                console.log("\n");
-                console.time("JIT TOTAL");
-                return root;
-            },
-            function(root, result) {
-                var ref;
-                // Use the path for the `@config` directive if it exists, otherwise use the
-                // path for the file being processed
-                configOrPath = (ref = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && ref !== void 0 ? ref : configOrPath;
-                let context = (0, _setupTrackingContext.default)(configOrPath);
-                if (root.type === "document") {
-                    let roots = root.nodes.filter((node)=>node.type === "root");
-                    for (const root1 of roots){
-                        if (root1.type === "root") {
-                            (0, _processTailwindFeatures.default)(context)(root1, result);
-                        }
-                    }
-                    return;
-                }
-                (0, _processTailwindFeatures.default)(context)(root, result);
-            },
-            _sharedState.env.DEBUG && function(root) {
-                console.timeEnd("JIT TOTAL");
-                console.log("\n");
-                return root;
-            }
-        ].filter(Boolean)
-    };
-};
-module.exports.postcss = true;

package/lib/lib/collapseAdjacentRules.js

@@ -29,10 +29,10 @@ function collapseAdjacentRules() {
                 return;
             }
             let properties = comparisonMap[node.type];
-            var _property, _property1;
+            var _node_property, _currentRule_property;
             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)=>((_node_property = node[property]) !== null && _node_property !== void 0 ? _node_property : "").replace(/\s+/g, " ") === ((_currentRule_property = currentRule[property]) !== null && _currentRule_property !== void 0 ? _currentRule_property : "").replace(/\s+/g, " "))) {
                 // An AtRule may not have children (for example if we encounter duplicate @import url(…) rules)
                 if (node.nodes) {
                     currentRule.append(node.nodes);

package/lib/lib/collapseDuplicateDeclarations.js

@@ -76,8 +76,8 @@ let UNITLESS_NUMBER = Symbol("unitless-number");
 function resolveUnit(input) {
     let result = /^-?\d*.?\d+([\w%]+)?$/g.exec(input);
     if (result) {
-        var ref;
-        return (ref = result[1]) !== null && ref !== void 0 ? ref : UNITLESS_NUMBER;
+        var _result_;
+        return (_result_ = result[1]) !== null && _result_ !== void 0 ? _result_ : UNITLESS_NUMBER;
     }
     return null;
 }

package/lib/lib/content.js

@@ -135,43 +135,43 @@ function resolvedChangedContent(context, candidateFiles, fileModifiedMap) {
             content: raw,
             extension
         }));
-    for (let changedFile of resolveChangedFiles(candidateFiles, fileModifiedMap)){
-        let content = _fs.default.readFileSync(changedFile, "utf8");
+    let [changedFiles, mTimesToCommit] = resolveChangedFiles(candidateFiles, fileModifiedMap);
+    for (let changedFile of changedFiles){
         let extension = _path.default.extname(changedFile).slice(1);
         changedContent.push({
-            content,
+            file: changedFile,
             extension
         });
     }
-    return changedContent;
+    return [
+        changedContent,
+        mTimesToCommit
+    ];
 }
 /**
  *
  * @param {ContentPath[]} candidateFiles
  * @param {Map<string, number>} fileModifiedMap
- * @returns {Set<string>}
+ * @returns {[Set<string>, Map<string, number>]}
  */ function resolveChangedFiles(candidateFiles, fileModifiedMap) {
     let paths = candidateFiles.map((contentPath)=>contentPath.pattern);
+    let mTimesToCommit = new Map();
     let changedFiles = new Set();
     _sharedState.env.DEBUG && console.time("Finding changed files");
     let files = _fastGlob.default.sync(paths, {
         absolute: true
     });
     for (let file of files){
-        let prevModified = fileModifiedMap.has(file) ? fileModifiedMap.get(file) : -Infinity;
+        let prevModified = fileModifiedMap.get(file) || -Infinity;
         let modified = _fs.default.statSync(file).mtimeMs;
-        // This check is intentionally >= because we track the last modified time of context dependencies
-        // earier in the process and we want to make sure we don't miss any changes that happen
-        // when a context dependency is also a content dependency
-        // Ideally, we'd do all this tracking at one time but that is a larger refactor
-        // than we want to commit to right now, so this is a decent compromise.
-        // This should be sufficient because file modification times will be off by at least
-        // 1ms (the precision of fstat in Node) in most cases if they exist and were changed.
-        if (modified >= prevModified) {
+        if (modified > prevModified) {
             changedFiles.add(file);
-            fileModifiedMap.set(file, modified);
+            mTimesToCommit.set(file, modified);
         }
     }
     _sharedState.env.DEBUG && console.timeEnd("Finding changed files");
-    return changedFiles;
+    return [
+        changedFiles,
+        mTimesToCommit
+    ];
 }

package/lib/lib/defaultExtractor.js

@@ -54,10 +54,10 @@ function defaultExtractor(context) {
    */ return (content)=>{
         /** @type {(string|string)[]} */ let results = [];
         for (let pattern of patterns){
-            var ref;
+            var _content_match;
             results = [
                 ...results,
-                ...(ref = content.match(pattern)) !== null && ref !== void 0 ? ref : []
+                ...(_content_match = content.match(pattern)) !== null && _content_match !== void 0 ? _content_match : []
             ];
         }
         return results.filter((v)=>v !== undefined).map(clipAtBalancedParens);
@@ -71,8 +71,13 @@ function* buildRegExps(context) {
         _regex.escape(context.tailwindConfig.prefix)
     ])) : "";
     let utility = _regex.any([
-        // Arbitrary properties
-        /\[[^\s:'"`]+:[^\s]+\]/,
+        // Arbitrary properties (without square brackets)
+        /\[[^\s:'"`]+:[^\s\[\]]+\]/,
+        // Arbitrary properties with balanced square brackets
+        // 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]+?\]/,
         // Utilities
         _regex.pattern([
             // Utility Name / Group Name
@@ -216,7 +221,7 @@ let ALLOWED_CLASS_CHARACTERS = /[^"'`\s<>\]]+/;
         // This means that there was an extra closing `]`
         // We'll clip to just before it
         if (depth < 0) {
-            return input.substring(0, match.index);
+            return input.substring(0, match.index - 1);
         }
         // We've finished balancing the brackets but there still may be characters that can be included
         // For example in the class `text-[#336699]/[.35]`

package/lib/lib/detectNesting.js

@@ -6,12 +6,18 @@ Object.defineProperty(exports, "default", {
     enumerable: true,
     get: ()=>_default
 });
+function isRoot(node) {
+    return node.type === "root";
+}
+function isAtLayer(node) {
+    return node.type === "atrule" && node.name === "layer";
+}
 function _default(_context) {
     return (root, result)=>{
         let found = false;
         root.walkAtRules("tailwind", (node)=>{
             if (found) return false;
-            if (node.parent && node.parent.type !== "root") {
+            if (node.parent && !(isRoot(node.parent) || isAtLayer(node.parent))) {
                 found = true;
                 node.warn(result, [
                     "Nested @tailwind rules were detected, but are not supported.",

package/lib/lib/evaluateTailwindFunctions.js

@@ -177,8 +177,8 @@ let nodeTypePropertyMap = {
             alpha
         });
     });
-    var ref;
-    return (ref = results.find((result)=>result.isValid)) !== null && ref !== void 0 ? ref : results[0];
+    var _results_find;
+    return (_results_find = results.find((result)=>result.isValid)) !== null && _results_find !== void 0 ? _results_find : results[0];
 }
 function _default(context) {
     let config = context.tailwindConfig;
@@ -186,9 +186,9 @@ function _default(context) {
         theme: (node, path, ...defaultValue)=>{
             let { isValid , value , error , alpha  } = resolvePath(config, path, defaultValue.length ? defaultValue : undefined);
             if (!isValid) {
-                var ref;
+                var _parentNode_raws_tailwind;
                 let parentNode = node.parent;
-                let candidate = (ref = parentNode === null || parentNode === void 0 ? void 0 : parentNode.raws.tailwind) === null || ref === void 0 ? void 0 : ref.candidate;
+                let candidate = (_parentNode_raws_tailwind = parentNode === null || parentNode === void 0 ? void 0 : parentNode.raws.tailwind) === null || _parentNode_raws_tailwind === void 0 ? void 0 : _parentNode_raws_tailwind.candidate;
                 if (parentNode && candidate !== undefined) {
                     // Remove this utility from any caches
                     context.markInvalidUtilityNode(parentNode);

package/lib/lib/expandApplyAtRules.js

@@ -139,8 +139,8 @@ function* pathToRoot(node) {
     root.walkRules((rule)=>{
         // Ignore rules generated by Tailwind
         for (let node of pathToRoot(rule)){
-            var ref;
-            if (((ref = node.raws.tailwind) === null || ref === void 0 ? void 0 : ref.layer) !== undefined) {
+            var _node_raws_tailwind;
+            if (((_node_raws_tailwind = node.raws.tailwind) === null || _node_raws_tailwind === void 0 ? void 0 : _node_raws_tailwind.layer) !== undefined) {
                 return;
             }
         }