tailwindcss 3.1.4 → 3.1.7

package/lib/lib/generateRules.js

@@ -2,37 +2,46 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.generateRules = exports.resolveMatches = void 0;
-var _postcss = _interopRequireDefault(require("postcss"));
-var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
-var _parseObjectStyles = _interopRequireDefault(require("../util/parseObjectStyles"));
-var _isPlainObject = _interopRequireDefault(require("../util/isPlainObject"));
-var _prefixSelector = _interopRequireDefault(require("../util/prefixSelector"));
-var _pluginUtils = require("../util/pluginUtils");
-var _log = _interopRequireDefault(require("../util/log"));
-var sharedState = _interopRequireWildcard(require("./sharedState"));
-var _formatVariantSelector = require("../util/formatVariantSelector");
-var _nameClass = require("../util/nameClass");
-var _dataTypes = require("../util/dataTypes");
-var _setupContextUtils = require("./setupContextUtils");
-var _isValidArbitraryValue = _interopRequireDefault(require("../util/isValidArbitraryValue"));
-var _splitAtTopLevelOnlyJs = require("../util/splitAtTopLevelOnly.js");
-var _featureFlags = require("../featureFlags");
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    resolveMatches: ()=>resolveMatches,
+    generateRules: ()=>generateRules
+});
+const _postcss = /*#__PURE__*/ _interopRequireDefault(require("postcss"));
+const _postcssSelectorParser = /*#__PURE__*/ _interopRequireDefault(require("postcss-selector-parser"));
+const _parseObjectStyles = /*#__PURE__*/ _interopRequireDefault(require("../util/parseObjectStyles"));
+const _isPlainObject = /*#__PURE__*/ _interopRequireDefault(require("../util/isPlainObject"));
+const _prefixSelector = /*#__PURE__*/ _interopRequireDefault(require("../util/prefixSelector"));
+const _pluginUtils = require("../util/pluginUtils");
+const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
+const _sharedState = /*#__PURE__*/ _interopRequireWildcard(require("./sharedState"));
+const _formatVariantSelector = require("../util/formatVariantSelector");
+const _nameClass = require("../util/nameClass");
+const _dataTypes = require("../util/dataTypes");
+const _setupContextUtils = require("./setupContextUtils");
+const _isValidArbitraryValue = /*#__PURE__*/ _interopRequireDefault(require("../util/isValidArbitraryValue"));
+const _splitAtTopLevelOnlyJs = require("../util/splitAtTopLevelOnly.js");
+const _featureFlags = require("../featureFlags");
 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") {
@@ -40,14 +49,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);
@@ -62,7 +71,7 @@ function _interopRequireWildcard(obj) {
     }
     return newObj;
 }
-let classNameParser = (0, _postcssSelectorParser).default((selectors)=>{
+let classNameParser = (0, _postcssSelectorParser.default)((selectors)=>{
     return selectors.first.filter(({ type  })=>type === "class").pop().value;
 });
 function getClassNameFromSelector(selector) {
@@ -121,7 +130,7 @@ function applyPrefix(matches, context) {
                 // Not doing this will cause `-tw-top-1` to generate the class `.tw--top-1`
                 // The disconnect between candidate <-> class can cause @apply to hard crash.
                 let shouldPrependNegative = classCandidate.startsWith("-");
-                r.selector = (0, _prefixSelector).default(context.tailwindConfig.prefix, r.selector, shouldPrependNegative);
+                r.selector = (0, _prefixSelector.default)(context.tailwindConfig.prefix, r.selector, shouldPrependNegative);
             });
             match[1] = container.nodes[0];
         }
@@ -140,7 +149,7 @@ function applyImportant(matches, classCandidate) {
             ]
         });
         container.walkRules((r)=>{
-            r.selector = (0, _pluginUtils).updateAllClasses(r.selector, (className)=>{
+            r.selector = (0, _pluginUtils.updateAllClasses)(r.selector, (className)=>{
                 if (className === classCandidate) {
                     return `!${className}`;
                 }
@@ -171,6 +180,7 @@ function applyVariant(variant, matches, context) {
         return matches;
     }
     let args;
+    let isArbitraryVariant = false;
     // Find partial arbitrary variants
     if (variant.endsWith("]") && !variant.startsWith("[")) {
         args = variant.slice(variant.lastIndexOf("[") + 1, -1);
@@ -178,11 +188,12 @@ function applyVariant(variant, matches, context) {
     }
     // Register arbitrary variants
     if (isArbitraryValue(variant) && !context.variantMap.has(variant)) {
-        let selector = (0, _dataTypes).normalize(variant.slice(1, -1));
-        if (!(0, _setupContextUtils).isValidVariantFormatString(selector)) {
+        let selector = (0, _dataTypes.normalize)(variant.slice(1, -1));
+        if (!(0, _setupContextUtils.isValidVariantFormatString)(selector)) {
             return [];
         }
-        let fn = (0, _setupContextUtils).parseVariant(selector);
+        isArbitraryVariant = true;
+        let fn = (0, _setupContextUtils.parseVariant)(selector);
         let sort = Array.from(context.variantOrder.values()).pop() << 1n;
         context.variantMap.set(variant, [
             [
@@ -195,14 +206,14 @@ function applyVariant(variant, matches, context) {
     if (context.variantMap.has(variant)) {
         let variantFunctionTuples = context.variantMap.get(variant).slice();
         let result = [];
-        for (let [meta, rule1] of matches){
+        for (let [meta, rule] of matches){
             // Don't generate variants for user css
             if (meta.layer === "user") {
                 continue;
             }
             let container = _postcss.default.root({
                 nodes: [
-                    rule1.clone()
+                    rule.clone()
                 ]
             });
             for (let [variantSort, variantFunction, containerFromArray] of variantFunctionTuples){
@@ -256,7 +267,7 @@ function applyVariant(variant, matches, context) {
                 // It can happen that a list of format strings is returned from within the function. In that
                 // case, we have to process them as well. We can use the existing `variantSort`.
                 if (Array.isArray(ruleWithVariant)) {
-                    for (let [idx, variantFunction] of ruleWithVariant.entries()){
+                    for (let [idx, variantFunction1] of ruleWithVariant.entries()){
                         // This is a little bit scary since we are pushing to an array of items that we are
                         // currently looping over. However, you can also think of it like a processing queue
                         // where you keep handling jobs until everything is done and each job can queue more
@@ -267,7 +278,7 @@ function applyVariant(variant, matches, context) {
                             // then this might be the place too look at. One potential solution to this problem is
                             // reserving additional X places for these 'unknown' variants in between.
                             variantSort | BigInt(idx << ruleWithVariant.length),
-                            variantFunction,
+                            variantFunction1,
                             // If the clone has been modified we have to pass that back
                             // though so each rule can use the modified container
                             clone.clone(), 
@@ -296,7 +307,7 @@ function applyVariant(variant, matches, 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 = `${variant}${context.tailwindConfig.separator}${classNode.value}`;
                             });
@@ -329,7 +340,8 @@ function applyVariant(variant, matches, context) {
                     {
                         ...meta,
                         sort: variantSort | meta.sort,
-                        collectedFormats: ((_collectedFormats = meta.collectedFormats) !== null && _collectedFormats !== void 0 ? _collectedFormats : []).concat(collectedFormats)
+                        collectedFormats: ((_collectedFormats = meta.collectedFormats) !== null && _collectedFormats !== void 0 ? _collectedFormats : []).concat(collectedFormats),
+                        isArbitraryVariant
                     },
                     clone.nodes[0], 
                 ];
@@ -342,7 +354,7 @@ function applyVariant(variant, matches, context) {
 }
 function parseRules(rule, cache, options = {}) {
     // PostCSS node
-    if (!(0, _isPlainObject).default(rule) && !Array.isArray(rule)) {
+    if (!(0, _isPlainObject.default)(rule) && !Array.isArray(rule)) {
         return [
             [
                 rule
@@ -356,7 +368,7 @@ function parseRules(rule, cache, options = {}) {
     }
     // Simple object
     if (!cache.has(rule)) {
-        cache.set(rule, (0, _parseObjectStyles).default(rule));
+        cache.set(rule, (0, _parseObjectStyles.default)(rule));
     }
     return [
         cache.get(rule),
@@ -417,10 +429,10 @@ function extractArbitraryProperty(classCandidate, context) {
     if (!isValidPropName(property)) {
         return null;
     }
-    if (!(0, _isValidArbitraryValue).default(value)) {
+    if (!(0, _isValidArbitraryValue.default)(value)) {
         return null;
     }
-    let normalized = (0, _dataTypes).normalize(value);
+    let normalized = (0, _dataTypes.normalize)(value);
     if (!isParsableCssValue(property, normalized)) {
         return null;
     }
@@ -431,7 +443,7 @@ function extractArbitraryProperty(classCandidate, context) {
                 layer: "utilities"
             },
             ()=>({
-                    [(0, _nameClass).asClass(classCandidate)]: {
+                    [(0, _nameClass.asClass)(classCandidate)]: {
                         [property]: normalized
                     }
                 }), 
@@ -478,18 +490,21 @@ function* resolveMatchedPlugins(classCandidate, context) {
     }
 }
 function splitWithSeparator(input, separator) {
-    if (input === sharedState.NOT_ON_DEMAND) {
+    if (input === _sharedState.NOT_ON_DEMAND) {
         return [
-            sharedState.NOT_ON_DEMAND
+            _sharedState.NOT_ON_DEMAND
         ];
     }
-    return Array.from((0, _splitAtTopLevelOnlyJs).splitAtTopLevelOnly(input, separator));
+    return Array.from((0, _splitAtTopLevelOnlyJs.splitAtTopLevelOnly)(input, separator));
 }
 function* recordCandidates(matches, classCandidate) {
     for (const match of matches){
+        var ref;
+        var ref1;
         match[1].raws.tailwind = {
             ...match[1].raws.tailwind,
-            classCandidate
+            classCandidate,
+            preserveSource: (ref1 = (ref = match[0].options) === null || ref === void 0 ? void 0 : ref.preserveSource) !== null && ref1 !== void 0 ? ref1 : false
         };
         yield match;
     }
@@ -502,10 +517,10 @@ function* resolveMatches(candidate, context, original = candidate) {
         important = true;
         classCandidate = classCandidate.slice(1);
     }
-    if ((0, _featureFlags).flagEnabled(context.tailwindConfig, "variantGrouping")) {
+    if ((0, _featureFlags.flagEnabled)(context.tailwindConfig, "variantGrouping")) {
         if (classCandidate.startsWith("(") && classCandidate.endsWith(")")) {
             let base = variants.slice().reverse().join(separator);
-            for (let part of (0, _splitAtTopLevelOnlyJs).splitAtTopLevelOnly(classCandidate.slice(1, -1), ",")){
+            for (let part of (0, _splitAtTopLevelOnlyJs.splitAtTopLevelOnly)(classCandidate.slice(1, -1), ",")){
                 yield* resolveMatches(base + separator + part, context, original);
             }
         }
@@ -547,18 +562,18 @@ function* resolveMatches(candidate, context, original = candidate) {
                     }
                 }
             } else if (modifier === "DEFAULT" || modifier === "-DEFAULT") {
-                let ruleSet = plugin;
-                let [rules, options] = parseRules(ruleSet, context.postCssNodeCache);
-                for (let rule of rules){
+                let ruleSet1 = plugin;
+                let [rules1, options1] = parseRules(ruleSet1, context.postCssNodeCache);
+                for (let rule1 of rules1){
                     matchesPerPlugin.push([
                         {
                             ...sort,
                             options: {
                                 ...sort.options,
-                                ...options
+                                ...options1
                             }
                         },
-                        rule
+                        rule1
                     ]);
                 }
             }
@@ -592,11 +607,11 @@ function* resolveMatches(candidate, context, original = candidate) {
                 }
                 let messages = [];
                 for (let [idx, group] of typesPerPlugin.entries()){
-                    for (let type of group){
-                        let rules = matches[idx].map(([, rule])=>rule).flat().map((rule)=>rule.toString().split("\n").slice(1, -1) // Remove selector and closing '}'
+                    for (let type1 of group){
+                        let rules2 = matches[idx].map(([, rule])=>rule).flat().map((rule)=>rule.toString().split("\n").slice(1, -1) // Remove selector and closing '}'
                             .map((line)=>line.trim()).map((x)=>`      ${x}`) // Re-indent
                             .join("\n")).join("\n\n");
-                        messages.push(`  Use \`${candidate.replace("[", `[${type}:`)}\` for \`${rules.trim()}\``);
+                        messages.push(`  Use \`${candidate.replace("[", `[${type1}:`)}\` for \`${rules2.trim()}\``);
                         break;
                     }
                 }
@@ -618,33 +633,34 @@ function* resolveMatches(candidate, context, original = candidate) {
         for (let variant of variants){
             matches = applyVariant(variant, matches, context);
         }
-        for (let match1 of matches){
-            match1[1].raws.tailwind = {
-                ...match1[1].raws.tailwind,
+        for (let match of matches){
+            match[1].raws.tailwind = {
+                ...match[1].raws.tailwind,
                 candidate
             };
             // Apply final format selector
-            if (match1[0].collectedFormats) {
-                let finalFormat = (0, _formatVariantSelector).formatVariantSelector("&", ...match1[0].collectedFormats);
+            if (match[0].collectedFormats) {
+                let finalFormat = (0, _formatVariantSelector.formatVariantSelector)("&", ...match[0].collectedFormats);
                 let container = _postcss.default.root({
                     nodes: [
-                        match1[1].clone()
+                        match[1].clone()
                     ]
                 });
                 container.walkRules((rule)=>{
                     var ref;
                     if (inKeyframes(rule)) return;
-                    var ref2;
-                    rule.selector = (0, _formatVariantSelector).finalizeSelector(finalFormat, {
+                    var ref1;
+                    rule.selector = (0, _formatVariantSelector.finalizeSelector)(finalFormat, {
                         selector: rule.selector,
                         candidate: original,
-                        base: candidate.split(new RegExp(`\\${(ref2 = context === null || context === void 0 ? void 0 : (ref = context.tailwindConfig) === null || ref === void 0 ? void 0 : ref.separator) !== null && ref2 !== void 0 ? ref2 : ":"}(?![^[]*\\])`)).pop(),
+                        base: candidate.split(new RegExp(`\\${(ref1 = context === null || context === void 0 ? void 0 : (ref = context.tailwindConfig) === null || ref === void 0 ? void 0 : ref.separator) !== null && ref1 !== void 0 ? ref1 : ":"}(?![^[]*\\])`)).pop(),
+                        isArbitraryVariant: match[0].isArbitraryVariant,
                         context
                     });
                 });
-                match1[1] = container.nodes[0];
+                match[1] = container.nodes[0];
             }
-            yield match1;
+            yield match;
         }
     }
 }
@@ -714,5 +730,3 @@ function generateRules(candidates, context) {
 function isArbitraryValue(input) {
     return input.startsWith("[") && input.endsWith("]");
 }
-exports.resolveMatches = resolveMatches;
-exports.generateRules = generateRules;

package/lib/lib/getModuleDependencies.js

@@ -2,11 +2,27 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = getModuleDependencies;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _resolve = _interopRequireDefault(require("resolve"));
-var _detective = _interopRequireDefault(require("detective"));
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>getModuleDependencies
+});
+const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
+const _resolve = /*#__PURE__*/ _interopRequireDefault(require("resolve"));
+const _detective = /*#__PURE__*/ _interopRequireDefault(require("detective"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function createModule(file) {
+    const source = _fs.default.readFileSync(file, "utf-8");
+    const requires = (0, _detective.default)(source);
+    return {
+        file,
+        requires
+    };
+}
 function getModuleDependencies(entryFile) {
     const rootModule = createModule(entryFile);
     const modules = [
@@ -33,16 +49,3 @@ function getModuleDependencies(entryFile) {
     }
     return modules;
 }
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function createModule(file) {
-    const source = _fs.default.readFileSync(file, "utf-8");
-    const requires = (0, _detective).default(source);
-    return {
-        file,
-        requires
-    };
-}

package/lib/lib/normalizeTailwindDirectives.js

@@ -2,8 +2,16 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = normalizeTailwindDirectives;
-var _log = _interopRequireDefault(require("../util/log"));
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>normalizeTailwindDirectives
+});
+const _log = /*#__PURE__*/ _interopRequireDefault(require("../util/log"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function normalizeTailwindDirectives(root) {
     let tailwindDirectives = new Set();
     let layerDirectives = new Set();
@@ -77,8 +85,3 @@ function normalizeTailwindDirectives(root) {
         applyDirectives
     };
 }
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}

package/lib/lib/partitionApplyAtRules.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = expandApplyAtRules;
-function expandApplyAtRules() {
-    return (root)=>{
-        partitionRules(root);
-    };
-}
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>expandApplyAtRules
+});
 function partitionRules(root) {
     if (!root.walkAtRules) return;
     let applyParents = new Set();
@@ -17,10 +15,10 @@ function partitionRules(root) {
     if (applyParents.size === 0) {
         return;
     }
-    for (let rule1 of applyParents){
+    for (let rule of applyParents){
         let nodeGroups = [];
         let lastGroup = [];
-        for (let node of rule1.nodes){
+        for (let node of rule.nodes){
             if (node.type === "atrule" && node.name === "apply") {
                 if (lastGroup.length > 0) {
                     nodeGroups.push(lastGroup);
@@ -42,12 +40,17 @@ function partitionRules(root) {
         for (let group of [
             ...nodeGroups
         ].reverse()){
-            let clone = rule1.clone({
+            let clone = rule.clone({
                 nodes: []
             });
             clone.append(group);
-            rule1.after(clone);
+            rule.after(clone);
         }
-        rule1.remove();
+        rule.remove();
     }
 }
+function expandApplyAtRules() {
+    return (root)=>{
+        partitionRules(root);
+    };
+}

package/lib/lib/regex.js

@@ -2,13 +2,21 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.pattern = pattern;
-exports.withoutCapturing = withoutCapturing;
-exports.any = any;
-exports.optional = optional;
-exports.zeroOrMore = zeroOrMore;
-exports.nestedBrackets = nestedBrackets;
-exports.escape = escape;
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    pattern: ()=>pattern,
+    withoutCapturing: ()=>withoutCapturing,
+    any: ()=>any,
+    optional: ()=>optional,
+    zeroOrMore: ()=>zeroOrMore,
+    nestedBrackets: ()=>nestedBrackets,
+    escape: ()=>escape
+});
 const REGEX_SPECIAL = /[\\^$.*+?()[\]{}|]/g;
 const REGEX_HAS_SPECIAL = RegExp(REGEX_SPECIAL.source);
 /**