tailwindcss 0.0.0-insiders.ea10bb9 → 0.0.0-insiders.ea3d9cd

package/lib/css/preflight.css

@@ -23,6 +23,7 @@
 3. Use a more readable tab size.
 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.
 */
 
 html {
@@ -32,6 +33,7 @@ html {
   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-feature-settings: theme('fontFamily.sans[1].fontFeatureSettings', normal); /* 5 */
+  font-variation-settings: theme('fontFamily.sans[1].fontVariationSettings', normal); /* 6 */
 }
 
 /*
@@ -161,6 +163,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 */
@@ -262,7 +266,7 @@ summary {
 }
 
 /*
-Removes the default spacing and border for appropriate elements.
+Removes the default spacing for appropriate elements.
 */
 
 blockquote,
@@ -298,6 +302,10 @@ menu {
   padding: 0;
 }
 
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */

package/lib/featureFlags.js

@@ -9,43 +9,56 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    flagEnabled: ()=>flagEnabled,
-    issueFlagNotices: ()=>issueFlagNotices,
-    default: ()=>_default
+    featureFlags: function() {
+        return featureFlags;
+    },
+    flagEnabled: function() {
+        return flagEnabled;
+    },
+    issueFlagNotices: function() {
+        return issueFlagNotices;
+    },
+    default: function() {
+        return _default;
+    }
 });
-const _picocolors = /*#__PURE__*/ _interopRequireDefault(require("picocolors"));
-const _log = /*#__PURE__*/ _interopRequireDefault(require("./util/log"));
-function _interopRequireDefault(obj) {
+const _picocolors = /*#__PURE__*/ _interop_require_default(require("picocolors"));
+const _log = /*#__PURE__*/ _interop_require_default(require("./util/log"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 let defaults = {
     optimizeUniversalDefaults: false,
-    generalizedModifiers: true
+    disableColorOpacityUtilitiesByDefault: false,
+    relativeContentPathsByDefault: false,
+    oxideParser: true,
+    logicalSiblingUtilities: false
 };
 let featureFlags = {
     future: [
         "hoverOnlyWhenSupported",
         "respectDefaultRingColorOpacity",
         "disableColorOpacityUtilitiesByDefault",
-        "relativeContentPathsByDefault"
+        "relativeContentPathsByDefault",
+        "logicalSiblingUtilities"
     ],
     experimental: [
         "optimizeUniversalDefaults",
-        "generalizedModifiers"
+        "oxideParser"
     ]
 };
 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 +66,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,2 @@
 "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
-    };
-}
-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;
+module.exports = require("./plugin");

package/lib/lib/cacheInvalidation.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "hasContentChanged", {
     enumerable: true,
-    get: ()=>hasContentChanged
+    get: function() {
+        return hasContentChanged;
+    }
 });
-const _crypto = /*#__PURE__*/ _interopRequireDefault(require("crypto"));
-const _sharedState = /*#__PURE__*/ _interopRequireWildcard(require("./sharedState"));
-function _interopRequireDefault(obj) {
+const _crypto = /*#__PURE__*/ _interop_require_default(require("crypto"));
+const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -21,7 +23,7 @@ function _getRequireWildcardCache(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
-function _interopRequireWildcard(obj, nodeInterop) {
+function _interop_require_wildcard(obj, nodeInterop) {
     if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }

package/lib/lib/collapseAdjacentRules.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>collapseAdjacentRules
+    get: function() {
+        return collapseAdjacentRules;
+    }
 });
 let comparisonMap = {
     atrule: [
@@ -29,10 +31,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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>collapseDuplicateDeclarations
+    get: function() {
+        return collapseDuplicateDeclarations;
+    }
 });
 function collapseDuplicateDeclarations() {
     return (root)=>{
@@ -51,21 +53,21 @@ function collapseDuplicateDeclarations() {
             // with the same unit but the last one in the list.
             for (let declarations of byProperty.values()){
                 let byUnit = new Map();
-                for (let decl1 of declarations){
-                    let unit = resolveUnit(decl1.value);
+                for (let decl of declarations){
+                    let unit = resolveUnit(decl.value);
                     if (unit === null) {
                         continue;
                     }
                     if (!byUnit.has(unit)) {
                         byUnit.set(unit, new Set());
                     }
-                    byUnit.get(unit).add(decl1);
+                    byUnit.get(unit).add(decl);
                 }
-                for (let declarations1 of byUnit.values()){
+                for (let declarations of byUnit.values()){
                     // Get all but the last one
-                    let removableDeclarations = Array.from(declarations1).slice(0, -1);
-                    for (let decl2 of removableDeclarations){
-                        decl2.remove();
+                    let removableDeclarations = Array.from(declarations).slice(0, -1);
+                    for (let decl of removableDeclarations){
+                        decl.remove();
                     }
                 }
             }
@@ -76,8 +78,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

@@ -10,28 +10,58 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    parseCandidateFiles: ()=>parseCandidateFiles,
-    resolvedChangedContent: ()=>resolvedChangedContent
+    parseCandidateFiles: function() {
+        return parseCandidateFiles;
+    },
+    resolvedChangedContent: function() {
+        return resolvedChangedContent;
+    }
 });
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _isGlob = /*#__PURE__*/ _interopRequireDefault(require("is-glob"));
-const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
-const _normalizePath = /*#__PURE__*/ _interopRequireDefault(require("normalize-path"));
+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 _interopRequireDefault(obj) {
+const _oxide = require("@tailwindcss/oxide");
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+/** @typedef {import('../../types/config.js').RawFile} RawFile */ /** @typedef {import('../../types/config.js').FilePath} FilePath */ /*
+ * @param {import('tailwindcss').Config} tailwindConfig
+ * @param {{skip:string[]}} options
+ * @returns {ContentPath[]}
+ */ function resolveContentFiles(tailwindConfig, { skip =[]  } = {}) {
+    if (Array.isArray(tailwindConfig.content.files) && tailwindConfig.content.files.includes("auto")) {
+        let idx = tailwindConfig.content.files.indexOf("auto");
+        if (idx !== -1) {
+            _sharedState.env.DEBUG && console.time("Calculating resolve content paths");
+            let resolved = (0, _oxide.resolveContentPaths)({
+                base: process.cwd()
+            });
+            _sharedState.env.DEBUG && console.timeEnd("Calculating resolve content paths");
+            tailwindConfig.content.files.splice(idx, 1, ...resolved);
+        }
+    }
+    if (skip.length > 0) {
+        tailwindConfig.content.files = tailwindConfig.content.files.filter((filePath)=>!skip.includes(filePath));
+    }
+    return tailwindConfig.content.files;
+}
 function parseCandidateFiles(context, tailwindConfig) {
-    let files = tailwindConfig.content.files;
+    let files = resolveContentFiles(tailwindConfig, {
+        skip: [
+            context.userConfigPath
+        ]
+    });
     // Normalize the file globs
     files = files.filter((filePath)=>typeof filePath === "string");
-    files = files.map(_normalizePath.default);
+    files = files.map(_normalizepath.default);
     // Split into included and excluded globs
-    let tasks = _fastGlob.default.generateTasks(files);
+    let tasks = _fastglob.default.generateTasks(files);
     /** @type {ContentPath[]} */ let included = [];
     /** @type {ContentPath[]} */ let excluded = [];
     for (const task of tasks){
@@ -63,7 +93,7 @@ function parseCandidateFiles(context, tailwindConfig) {
         pattern: filePath,
         glob: null
     };
-    if ((0, _isGlob.default)(filePath)) {
+    if ((0, _isglob.default)(filePath)) {
         Object.assign(contentPath, (0, _parseGlob.parseGlob)(filePath));
     }
     return contentPath;
@@ -77,10 +107,10 @@ 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 = (0, _normalizepath.default)(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);
+    base = _fastglob.default.escapePath(base);
     contentPath.pattern = contentPath.glob ? `${base}/${contentPath.glob}` : base;
     contentPath.pattern = contentPath.ignore ? `!${contentPath.pattern}` : contentPath.pattern;
     return contentPath;
@@ -135,43 +165,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, {
+    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

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "defaultExtractor", {
     enumerable: true,
-    get: ()=>defaultExtractor
+    get: function() {
+        return defaultExtractor;
+    }
 });
 const _featureFlags = require("../featureFlags");
-const _regex = /*#__PURE__*/ _interopRequireWildcard(require("./regex"));
+const _regex = /*#__PURE__*/ _interop_require_wildcard(require("./regex"));
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -16,7 +18,7 @@ function _getRequireWildcardCache(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
-function _interopRequireWildcard(obj, nodeInterop) {
+function _interop_require_wildcard(obj, nodeInterop) {
     if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }
@@ -54,10 +56,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 +73,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 +223,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

@@ -4,14 +4,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>_default
+    get: function() {
+        return _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

@@ -4,19 +4,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>_default
+    get: function() {
+        return _default;
+    }
 });
-const _dlv = /*#__PURE__*/ _interopRequireDefault(require("dlv"));
-const _didyoumean = /*#__PURE__*/ _interopRequireDefault(require("didyoumean"));
-const _transformThemeValue = /*#__PURE__*/ _interopRequireDefault(require("../util/transformThemeValue"));
-const _postcssValueParser = /*#__PURE__*/ _interopRequireDefault(require("postcss-value-parser"));
+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 _index = /*#__PURE__*/ _interop_require_default(require("../value-parser/index"));
 const _normalizeScreens = require("../util/normalizeScreens");
-const _buildMediaQuery = /*#__PURE__*/ _interopRequireDefault(require("../util/buildMediaQuery"));
+const _buildMediaQuery = /*#__PURE__*/ _interop_require_default(require("../util/buildMediaQuery"));
 const _toPath = require("../util/toPath");
 const _withAlphaVariable = require("../util/withAlphaVariable");
 const _pluginUtils = require("../util/pluginUtils");
-const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
-function _interopRequireDefault(obj) {
+const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -86,22 +88,22 @@ function validatePath(config, path, defaultValue, themeOpts = {}) {
         };
     }
     if (!(typeof value === "string" || typeof value === "number" || typeof value === "function" || value instanceof String || value instanceof Number || Array.isArray(value))) {
-        let error1 = `'${pathString}' was found but does not resolve to a string.`;
+        let error = `'${pathString}' was found but does not resolve to a string.`;
         if (isObject(value)) {
-            let validKeys1 = Object.keys(value).filter((key)=>validatePath(config, [
+            let validKeys = Object.keys(value).filter((key)=>validatePath(config, [
                     ...pathSegments,
                     key
                 ]).isValid);
-            if (validKeys1.length) {
-                error1 += ` Did you mean something like '${pathToString([
+            if (validKeys.length) {
+                error += ` Did you mean something like '${pathToString([
                     ...pathSegments,
-                    validKeys1[0]
+                    validKeys[0]
                 ])}'?`;
             }
         }
         return {
             isValid: false,
-            error: error1
+            error
         };
     }
     const [themeSection] = pathSegments;
@@ -119,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;
@@ -133,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();
 }
@@ -177,8 +181,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 +190,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);