tailwindcss 3.0.23 → 3.1.1

package/lib/lib/generateRules.js

@@ -14,36 +14,56 @@ 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 _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
+function _getRequireWildcardCache() {
+    if (typeof WeakMap !== "function") return null;
+    var cache = new WeakMap();
+    _getRequireWildcardCache = function() {
+        return cache;
+    };
+    return cache;
+}
 function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
-    } else {
-        var newObj = {};
-        if (obj != null) {
-            for(var key in obj){
-                if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
-                    if (desc.get || desc.set) {
-                        Object.defineProperty(newObj, key, desc);
-                    } else {
-                        newObj[key] = obj[key];
-                    }
-                }
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache();
+    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)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
             }
         }
-        newObj.default = obj;
-        return newObj;
     }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 let classNameParser = (0, _postcssSelectorParser).default((selectors)=>{
-    return selectors.first.filter(({ type  })=>type === 'class'
-    ).pop().value;
+    return selectors.first.filter(({ type  })=>type === "class").pop().value;
 });
 function getClassNameFromSelector(selector) {
     return classNameParser.transformSync(selector);
@@ -59,16 +79,16 @@ function* candidatePermutations(candidate) {
     let lastIndex = Infinity;
     while(lastIndex >= 0){
         let dashIdx;
-        if (lastIndex === Infinity && candidate.endsWith(']')) {
-            let bracketIdx = candidate.indexOf('[');
+        if (lastIndex === Infinity && candidate.endsWith("]")) {
+            let bracketIdx = candidate.indexOf("[");
             // If character before `[` isn't a dash or a slash, this isn't a dynamic class
             // eg. string[]
             dashIdx = [
-                '-',
-                '/'
+                "-",
+                "/"
             ].includes(candidate[bracketIdx - 1]) ? bracketIdx - 1 : -1;
         } else {
-            dashIdx = candidate.lastIndexOf('-', lastIndex);
+            dashIdx = candidate.lastIndexOf("-", lastIndex);
         }
         if (dashIdx < 0) {
             break;
@@ -83,7 +103,7 @@ function* candidatePermutations(candidate) {
     }
 }
 function applyPrefix(matches, context) {
-    if (matches.length === 0 || context.tailwindConfig.prefix === '') {
+    if (matches.length === 0 || context.tailwindConfig.prefix === "") {
         return matches;
     }
     for (let match of matches){
@@ -100,7 +120,7 @@ function applyPrefix(matches, context) {
                 // have to ensure that the generated selector matches the candidate
                 // 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('-');
+                let shouldPrependNegative = classCandidate.startsWith("-");
                 r.selector = (0, _prefixSelector).default(context.tailwindConfig.prefix, r.selector, shouldPrependNegative);
             });
             match[1] = container.nodes[0];
@@ -108,7 +128,7 @@ function applyPrefix(matches, context) {
     }
     return matches;
 }
-function applyImportant(matches) {
+function applyImportant(matches, classCandidate) {
     if (matches.length === 0) {
         return matches;
     }
@@ -121,10 +141,12 @@ function applyImportant(matches) {
         });
         container.walkRules((r)=>{
             r.selector = (0, _pluginUtils).updateAllClasses(r.selector, (className)=>{
-                return `!${className}`;
+                if (className === classCandidate) {
+                    return `!${className}`;
+                }
+                return className;
             });
-            r.walkDecls((d)=>d.important = true
-            );
+            r.walkDecls((d)=>d.important = true);
         });
         result.push([
             {
@@ -148,12 +170,34 @@ function applyVariant(variant, matches, context) {
     if (matches.length === 0) {
         return matches;
     }
+    let args;
+    // Find partial arbitrary variants
+    if (variant.endsWith("]") && !variant.startsWith("[")) {
+        args = variant.slice(variant.lastIndexOf("[") + 1, -1);
+        variant = variant.slice(0, variant.indexOf(args) - 1 /* - */  - 1 /* [ */ );
+    }
+    // Register arbitrary variants
+    if (isArbitraryValue(variant) && !context.variantMap.has(variant)) {
+        let selector = (0, _dataTypes).normalize(variant.slice(1, -1));
+        if (!(0, _setupContextUtils).isValidVariantFormatString(selector)) {
+            return [];
+        }
+        let fn = (0, _setupContextUtils).parseVariant(selector);
+        let sort = Array.from(context.variantOrder.values()).pop() << 1n;
+        context.variantMap.set(variant, [
+            [
+                sort,
+                fn
+            ]
+        ]);
+        context.variantOrder.set(variant, sort);
+    }
     if (context.variantMap.has(variant)) {
-        let variantFunctionTuples = context.variantMap.get(variant);
+        let variantFunctionTuples = context.variantMap.get(variant).slice();
         let result = [];
         for (let [meta, rule1] of matches){
             // Don't generate variants for user css
-            if (meta.layer === 'user') {
+            if (meta.layer === "user") {
                 continue;
             }
             let container = _postcss.default.root({
@@ -167,13 +211,12 @@ function applyVariant(variant, matches, context) {
                 let originals = new Map();
                 function prepareBackup() {
                     if (originals.size > 0) return; // Already prepared, chicken out
-                    clone.walkRules((rule)=>originals.set(rule, rule.selector)
-                    );
+                    clone.walkRules((rule)=>originals.set(rule, rule.selector));
                 }
                 function modifySelectors(modifierFunction) {
                     prepareBackup();
                     clone.each((rule)=>{
-                        if (rule.type !== 'rule') {
+                        if (rule.type !== "rule") {
                             return;
                         }
                         rule.selectors = rule.selectors.map((selector)=>{
@@ -204,9 +247,29 @@ function applyVariant(variant, matches, context) {
                     },
                     format (selectorFormat) {
                         collectedFormats.push(selectorFormat);
-                    }
+                    },
+                    args
                 });
-                if (typeof ruleWithVariant === 'string') {
+                // 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()){
+                        // 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
+                        // jobs if needed.
+                        variantFunctionTuples.push([
+                            // TODO: This could have potential bugs if we shift the sort order from variant A far
+                            // enough into the sort space of variant B. The chances are low, but if this happens
+                            // 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, 
+                        ]);
+                    }
+                    continue;
+                }
+                if (typeof ruleWithVariant === "string") {
                     collectedFormats.push(ruleWithVariant);
                 }
                 if (ruleWithVariant === null) {
@@ -241,7 +304,7 @@ function applyVariant(variant, matches, context) {
                         //      modified (by plugin): .foo .foo\\:markdown > p
                         //    rebuiltBase (internal): .foo\\:markdown > p
                         //                    format: .foo &
-                        collectedFormats.push(modified.replace(rebuiltBase, '&'));
+                        collectedFormats.push(modified.replace(rebuiltBase, "&"));
                         rule.selector = before;
                     });
                 }
@@ -302,17 +365,27 @@ function isValidPropName(name) {
  */ function looksLikeUri(declaration) {
     // Quick bailout for obvious non-urls
     // This doesn't support schemes that don't use a leading // but that's unlikely to be a problem
-    if (!declaration.includes('://')) {
+    if (!declaration.includes("://")) {
         return false;
     }
     try {
         const url = new URL(declaration);
-        return url.scheme !== '' && url.host !== '';
+        return url.scheme !== "" && url.host !== "";
     } catch (err) {
         // Definitely not a valid url
         return false;
     }
 }
+function isParsableNode(node) {
+    let isParsable = true;
+    node.walkDecls((decl)=>{
+        if (!isParsableCssValue(decl.name, decl.value)) {
+            isParsable = false;
+            return false;
+        }
+    });
+    return isParsable;
+}
 function isParsableCssValue(property, value) {
     // We don't want to to treat [https://example.com] as a custom property
     // Even though, according to the CSS grammar, it's a totally valid CSS declaration
@@ -347,14 +420,13 @@ function extractArbitraryProperty(classCandidate, context) {
         [
             {
                 sort: context.arbitraryPropertiesSort,
-                layer: 'utilities'
+                layer: "utilities"
             },
             ()=>({
                     [(0, _nameClass).asClass(classCandidate)]: {
                         [property]: normalized
                     }
-                })
-            , 
+                }), 
         ], 
     ];
 }
@@ -362,29 +434,30 @@ function* resolveMatchedPlugins(classCandidate, context) {
     if (context.candidateRuleMap.has(classCandidate)) {
         yield [
             context.candidateRuleMap.get(classCandidate),
-            'DEFAULT'
+            "DEFAULT"
         ];
     }
-    yield* (function*(arbitraryPropertyRule) {
+    yield* function*(arbitraryPropertyRule) {
         if (arbitraryPropertyRule !== null) {
             yield [
                 arbitraryPropertyRule,
-                'DEFAULT'
+                "DEFAULT"
             ];
         }
-    })(extractArbitraryProperty(classCandidate, context));
+    }(extractArbitraryProperty(classCandidate, context));
     let candidatePrefix = classCandidate;
     let negative = false;
     const twConfigPrefix = context.tailwindConfig.prefix;
     const twConfigPrefixLen = twConfigPrefix.length;
-    if (candidatePrefix[twConfigPrefixLen] === '-') {
+    const hasMatchingPrefix = candidatePrefix.startsWith(twConfigPrefix) || candidatePrefix.startsWith(`-${twConfigPrefix}`);
+    if (candidatePrefix[twConfigPrefixLen] === "-" && hasMatchingPrefix) {
         negative = true;
         candidatePrefix = twConfigPrefix + candidatePrefix.slice(twConfigPrefixLen + 1);
     }
     if (negative && context.candidateRuleMap.has(candidatePrefix)) {
         yield [
             context.candidateRuleMap.get(candidatePrefix),
-            '-DEFAULT'
+            "-DEFAULT"
         ];
     }
     for (let [prefix, modifier] of candidatePermutations(candidatePrefix)){
@@ -402,7 +475,7 @@ function splitWithSeparator(input, separator) {
             sharedState.NOT_ON_DEMAND
         ];
     }
-    return input.split(new RegExp(`\\${separator}(?![^[]*\\])`, 'g'));
+    return Array.from((0, _splitAtTopLevelOnlyJs).splitAtTopLevelOnly(input, separator));
 }
 function* recordCandidates(matches, classCandidate) {
     for (const match of matches){
@@ -413,14 +486,22 @@ function* recordCandidates(matches, classCandidate) {
         yield match;
     }
 }
-function* resolveMatches(candidate, context) {
+function* resolveMatches(candidate, context, original = candidate) {
     let separator = context.tailwindConfig.separator;
     let [classCandidate, ...variants] = splitWithSeparator(candidate, separator).reverse();
     let important = false;
-    if (classCandidate.startsWith('!')) {
+    if (classCandidate.startsWith("!")) {
         important = true;
         classCandidate = classCandidate.slice(1);
     }
+    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), ",")){
+                yield* resolveMatches(base + separator + part, context, original);
+            }
+        }
+    }
     // TODO: Reintroduce this in ways that doesn't break on false positives
     // function sortAgainst(toSort, against) {
     //   return toSort.slice().sort((a, z) => {
@@ -439,7 +520,7 @@ function* resolveMatches(candidate, context) {
         let isOnlyPlugin = plugins.length === 1;
         for (let [sort, plugin] of plugins){
             let matchesPerPlugin = [];
-            if (typeof plugin === 'function') {
+            if (typeof plugin === "function") {
                 for (let ruleSet of [].concat(plugin(modifier, {
                     isOnlyPlugin
                 }))){
@@ -457,7 +538,7 @@ function* resolveMatches(candidate, context) {
                         ]);
                     }
                 }
-            } else if (modifier === 'DEFAULT' || modifier === '-DEFAULT') {
+            } else if (modifier === "DEFAULT" || modifier === "-DEFAULT") {
                 let ruleSet = plugin;
                 let [rules, options] = parseRules(ruleSet, context.postCssNodeCache);
                 for (let rule of rules){
@@ -479,54 +560,52 @@ function* resolveMatches(candidate, context) {
                 matches.push(matchesPerPlugin);
             }
         }
-        // Only keep the result of the very first plugin if we are dealing with
-        // arbitrary values, to protect against ambiguity.
-        if (isArbitraryValue(modifier) && matches.length > 1) {
-            var ref1;
-            let typesPerPlugin = matches.map((match)=>new Set([
-                    ...(ref1 = typesByMatches.get(match)) !== null && ref1 !== void 0 ? ref1 : []
-                ])
-            );
-            // Remove duplicates, so that we can detect proper unique types for each plugin.
-            for (let pluginTypes of typesPerPlugin){
-                for (let type of pluginTypes){
-                    let removeFromOwnGroup = false;
-                    for (let otherGroup of typesPerPlugin){
-                        if (pluginTypes === otherGroup) continue;
-                        if (otherGroup.has(type)) {
-                            otherGroup.delete(type);
-                            removeFromOwnGroup = true;
+        if (isArbitraryValue(modifier)) {
+            // When generated arbitrary values are ambiguous, we can't know
+            // which to pick so don't generate any utilities for them
+            if (matches.length > 1) {
+                var ref1;
+                let typesPerPlugin = matches.map((match)=>new Set([
+                        ...(ref1 = typesByMatches.get(match)) !== null && ref1 !== void 0 ? ref1 : []
+                    ]));
+                // Remove duplicates, so that we can detect proper unique types for each plugin.
+                for (let pluginTypes of typesPerPlugin){
+                    for (let type of pluginTypes){
+                        let removeFromOwnGroup = false;
+                        for (let otherGroup of typesPerPlugin){
+                            if (pluginTypes === otherGroup) continue;
+                            if (otherGroup.has(type)) {
+                                otherGroup.delete(type);
+                                removeFromOwnGroup = true;
+                            }
                         }
+                        if (removeFromOwnGroup) pluginTypes.delete(type);
                     }
-                    if (removeFromOwnGroup) pluginTypes.delete(type);
                 }
-            }
-            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 '}'
-                        .map((line)=>line.trim()
-                        ).map((x)=>`      ${x}`
-                        ) // Re-indent
-                        .join('\n')
-                    ).join('\n\n');
-                    messages.push(`  Use \`${candidate.replace('[', `[${type}:`)}\` for \`${rules.trim()}\``);
-                    break;
+                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 '}'
+                            .map((line)=>line.trim()).map((x)=>`      ${x}`) // Re-indent
+                            .join("\n")).join("\n\n");
+                        messages.push(`  Use \`${candidate.replace("[", `[${type}:`)}\` for \`${rules.trim()}\``);
+                        break;
+                    }
                 }
+                _log.default.warn([
+                    `The class \`${candidate}\` is ambiguous and matches multiple utilities.`,
+                    ...messages,
+                    `If this is content and not a class, replace it with \`${candidate.replace("[", "&lsqb;").replace("]", "&rsqb;")}\` to silence this warning.`, 
+                ]);
+                continue;
             }
-            _log.default.warn([
-                `The class \`${candidate}\` is ambiguous and matches multiple utilities.`,
-                ...messages,
-                `If this is content and not a class, replace it with \`${candidate.replace('[', '&lsqb;').replace(']', '&rsqb;')}\` to silence this warning.`, 
-            ]);
-            continue;
+            matches = matches.map((list)=>list.filter((match)=>isParsableNode(match[1])));
         }
         matches = matches.flat();
         matches = Array.from(recordCandidates(matches, classCandidate));
         matches = applyPrefix(matches, context);
         if (important) {
-            matches = applyImportant(matches, context);
+            matches = applyImportant(matches, classCandidate);
         }
         for (let variant of variants){
             matches = applyVariant(variant, matches, context);
@@ -538,17 +617,20 @@ function* resolveMatches(candidate, context) {
             };
             // Apply final format selector
             if (match1[0].collectedFormats) {
-                let finalFormat = (0, _formatVariantSelector).formatVariantSelector('&', ...match1[0].collectedFormats);
+                let finalFormat = (0, _formatVariantSelector).formatVariantSelector("&", ...match1[0].collectedFormats);
                 let container = _postcss.default.root({
                     nodes: [
                         match1[1].clone()
                     ]
                 });
                 container.walkRules((rule)=>{
+                    var ref;
                     if (inKeyframes(rule)) return;
+                    var ref2;
                     rule.selector = (0, _formatVariantSelector).finalizeSelector(finalFormat, {
                         selector: rule.selector,
-                        candidate,
+                        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(),
                         context
                     });
                 });
@@ -559,7 +641,7 @@ function* resolveMatches(candidate, context) {
     }
 }
 function inKeyframes(rule) {
-    return rule.parent && rule.parent.type === 'atrule' && rule.parent.name === 'keyframes';
+    return rule.parent && rule.parent.type === "atrule" && rule.parent.name === "keyframes";
 }
 function generateRules(candidates, context) {
     let allRules = [];
@@ -584,13 +666,13 @@ function generateRules(candidates, context) {
         if (important === true) {
             return (rule)=>{
                 rule.walkDecls((d)=>{
-                    if (d.parent.type === 'rule' && !inKeyframes(d.parent)) {
+                    if (d.parent.type === "rule" && !inKeyframes(d.parent)) {
                         d.important = true;
                     }
                 });
             };
         }
-        if (typeof important === 'string') {
+        if (typeof important === "string") {
             return (rule)=>{
                 rule.selectors = rule.selectors.map((selector)=>{
                     return `${important} ${selector}`;
@@ -622,7 +704,7 @@ function generateRules(candidates, context) {
     });
 }
 function isArbitraryValue(input) {
-    return input.startsWith('[') && input.endsWith(']');
+    return input.startsWith("[") && input.endsWith("]");
 }
 exports.resolveMatches = resolveMatches;
 exports.generateRules = generateRules;

package/lib/lib/getModuleDependencies.js

@@ -7,19 +7,6 @@ var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _resolve = _interopRequireDefault(require("resolve"));
 var _detective = _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 = [
@@ -30,7 +17,7 @@ function getModuleDependencies(entryFile) {
     for (const mdl of modules){
         mdl.requires.filter((dep)=>{
             // Only track local modules, not node_modules
-            return dep.startsWith('./') || dep.startsWith('../');
+            return dep.startsWith("./") || dep.startsWith("../");
         }).forEach((dep)=>{
             try {
                 const basedir = _path.default.dirname(mdl.file);
@@ -46,3 +33,16 @@ 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
+    };
+}