tailwindcss 3.3.1 → 3.3.3

package/lib/lib/partitionApplyAtRules.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
     enumerable: true,
-    get: ()=>expandApplyAtRules
+    get: function() {
+        return expandApplyAtRules;
+    }
 });
 function partitionRules(root) {
     if (!root.walkAtRules) return;

package/lib/lib/regex.js

@@ -9,13 +9,27 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    pattern: ()=>pattern,
-    withoutCapturing: ()=>withoutCapturing,
-    any: ()=>any,
-    optional: ()=>optional,
-    zeroOrMore: ()=>zeroOrMore,
-    nestedBrackets: ()=>nestedBrackets,
-    escape: ()=>escape
+    pattern: function() {
+        return pattern;
+    },
+    withoutCapturing: function() {
+        return withoutCapturing;
+    },
+    any: function() {
+        return any;
+    },
+    optional: function() {
+        return optional;
+    },
+    zeroOrMore: function() {
+        return zeroOrMore;
+    },
+    nestedBrackets: function() {
+        return nestedBrackets;
+    },
+    escape: function() {
+        return escape;
+    }
 });
 const REGEX_SPECIAL = /[\\^$.*+?()[\]{}|]/g;
 const REGEX_HAS_SPECIAL = RegExp(REGEX_SPECIAL.source);

package/lib/lib/remap-bitfield.js

@@ -69,7 +69,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "remapBitfield", {
     enumerable: true,
-    get: ()=>remapBitfield
+    get: function() {
+        return remapBitfield;
+    }
 });
 function remapBitfield(num, mapping) {
     // Create masks for the old and new bits that are set

package/lib/lib/resolveDefaultsAtRules.js

@@ -9,20 +9,24 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    elementSelectorParser: ()=>elementSelectorParser,
-    default: ()=>resolveDefaultsAtRules
+    elementSelectorParser: function() {
+        return elementSelectorParser;
+    },
+    default: function() {
+        return resolveDefaultsAtRules;
+    }
 });
-const _postcss = /*#__PURE__*/ _interopRequireDefault(require("postcss"));
-const _postcssSelectorParser = /*#__PURE__*/ _interopRequireDefault(require("postcss-selector-parser"));
+const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
+const _postcssselectorparser = /*#__PURE__*/ _interop_require_default(require("postcss-selector-parser"));
 const _featureFlags = require("../featureFlags");
-function _interopRequireDefault(obj) {
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 let getNode = {
     id (node) {
-        return _postcssSelectorParser.default.attribute({
+        return _postcssselectorparser.default.attribute({
             attribute: "id",
             operator: "=",
             value: node.value,
@@ -60,14 +64,14 @@ function minimumImpactSelector(nodes) {
     let combinatorIdx = rest.findIndex((n)=>n.type === "combinator" && n.value === ">");
     if (combinatorIdx !== -1) {
         rest.splice(0, combinatorIdx);
-        rest.unshift(_postcssSelectorParser.default.universal());
+        rest.unshift(_postcssselectorparser.default.universal());
     }
     return [
         bestNode,
         ...rest.reverse()
     ].join("").trim();
 }
-let elementSelectorParser = (0, _postcssSelectorParser.default)((selectors)=>{
+let elementSelectorParser = (0, _postcssselectorparser.default)((selectors)=>{
     return selectors.map((s)=>{
         let nodes = s.split((n)=>n.type === "combinator" && n.value === " ").pop();
         return minimumImpactSelector(nodes);
@@ -119,12 +123,12 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                         universal.remove();
                         continue;
                     }
-                    for (let [, selectors1] of selectorGroups){
+                    for (let [, selectors] of selectorGroups){
                         let universalRule = _postcss.default.rule({
                             source: universal.source
                         });
                         universalRule.selectors = [
-                            ...selectors1
+                            ...selectors
                         ];
                         universalRule.append(universal.nodes.map((node)=>node.clone()));
                         universal.before(universalRule);
@@ -133,29 +137,29 @@ function resolveDefaultsAtRules({ tailwindConfig  }) {
                 universal.remove();
             }
         } else if (universals.size) {
-            let universalRule1 = _postcss.default.rule({
+            let universalRule = _postcss.default.rule({
                 selectors: [
                     "*",
                     "::before",
                     "::after"
                 ]
             });
-            for (let universal1 of universals){
-                universalRule1.append(universal1.nodes);
-                if (!universalRule1.parent) {
-                    universal1.before(universalRule1);
+            for (let universal of universals){
+                universalRule.append(universal.nodes);
+                if (!universalRule.parent) {
+                    universal.before(universalRule);
                 }
-                if (!universalRule1.source) {
-                    universalRule1.source = universal1.source;
+                if (!universalRule.source) {
+                    universalRule.source = universal.source;
                 }
-                universal1.remove();
+                universal.remove();
             }
-            let backdropRule = universalRule1.clone({
+            let backdropRule = universalRule.clone({
                 selectors: [
                     "::backdrop"
                 ]
             });
-            universalRule1.after(backdropRule);
+            universalRule.after(backdropRule);
         }
     };
 }

package/lib/lib/setupContextUtils.js

@@ -9,36 +9,49 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    isValidVariantFormatString: ()=>isValidVariantFormatString,
-    parseVariant: ()=>parseVariant,
-    getFileModifiedMap: ()=>getFileModifiedMap,
-    createContext: ()=>createContext,
-    getContext: ()=>getContext
+    INTERNAL_FEATURES: function() {
+        return INTERNAL_FEATURES;
+    },
+    isValidVariantFormatString: function() {
+        return isValidVariantFormatString;
+    },
+    parseVariant: function() {
+        return parseVariant;
+    },
+    getFileModifiedMap: function() {
+        return getFileModifiedMap;
+    },
+    createContext: function() {
+        return createContext;
+    },
+    getContext: function() {
+        return getContext;
+    }
 });
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _url = /*#__PURE__*/ _interopRequireDefault(require("url"));
-const _postcss = /*#__PURE__*/ _interopRequireDefault(require("postcss"));
-const _dlv = /*#__PURE__*/ _interopRequireDefault(require("dlv"));
-const _postcssSelectorParser = /*#__PURE__*/ _interopRequireDefault(require("postcss-selector-parser"));
-const _transformThemeValue = /*#__PURE__*/ _interopRequireDefault(require("../util/transformThemeValue"));
-const _parseObjectStyles = /*#__PURE__*/ _interopRequireDefault(require("../util/parseObjectStyles"));
-const _prefixSelector = /*#__PURE__*/ _interopRequireDefault(require("../util/prefixSelector"));
-const _isPlainObject = /*#__PURE__*/ _interopRequireDefault(require("../util/isPlainObject"));
-const _escapeClassName = /*#__PURE__*/ _interopRequireDefault(require("../util/escapeClassName"));
-const _nameClass = /*#__PURE__*/ _interopRequireWildcard(require("../util/nameClass"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _url = /*#__PURE__*/ _interop_require_default(require("url"));
+const _postcss = /*#__PURE__*/ _interop_require_default(require("postcss"));
+const _dlv = /*#__PURE__*/ _interop_require_default(require("dlv"));
+const _postcssselectorparser = /*#__PURE__*/ _interop_require_default(require("postcss-selector-parser"));
+const _transformThemeValue = /*#__PURE__*/ _interop_require_default(require("../util/transformThemeValue"));
+const _parseObjectStyles = /*#__PURE__*/ _interop_require_default(require("../util/parseObjectStyles"));
+const _prefixSelector = /*#__PURE__*/ _interop_require_default(require("../util/prefixSelector"));
+const _isPlainObject = /*#__PURE__*/ _interop_require_default(require("../util/isPlainObject"));
+const _escapeClassName = /*#__PURE__*/ _interop_require_default(require("../util/escapeClassName"));
+const _nameClass = /*#__PURE__*/ _interop_require_wildcard(require("../util/nameClass"));
 const _pluginUtils = require("../util/pluginUtils");
 const _corePlugins = require("../corePlugins");
-const _sharedState = /*#__PURE__*/ _interopRequireWildcard(require("./sharedState"));
+const _sharedState = /*#__PURE__*/ _interop_require_wildcard(require("./sharedState"));
 const _toPath = require("../util/toPath");
-const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
-const _negateValue = /*#__PURE__*/ _interopRequireDefault(require("../util/negateValue"));
-const _isSyntacticallyValidPropertyValue = /*#__PURE__*/ _interopRequireDefault(require("../util/isSyntacticallyValidPropertyValue"));
+const _log = /*#__PURE__*/ _interop_require_default(require("../util/log"));
+const _negateValue = /*#__PURE__*/ _interop_require_default(require("../util/negateValue"));
+const _isSyntacticallyValidPropertyValue = /*#__PURE__*/ _interop_require_default(require("../util/isSyntacticallyValidPropertyValue"));
 const _generateRules = require("./generateRules");
-const _cacheInvalidationJs = require("./cacheInvalidation.js");
-const _offsetsJs = require("./offsets.js");
-const _featureFlagsJs = require("../featureFlags.js");
+const _cacheInvalidation = require("./cacheInvalidation.js");
+const _offsets = require("./offsets.js");
+const _featureFlags = require("../featureFlags.js");
 const _formatVariantSelector = require("../util/formatVariantSelector");
-function _interopRequireDefault(obj) {
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -51,7 +64,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;
     }
@@ -82,6 +95,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+const INTERNAL_FEATURES = Symbol();
 const VARIANT_TYPES = {
     AddVariant: Symbol.for("ADD_VARIANT"),
     MatchVariant: Symbol.for("MATCH_VARIANT")
@@ -175,7 +189,7 @@ function parseStyles(styles) {
     });
 }
 function getClasses(selector, mutate) {
-    let parser = (0, _postcssSelectorParser.default)((selectors)=>{
+    let parser = (0, _postcssselectorparser.default)((selectors)=>{
         let allClasses = [];
         if (mutate) {
             mutate(selectors);
@@ -260,11 +274,14 @@ function parseVariant(variant) {
         if (!str.startsWith("@")) {
             return ({ format  })=>format(str);
         }
-        let [, name, params] = /@(.*?)( .+|[({].*)/g.exec(str);
-        return ({ wrap  })=>wrap(_postcss.default.atRule({
+        let [, name, params] = /@(\S*)( .+|[({].*)?/g.exec(str);
+        var _params_trim;
+        return ({ wrap  })=>{
+            return wrap(_postcss.default.atRule({
                 name,
-                params: params.trim()
+                params: (_params_trim = params === null || params === void 0 ? void 0 : params.trim()) !== null && _params_trim !== void 0 ? _params_trim : ""
             }));
+        };
     }).reverse();
     return (api)=>{
         for (let fn of fns){
@@ -451,7 +468,7 @@ function parseVariant(variant) {
                             return utilityModifier;
                         }
                     };
-                    let modifiersEnabled = (0, _featureFlagsJs.flagEnabled)(tailwindConfig, "generalizedModifiers");
+                    let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
                     let ruleSets = [].concat(modifiersEnabled ? rule(value, extras) : rule(value)).filter(Boolean).map((declaration)=>({
                             [(0, _nameClass.default)(identifier, modifier)]: declaration
                         }));
@@ -517,7 +534,7 @@ function parseVariant(variant) {
                             return utilityModifier;
                         }
                     };
-                    let modifiersEnabled = (0, _featureFlagsJs.flagEnabled)(tailwindConfig, "generalizedModifiers");
+                    let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
                     let ruleSets = [].concat(modifiersEnabled ? rule(value, extras) : rule(value)).filter(Boolean).map((declaration)=>({
                             [(0, _nameClass.default)(identifier, modifier)]: declaration
                         }));
@@ -578,7 +595,7 @@ function parseVariant(variant) {
             // This is for internal use only which is why it is not present in the types
             let id = (_options_id = options === null || options === void 0 ? void 0 : options.id) !== null && _options_id !== void 0 ? _options_id : ++variantIdentifier;
             let isSpecial = variant === "@";
-            let modifiersEnabled = (0, _featureFlagsJs.flagEnabled)(tailwindConfig, "generalizedModifiers");
+            let modifiersEnabled = (0, _featureFlags.flagEnabled)(tailwindConfig, "generalizedModifiers");
             var _options_values;
             for (let [key, value] of Object.entries((_options_values = options === null || options === void 0 ? void 0 : options.values) !== null && _options_values !== void 0 ? _options_values : {})){
                 if (key === "DEFAULT") continue;
@@ -689,9 +706,9 @@ function collectLayerPlugins(root) {
             }
             layerRule.remove();
         } else if (layerRule.params === "components") {
-            for (let node1 of layerRule.nodes){
+            for (let node of layerRule.nodes){
                 layerPlugins.push(function({ addComponents  }) {
-                    addComponents(node1, {
+                    addComponents(node, {
                         respectPrefix: false,
                         preserveSource: true
                     });
@@ -699,9 +716,9 @@ function collectLayerPlugins(root) {
             }
             layerRule.remove();
         } else if (layerRule.params === "utilities") {
-            for (let node2 of layerRule.nodes){
+            for (let node of layerRule.nodes){
                 layerPlugins.push(function({ addUtilities  }) {
-                    addUtilities(node2, {
+                    addUtilities(node, {
                         respectPrefix: false,
                         preserveSource: true
                     });
@@ -759,7 +776,7 @@ function registerPlugins(plugins, context) {
     let variantList = [];
     let variantMap = new Map();
     context.variantMap = variantMap;
-    let offsets = new _offsetsJs.Offsets();
+    let offsets = new _offsets.Offsets();
     context.offsets = offsets;
     let classList = new Set();
     let pluginApi = buildPluginApi(context.tailwindConfig, context, {
@@ -850,7 +867,7 @@ function registerPlugins(plugins, context) {
                 })() : [
                     util
                 ];
-                for (let util1 of utils){
+                for (let util of utils){
                     for (let { pattern , variants =[]  } of checks){
                         // RegExp with the /g flag are stateful, so let's reset the last
                         // index pointer to reset the state.
@@ -858,15 +875,15 @@ function registerPlugins(plugins, context) {
                         if (!patternMatchingCount.has(pattern)) {
                             patternMatchingCount.set(pattern, 0);
                         }
-                        if (!pattern.test(util1)) continue;
+                        if (!pattern.test(util)) continue;
                         patternMatchingCount.set(pattern, patternMatchingCount.get(pattern) + 1);
                         context.changedContent.push({
-                            content: util1,
+                            content: util,
                             extension: "html"
                         });
                         for (let variant of variants){
                             context.changedContent.push({
-                                content: variant + context.tailwindConfig.separator + util1,
+                                content: variant + context.tailwindConfig.separator + util,
                                 extension: "html"
                             });
                         }
@@ -914,7 +931,11 @@ function registerPlugins(plugins, context) {
         rules = context.offsets.sort(rules);
         let idx = BigInt(parasiteUtilities.length);
         for (const [, rule] of rules){
-            sortedClassNames.set(rule.raws.tailwind.candidate, idx++);
+            let candidate = rule.raws.tailwind.candidate;
+            var _sortedClassNames_get;
+            // When multiple rules match a candidate
+            // always take the position of the first one
+            sortedClassNames.set(candidate, (_sortedClassNames_get = sortedClassNames.get(candidate)) !== null && _sortedClassNames_get !== void 0 ? _sortedClassNames_get : idx++);
         }
         return classes.map((className)=>{
             var _sortedClassNames_get;
@@ -963,11 +984,11 @@ function registerPlugins(plugins, context) {
                         metadata
                     ] : cls);
                     if ((utilOptions === null || utilOptions === void 0 ? void 0 : utilOptions.supportsNegativeValues) && (0, _negateValue.default)(value)) {
-                        let cls1 = (0, _nameClass.formatClass)(utilName, `-${key}`);
+                        let cls = (0, _nameClass.formatClass)(utilName, `-${key}`);
                         negativeClasses.push(includeMetadata ? [
-                            cls1,
+                            cls,
                             metadata
-                        ] : cls1);
+                        ] : cls);
                     }
                 }
                 output.push(...negativeClasses);
@@ -1060,7 +1081,7 @@ function registerPlugins(plugins, context) {
                             // as well. E.g.: `${variant}${separator}${className}`.
                             // However, plugin authors probably also prepend or append certain
                             // classes, pseudos, ids, ...
-                            let rebuiltBase = (0, _postcssSelectorParser.default)((selectors)=>{
+                            let rebuiltBase = (0, _postcssselectorparser.default)((selectors)=>{
                                 selectors.walkClasses((classNode)=>{
                                     classNode.value = `${name}${context.tailwindConfig.separator}${classNode.value}`;
                                 });
@@ -1085,13 +1106,20 @@ function registerPlugins(plugins, context) {
                     }
                     var _options_values1;
                     let isArbitraryVariant = !(value in ((_options_values1 = options.values) !== null && _options_values1 !== void 0 ? _options_values1 : {}));
+                    var _options_INTERNAL_FEATURES;
+                    let internalFeatures = (_options_INTERNAL_FEATURES = options[INTERNAL_FEATURES]) !== null && _options_INTERNAL_FEATURES !== void 0 ? _options_INTERNAL_FEATURES : {};
+                    let respectPrefix = (()=>{
+                        if (isArbitraryVariant) return false;
+                        if (internalFeatures.respectPrefix === false) return false;
+                        return true;
+                    })();
                     formatStrings = formatStrings.map((format)=>format.map((str)=>({
                                 format: str,
-                                isArbitraryVariant
+                                respectPrefix
                             })));
                     manualFormatStrings = manualFormatStrings.map((format)=>({
                             format,
-                            isArbitraryVariant
+                            respectPrefix
                         }));
                     let opts = {
                         candidate,
@@ -1184,7 +1212,7 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
         contextMap.set(sourcePath, context);
         existingContext = context;
     }
-    let cssDidChange = (0, _cacheInvalidationJs.hasContentChanged)(sourcePath, root);
+    let cssDidChange = (0, _cacheInvalidation.hasContentChanged)(sourcePath, root);
     // If there's already a context in the cache and we don't need to
     // reset the context, return the cached context.
     if (existingContext) {
@@ -1210,9 +1238,9 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
             contextSourcesMap.get(oldContext).delete(sourcePath);
             if (contextSourcesMap.get(oldContext).size === 0) {
                 contextSourcesMap.delete(oldContext);
-                for (let [tailwindConfigHash1, context1] of configContextMap){
-                    if (context1 === oldContext) {
-                        configContextMap.delete(tailwindConfigHash1);
+                for (let [tailwindConfigHash, context] of configContextMap){
+                    if (context === oldContext) {
+                        configContextMap.delete(tailwindConfigHash);
                     }
                 }
                 for (let disposable of oldContext.disposables.splice(0)){
@@ -1222,24 +1250,24 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
         }
     }
     _sharedState.env.DEBUG && console.log("Setting up new context...");
-    let context2 = createContext(tailwindConfig, [], root);
-    Object.assign(context2, {
+    let context = createContext(tailwindConfig, [], root);
+    Object.assign(context, {
         userConfigPath
     });
-    let [, mtimesToCommit1] = trackModified([
+    let [, mtimesToCommit] = trackModified([
         ...contextDependencies
-    ], getFileModifiedMap(context2));
+    ], getFileModifiedMap(context));
     // ---
     // Update all context tracking state
-    configContextMap.set(tailwindConfigHash, context2);
-    contextMap.set(sourcePath, context2);
-    if (!contextSourcesMap.has(context2)) {
-        contextSourcesMap.set(context2, new Set());
+    configContextMap.set(tailwindConfigHash, context);
+    contextMap.set(sourcePath, context);
+    if (!contextSourcesMap.has(context)) {
+        contextSourcesMap.set(context, new Set());
     }
-    contextSourcesMap.get(context2).add(sourcePath);
+    contextSourcesMap.get(context).add(sourcePath);
     return [
-        context2,
+        context,
         true,
-        mtimesToCommit1
+        mtimesToCommit
     ];
 }

package/lib/lib/setupTrackingContext.js

@@ -9,25 +9,27 @@ Object.defineProperty(exports, // DISABLE_TOUCH = TRUE
 // plugins) then return it
 "default", {
     enumerable: true,
-    get: ()=>setupTrackingContext
+    get: function() {
+        return setupTrackingContext;
+    }
 });
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _quickLru = /*#__PURE__*/ _interopRequireDefault(require("quick-lru"));
-const _hashConfig = /*#__PURE__*/ _interopRequireDefault(require("../util/hashConfig"));
-const _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../public/resolve-config"));
-const _resolveConfigPath = /*#__PURE__*/ _interopRequireDefault(require("../util/resolveConfigPath"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _quicklru = /*#__PURE__*/ _interop_require_default(require("@alloc/quick-lru"));
+const _hashConfig = /*#__PURE__*/ _interop_require_default(require("../util/hashConfig"));
+const _resolveconfig = /*#__PURE__*/ _interop_require_default(require("../public/resolve-config"));
+const _resolveConfigPath = /*#__PURE__*/ _interop_require_default(require("../util/resolveConfigPath"));
 const _setupContextUtils = require("./setupContextUtils");
-const _parseDependency = /*#__PURE__*/ _interopRequireDefault(require("../util/parseDependency"));
-const _validateConfigJs = require("../util/validateConfig.js");
-const _contentJs = require("./content.js");
-const _loadConfig = require("../lib/load-config");
-const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("./getModuleDependencies"));
-function _interopRequireDefault(obj) {
+const _parseDependency = /*#__PURE__*/ _interop_require_default(require("../util/parseDependency"));
+const _validateConfig = require("../util/validateConfig.js");
+const _content = require("./content.js");
+const _loadconfig = require("../lib/load-config");
+const _getModuleDependencies = /*#__PURE__*/ _interop_require_default(require("./getModuleDependencies"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-let configPathCache = new _quickLru.default({
+let configPathCache = new _quicklru.default({
     maxSize: 100
 });
 let candidateFilesCache = new WeakMap();
@@ -35,7 +37,7 @@ function getCandidateFiles(context, tailwindConfig) {
     if (candidateFilesCache.has(context)) {
         return candidateFilesCache.get(context);
     }
-    let candidateFiles = (0, _contentJs.parseCandidateFiles)(context, tailwindConfig);
+    let candidateFiles = (0, _content.parseCandidateFiles)(context, tailwindConfig);
     return candidateFilesCache.set(context, candidateFiles).get(context);
 }
 // Get the config object based on a path
@@ -63,10 +65,10 @@ function getTailwindConfig(configOrPath) {
             ];
         }
         // It has changed (based on timestamps), or first run
-        for (let file1 of newDeps){
-            delete require.cache[file1];
+        for (let file of newDeps){
+            delete require.cache[file];
         }
-        let newConfig = (0, _validateConfigJs.validateConfig)((0, _resolveConfig.default)((0, _loadConfig.loadConfig)(userConfigPath)));
+        let newConfig = (0, _validateConfig.validateConfig)((0, _resolveconfig.default)((0, _loadconfig.loadConfig)(userConfigPath)));
         let newHash = (0, _hashConfig.default)(newConfig);
         configPathCache.set(userConfigPath, [
             newConfig,
@@ -81,13 +83,14 @@ function getTailwindConfig(configOrPath) {
             newDeps
         ];
     }
+    var _configOrPath_config, _ref;
     // It's a plain object, not a path
-    let newConfig1 = (0, _resolveConfig.default)(configOrPath.config === undefined ? configOrPath : configOrPath.config);
-    newConfig1 = (0, _validateConfigJs.validateConfig)(newConfig1);
+    let newConfig = (0, _resolveconfig.default)((_ref = (_configOrPath_config = configOrPath === null || configOrPath === void 0 ? void 0 : configOrPath.config) !== null && _configOrPath_config !== void 0 ? _configOrPath_config : configOrPath) !== null && _ref !== void 0 ? _ref : {});
+    newConfig = (0, _validateConfig.validateConfig)(newConfig);
     return [
-        newConfig1,
+        newConfig,
         null,
-        (0, _hashConfig.default)(newConfig1),
+        (0, _hashConfig.default)(newConfig),
         []
     ];
 }
@@ -127,7 +130,7 @@ function setupTrackingContext(configOrPath) {
                         registerDependency(dependency);
                     }
                 }
-                let [changedContent, contentMTimesToCommit] = (0, _contentJs.resolvedChangedContent)(context, candidateFiles, fileModifiedMap);
+                let [changedContent, contentMTimesToCommit] = (0, _content.resolvedChangedContent)(context, candidateFiles, fileModifiedMap);
                 for (let content of changedContent){
                     context.changedContent.push(content);
                 }
@@ -154,8 +157,8 @@ function setupTrackingContext(configOrPath) {
             // "commit" the new modified time for all context deps
             // We do this here because we want content tracking to
             // read the "old" mtime even when it's a context dependency.
-            for (let [path1, mtime1] of mTimesToCommit.entries()){
-                fileModifiedMap.set(path1, mtime1);
+            for (let [path, mtime] of mTimesToCommit.entries()){
+                fileModifiedMap.set(path, mtime);
             }
             return context;
         };