tailwindcss 3.1.4 → 3.1.7

package/lib/lib/setupContextUtils.js

@@ -2,48 +2,56 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.isValidVariantFormatString = isValidVariantFormatString;
-exports.parseVariant = parseVariant;
-exports.getFileModifiedMap = getFileModifiedMap;
-exports.createContext = createContext;
-exports.getContext = getContext;
-var _fs = _interopRequireDefault(require("fs"));
-var _url = _interopRequireDefault(require("url"));
-var _postcss = _interopRequireDefault(require("postcss"));
-var _dlv = _interopRequireDefault(require("dlv"));
-var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
-var _featureFlagsJs = require("../featureFlags.js");
-var _transformThemeValue = _interopRequireDefault(require("../util/transformThemeValue"));
-var _parseObjectStyles = _interopRequireDefault(require("../util/parseObjectStyles"));
-var _prefixSelector = _interopRequireDefault(require("../util/prefixSelector"));
-var _isPlainObject = _interopRequireDefault(require("../util/isPlainObject"));
-var _escapeClassName = _interopRequireDefault(require("../util/escapeClassName"));
-var _nameClass = _interopRequireWildcard(require("../util/nameClass"));
-var _pluginUtils = require("../util/pluginUtils");
-var _bigSign = _interopRequireDefault(require("../util/bigSign"));
-var _corePlugins = require("../corePlugins");
-var sharedState = _interopRequireWildcard(require("./sharedState"));
-var _toPath = require("../util/toPath");
-var _log = _interopRequireDefault(require("../util/log"));
-var _negateValue = _interopRequireDefault(require("../util/negateValue"));
-var _isValidArbitraryValue = _interopRequireDefault(require("../util/isValidArbitraryValue"));
-var _generateRules = require("./generateRules");
-var _cacheInvalidationJs = require("./cacheInvalidation.js");
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    isValidVariantFormatString: ()=>isValidVariantFormatString,
+    parseVariant: ()=>parseVariant,
+    getFileModifiedMap: ()=>getFileModifiedMap,
+    createContext: ()=>createContext,
+    getContext: ()=>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 _featureFlagsJs = require("../featureFlags.js");
+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 _pluginUtils = require("../util/pluginUtils");
+const _bigSign = /*#__PURE__*/ _interopRequireDefault(require("../util/bigSign"));
+const _corePlugins = require("../corePlugins");
+const _sharedState = /*#__PURE__*/ _interopRequireWildcard(require("./sharedState"));
+const _toPath = require("../util/toPath");
+const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
+const _negateValue = /*#__PURE__*/ _interopRequireDefault(require("../util/negateValue"));
+const _isValidArbitraryValue = /*#__PURE__*/ _interopRequireDefault(require("../util/isValidArbitraryValue"));
+const _generateRules = require("./generateRules");
+const _cacheInvalidationJs = require("./cacheInvalidation.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function _getRequireWildcardCache() {
+function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
-    var cache = new WeakMap();
-    _getRequireWildcardCache = function() {
-        return cache;
-    };
-    return cache;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
 }
-function _interopRequireWildcard(obj) {
-    if (obj && obj.__esModule) {
+function _interopRequireWildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }
     if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
@@ -51,14 +59,14 @@ function _interopRequireWildcard(obj) {
             default: obj
         };
     }
-    var cache = _getRequireWildcardCache();
+    var cache = _getRequireWildcardCache(nodeInterop);
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
     var newObj = {};
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
             var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
             if (desc && (desc.get || desc.set)) {
                 Object.defineProperty(newObj, key, desc);
@@ -75,8 +83,8 @@ function _interopRequireWildcard(obj) {
 }
 let MATCH_VARIANT = Symbol();
 function prefix(context, selector) {
-    let prefix1 = context.tailwindConfig.prefix;
-    return typeof prefix1 === "function" ? prefix1(selector) : prefix1 + selector;
+    let prefix = context.tailwindConfig.prefix;
+    return typeof prefix === "function" ? prefix(selector) : prefix + selector;
 }
 function parseVariantFormatString(input) {
     if (input.includes("{")) {
@@ -122,12 +130,12 @@ function parseStyles(styles) {
         ]);
     }
     return styles.flatMap((style)=>{
-        let isNode = !Array.isArray(style) && !(0, _isPlainObject).default(style);
-        return isNode ? style : (0, _parseObjectStyles).default(style);
+        let isNode = !Array.isArray(style) && !(0, _isPlainObject.default)(style);
+        return isNode ? style : (0, _parseObjectStyles.default)(style);
     });
 }
 function getClasses(selector, mutate) {
-    let parser = (0, _postcssSelectorParser).default((selectors)=>{
+    let parser = (0, _postcssSelectorParser.default)((selectors)=>{
         let allClasses = [];
         if (mutate) {
             mutate(selectors);
@@ -187,7 +195,7 @@ function withIdentifiers(styles) {
         let [containsNonOnDemandableSelectors, candidates] = extractCandidates(node);
         // If this isn't "on-demandable", assign it a universal candidate to always include it.
         if (containsNonOnDemandableSelectors) {
-            candidates.unshift(sharedState.NOT_ON_DEMAND);
+            candidates.unshift(_sharedState.NOT_ON_DEMAND);
         }
         // However, it could be that it also contains "on-demandable" candidates.
         // E.g.: `span, .foo {}`, in that case it should still be possible to use
@@ -226,14 +234,14 @@ function parseVariant(variant) {
 }
 function buildPluginApi(tailwindConfig, context, { variantList , variantMap , offsets , classList  }) {
     function getConfigValue(path, defaultValue) {
-        return path ? (0, _dlv).default(tailwindConfig, path, defaultValue) : tailwindConfig;
+        return path ? (0, _dlv.default)(tailwindConfig, path, defaultValue) : tailwindConfig;
     }
     function applyConfiguredPrefix(selector) {
-        return (0, _prefixSelector).default(tailwindConfig.prefix, selector);
+        return (0, _prefixSelector.default)(tailwindConfig.prefix, selector);
     }
     function prefixIdentifier(identifier, options) {
-        if (identifier === sharedState.NOT_ON_DEMAND) {
-            return sharedState.NOT_ON_DEMAND;
+        if (identifier === _sharedState.NOT_ON_DEMAND) {
+            return _sharedState.NOT_ON_DEMAND;
         }
         if (!options.respectPrefix) {
             return identifier;
@@ -241,20 +249,20 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         return context.tailwindConfig.prefix + identifier;
     }
     function resolveThemeValue(path, defaultValue, opts = {}) {
-        const [pathRoot, ...subPaths] = (0, _toPath).toPath(path);
+        const [pathRoot, ...subPaths] = (0, _toPath.toPath)(path);
         const value = getConfigValue([
             "theme",
             pathRoot,
             ...subPaths
         ], defaultValue);
-        return (0, _transformThemeValue).default(pathRoot)(value, opts);
+        return (0, _transformThemeValue.default)(pathRoot)(value, opts);
     }
     const theme = Object.assign((path, defaultValue = undefined)=>resolveThemeValue(path, defaultValue), {
         withAlpha: (path, opacityValue)=>resolveThemeValue(path, undefined, {
                 opacityValue
             })
     });
-    let api1 = {
+    let api = {
         postcss: _postcss.default,
         prefix: applyConfiguredPrefix,
         e: _escapeClassName.default,
@@ -312,6 +320,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         },
         addComponents (components, options) {
             let defaultOptions = {
+                preserveSource: false,
                 respectPrefix: true,
                 respectImportant: false
             };
@@ -334,6 +343,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
         },
         addUtilities (utilities, options) {
             let defaultOptions = {
+                preserveSource: false,
                 respectPrefix: true,
                 respectImportant: true
             };
@@ -374,18 +384,18 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 function wrapped(modifier, { isOnlyPlugin  }) {
                     let { type ="any"  } = options;
                     type = [].concat(type);
-                    let [value, coercedType] = (0, _pluginUtils).coerceValue(type, modifier, options, tailwindConfig);
+                    let [value, coercedType] = (0, _pluginUtils.coerceValue)(type, modifier, options, tailwindConfig);
                     if (value === undefined) {
                         return [];
                     }
                     if (!type.includes(coercedType) && !isOnlyPlugin) {
                         return [];
                     }
-                    if (!(0, _isValidArbitraryValue).default(value)) {
+                    if (!(0, _isValidArbitraryValue.default)(value)) {
                         return [];
                     }
                     let ruleSets = [].concat(rule(value)).filter(Boolean).map((declaration)=>({
-                            [(0, _nameClass).default(identifier, modifier)]: declaration
+                            [(0, _nameClass.default)(identifier, modifier)]: declaration
                         }));
                     return ruleSets;
                 }
@@ -423,7 +433,7 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                 function wrapped(modifier, { isOnlyPlugin  }) {
                     let { type ="any"  } = options;
                     type = [].concat(type);
-                    let [value, coercedType] = (0, _pluginUtils).coerceValue(type, modifier, options, tailwindConfig);
+                    let [value, coercedType] = (0, _pluginUtils.coerceValue)(type, modifier, options, tailwindConfig);
                     if (value === undefined) {
                         return [];
                     }
@@ -437,11 +447,11 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                             return [];
                         }
                     }
-                    if (!(0, _isValidArbitraryValue).default(value)) {
+                    if (!(0, _isValidArbitraryValue.default)(value)) {
                         return [];
                     }
                     let ruleSets = [].concat(rule(value)).filter(Boolean).map((declaration)=>({
-                            [(0, _nameClass).default(identifier, modifier)]: declaration
+                            [(0, _nameClass.default)(identifier, modifier)]: declaration
                         }));
                     return ruleSets;
                 }
@@ -494,20 +504,20 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
             variantMap.set(variantName, variantFunctions);
         }
     };
-    if ((0, _featureFlagsJs).flagEnabled(tailwindConfig, "matchVariant")) {
-        api1.matchVariant = function(variants, options) {
+    if ((0, _featureFlagsJs.flagEnabled)(tailwindConfig, "matchVariant")) {
+        api.matchVariant = function(variants, options) {
             for(let variant in variants){
                 var ref;
                 for (let [k, v] of Object.entries((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {})){
-                    api1.addVariant(`${variant}-${k}`, variants[variant](v));
+                    api.addVariant(`${variant}-${k}`, variants[variant](v));
                 }
-                api1.addVariant(variant, Object.assign(({ args  })=>variants[variant](args), {
+                api.addVariant(variant, Object.assign(({ args  })=>variants[variant](args), {
                     [MATCH_VARIANT]: true
                 }), options);
             }
         };
     }
-    return api1;
+    return api;
 }
 let fileModifiedMapCache = new WeakMap();
 function getFileModifiedMap(context) {
@@ -573,19 +583,21 @@ function collectLayerPlugins(root) {
             }
             layerRule.remove();
         } else if (layerRule.params === "components") {
-            for (let node of layerRule.nodes){
+            for (let node1 of layerRule.nodes){
                 layerPlugins.push(function({ addComponents  }) {
-                    addComponents(node, {
-                        respectPrefix: false
+                    addComponents(node1, {
+                        respectPrefix: false,
+                        preserveSource: true
                     });
                 });
             }
             layerRule.remove();
         } else if (layerRule.params === "utilities") {
-            for (let node of layerRule.nodes){
+            for (let node2 of layerRule.nodes){
                 layerPlugins.push(function({ addUtilities  }) {
-                    addUtilities(node, {
-                        respectPrefix: false
+                    addUtilities(node2, {
+                        respectPrefix: false,
+                        preserveSource: true
                     });
                 });
             }
@@ -688,14 +700,14 @@ function registerPlugins(plugins, context) {
             variant,
             bits
         ];
-    }).sort(([, a], [, z])=>(0, _bigSign).default(a - z)));
+    }).sort(([, a], [, z])=>(0, _bigSign.default)(a - z)));
     context.minimumScreen = [
         ...context.variantOrder.values()
     ].shift();
     // Build variantMap
-    for (let [variantName, variantFunctions1] of variantMap.entries()){
+    for (let [variantName, variantFunctions] of variantMap.entries()){
         let sort = context.variantOrder.get(variantName);
-        context.variantMap.set(variantName, variantFunctions1.map((variantFunction, idx)=>[
+        context.variantMap.set(variantName, variantFunctions.map((variantFunction, idx)=>[
                 sort << BigInt(idx),
                 variantFunction
             ]));
@@ -704,15 +716,15 @@ function registerPlugins(plugins, context) {
     let safelist = ((_safelist = context.tailwindConfig.safelist) !== null && _safelist !== void 0 ? _safelist : []).filter(Boolean);
     if (safelist.length > 0) {
         let checks = [];
-        for (let value1 of safelist){
-            if (typeof value1 === "string") {
+        for (let value of safelist){
+            if (typeof value === "string") {
                 context.changedContent.push({
-                    content: value1,
+                    content: value,
                     extension: "html"
                 });
                 continue;
             }
-            if (value1 instanceof RegExp) {
+            if (value instanceof RegExp) {
                 _log.default.warn("root-regex", [
                     "Regular expressions in `safelist` work differently in Tailwind CSS v3.0.",
                     "Update your `safelist` configuration to eliminate this warning.",
@@ -720,7 +732,7 @@ function registerPlugins(plugins, context) {
                 ]);
                 continue;
             }
-            checks.push(value1);
+            checks.push(value);
         }
         if (checks.length > 0) {
             let patternMatchingCount = new Map();
@@ -730,7 +742,7 @@ function registerPlugins(plugins, context) {
                     let [utilName, options] = util;
                     var ref;
                     let values = Object.keys((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {});
-                    let classes = values.map((value)=>(0, _nameClass).formatClass(utilName, value));
+                    let classes = values.map((value)=>(0, _nameClass.formatClass)(utilName, value));
                     if (options === null || options === void 0 ? void 0 : options.supportsNegativeValues) {
                         // This is the normal negated version
                         // e.g. `-inset-1` or `-tw-inset-1`
@@ -747,6 +759,12 @@ function registerPlugins(plugins, context) {
                             ...classes.map((cls)=>cls.slice(0, prefixLength) + "-" + cls.slice(prefixLength)), 
                         ];
                     }
+                    if ([].concat(options === null || options === void 0 ? void 0 : options.type).includes("color")) {
+                        classes = [
+                            ...classes,
+                            ...classes.flatMap((cls)=>Object.keys(context.tailwindConfig.theme.opacity).map((opacity)=>`${cls}/${opacity}`)), 
+                        ];
+                    }
                     return classes;
                 })() : [
                     util
@@ -794,7 +812,7 @@ function registerPlugins(plugins, context) {
     ]);
     context.getClassOrder = function getClassOrder(classes) {
         let sortedClassNames = new Map();
-        for (let [sort, rule] of (0, _generateRules).generateRules(new Set(classes), context)){
+        for (let [sort, rule] of (0, _generateRules.generateRules)(new Set(classes), context)){
             if (sortedClassNames.has(rule.raws.tailwind.candidate)) continue;
             sortedClassNames.set(rule.raws.tailwind.candidate, sort);
         }
@@ -823,9 +841,9 @@ function registerPlugins(plugins, context) {
                 let negativeClasses = [];
                 var ref;
                 for (let [key, value] of Object.entries((ref = options === null || options === void 0 ? void 0 : options.values) !== null && ref !== void 0 ? ref : {})){
-                    output.push((0, _nameClass).formatClass(utilName, key));
-                    if ((options === null || options === void 0 ? void 0 : options.supportsNegativeValues) && (0, _negateValue).default(value)) {
-                        negativeClasses.push((0, _nameClass).formatClass(utilName, `-${key}`));
+                    output.push((0, _nameClass.formatClass)(utilName, key));
+                    if ((options === null || options === void 0 ? void 0 : options.supportsNegativeValues) && (0, _negateValue.default)(value)) {
+                        negativeClasses.push((0, _nameClass.formatClass)(utilName, `-${key}`));
                     }
                 }
                 output.push(...negativeClasses);
@@ -854,13 +872,13 @@ function createContext(tailwindConfig, changedContent = [], root = _postcss.defa
     registerPlugins(resolvedPlugins, context);
     return context;
 }
-let contextMap = sharedState.contextMap;
-let configContextMap = sharedState.configContextMap;
-let contextSourcesMap = sharedState.contextSourcesMap;
+let contextMap = _sharedState.contextMap;
+let configContextMap = _sharedState.configContextMap;
+let contextSourcesMap = _sharedState.contextSourcesMap;
 function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfigHash, contextDependencies) {
     let sourcePath = result.opts.from;
     let isConfigFile = userConfigPath !== null;
-    sharedState.env.DEBUG && console.log("Source path:", sourcePath);
+    _sharedState.env.DEBUG && console.log("Source path:", sourcePath);
     let existingContext;
     if (isConfigFile && contextMap.has(sourcePath)) {
         existingContext = contextMap.get(sourcePath);
@@ -870,7 +888,7 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
         contextMap.set(sourcePath, context);
         existingContext = context;
     }
-    let cssDidChange = (0, _cacheInvalidationJs).hasContentChanged(sourcePath, root);
+    let cssDidChange = (0, _cacheInvalidationJs.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) {
@@ -895,9 +913,9 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
             contextSourcesMap.get(oldContext).delete(sourcePath);
             if (contextSourcesMap.get(oldContext).size === 0) {
                 contextSourcesMap.delete(oldContext);
-                for (let [tailwindConfigHash, context] of configContextMap){
-                    if (context === oldContext) {
-                        configContextMap.delete(tailwindConfigHash);
+                for (let [tailwindConfigHash1, context1] of configContextMap){
+                    if (context1 === oldContext) {
+                        configContextMap.delete(tailwindConfigHash1);
                     }
                 }
                 for (let disposable of oldContext.disposables.splice(0)){
@@ -906,21 +924,21 @@ function getContext(root, result, tailwindConfig, userConfigPath, tailwindConfig
             }
         }
     }
-    sharedState.env.DEBUG && console.log("Setting up new context...");
-    let context = createContext(tailwindConfig, [], root);
+    _sharedState.env.DEBUG && console.log("Setting up new context...");
+    let context2 = createContext(tailwindConfig, [], root);
     trackModified([
         ...contextDependencies
-    ], getFileModifiedMap(context));
+    ], getFileModifiedMap(context2));
     // ---
     // Update all context tracking state
-    configContextMap.set(tailwindConfigHash, context);
-    contextMap.set(sourcePath, context);
-    if (!contextSourcesMap.has(context)) {
-        contextSourcesMap.set(context, new Set());
+    configContextMap.set(tailwindConfigHash, context2);
+    contextMap.set(sourcePath, context2);
+    if (!contextSourcesMap.has(context2)) {
+        contextSourcesMap.set(context2, new Set());
     }
-    contextSourcesMap.get(context).add(sourcePath);
+    contextSourcesMap.get(context2).add(sourcePath);
     return [
-        context,
+        context2,
         true
     ];
 }