tailwindcss 3.0.23 → 3.1.1

package/lib/lib/normalizeTailwindDirectives.js

@@ -4,75 +4,70 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = normalizeTailwindDirectives;
 var _log = _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();
     let applyDirectives = new Set();
     root.walkAtRules((atRule)=>{
-        if (atRule.name === 'apply') {
+        if (atRule.name === "apply") {
             applyDirectives.add(atRule);
         }
-        if (atRule.name === 'import') {
+        if (atRule.name === "import") {
             if (atRule.params === '"tailwindcss/base"' || atRule.params === "'tailwindcss/base'") {
-                atRule.name = 'tailwind';
-                atRule.params = 'base';
+                atRule.name = "tailwind";
+                atRule.params = "base";
             } else if (atRule.params === '"tailwindcss/components"' || atRule.params === "'tailwindcss/components'") {
-                atRule.name = 'tailwind';
-                atRule.params = 'components';
+                atRule.name = "tailwind";
+                atRule.params = "components";
             } else if (atRule.params === '"tailwindcss/utilities"' || atRule.params === "'tailwindcss/utilities'") {
-                atRule.name = 'tailwind';
-                atRule.params = 'utilities';
+                atRule.name = "tailwind";
+                atRule.params = "utilities";
             } else if (atRule.params === '"tailwindcss/screens"' || atRule.params === "'tailwindcss/screens'" || atRule.params === '"tailwindcss/variants"' || atRule.params === "'tailwindcss/variants'") {
-                atRule.name = 'tailwind';
-                atRule.params = 'variants';
+                atRule.name = "tailwind";
+                atRule.params = "variants";
             }
         }
-        if (atRule.name === 'tailwind') {
-            if (atRule.params === 'screens') {
-                atRule.params = 'variants';
+        if (atRule.name === "tailwind") {
+            if (atRule.params === "screens") {
+                atRule.params = "variants";
             }
             tailwindDirectives.add(atRule.params);
         }
         if ([
-            'layer',
-            'responsive',
-            'variants'
+            "layer",
+            "responsive",
+            "variants"
         ].includes(atRule.name)) {
             if ([
-                'responsive',
-                'variants'
+                "responsive",
+                "variants"
             ].includes(atRule.name)) {
                 _log.default.warn(`${atRule.name}-at-rule-deprecated`, [
                     `The \`@${atRule.name}\` directive has been deprecated in Tailwind CSS v3.0.`,
                     `Use \`@layer utilities\` or \`@layer components\` instead.`,
-                    'https://tailwindcss.com/docs/upgrade-guide#replace-variants-with-layer', 
+                    "https://tailwindcss.com/docs/upgrade-guide#replace-variants-with-layer", 
                 ]);
             }
             layerDirectives.add(atRule);
         }
     });
-    if (!tailwindDirectives.has('base') || !tailwindDirectives.has('components') || !tailwindDirectives.has('utilities')) {
+    if (!tailwindDirectives.has("base") || !tailwindDirectives.has("components") || !tailwindDirectives.has("utilities")) {
         for (let rule of layerDirectives){
-            if (rule.name === 'layer' && [
-                'base',
-                'components',
-                'utilities'
+            if (rule.name === "layer" && [
+                "base",
+                "components",
+                "utilities"
             ].includes(rule.params)) {
                 if (!tailwindDirectives.has(rule.params)) {
                     throw rule.error(`\`@layer ${rule.params}\` is used but no matching \`@tailwind ${rule.params}\` directive is present.`);
                 }
-            } else if (rule.name === 'responsive') {
-                if (!tailwindDirectives.has('utilities')) {
-                    throw rule.error('`@responsive` is used but `@tailwind utilities` is missing.');
+            } else if (rule.name === "responsive") {
+                if (!tailwindDirectives.has("utilities")) {
+                    throw rule.error("`@responsive` is used but `@tailwind utilities` is missing.");
                 }
-            } else if (rule.name === 'variants') {
-                if (!tailwindDirectives.has('utilities')) {
-                    throw rule.error('`@variants` is used but `@tailwind utilities` is missing.');
+            } else if (rule.name === "variants") {
+                if (!tailwindDirectives.has("utilities")) {
+                    throw rule.error("`@variants` is used but `@tailwind utilities` is missing.");
                 }
             }
         }
@@ -82,3 +77,8 @@ function normalizeTailwindDirectives(root) {
         applyDirectives
     };
 }
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}

package/lib/lib/partitionApplyAtRules.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.default = expandApplyAtRules;
+function expandApplyAtRules() {
+    return (root)=>{
+        partitionRules(root);
+    };
+}
 function partitionRules(root) {
     if (!root.walkAtRules) return;
     let applyParents = new Set();
-    root.walkAtRules('apply', (rule)=>{
+    root.walkAtRules("apply", (rule)=>{
         applyParents.add(rule.parent);
     });
     if (applyParents.size === 0) {
@@ -16,7 +21,7 @@ function partitionRules(root) {
         let nodeGroups = [];
         let lastGroup = [];
         for (let node of rule1.nodes){
-            if (node.type === 'atrule' && node.name === 'apply') {
+            if (node.type === "atrule" && node.name === "apply") {
                 if (lastGroup.length > 0) {
                     nodeGroups.push(lastGroup);
                     lastGroup = [];
@@ -46,8 +51,3 @@ function partitionRules(root) {
         rule1.remove();
     }
 }
-function expandApplyAtRules() {
-    return (root)=>{
-        partitionRules(root);
-    };
-}

package/lib/lib/regex.js

@@ -0,0 +1,52 @@
+"use strict";
+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;
+const REGEX_SPECIAL = /[\\^$.*+?()[\]{}|]/g;
+const REGEX_HAS_SPECIAL = RegExp(REGEX_SPECIAL.source);
+/**
+ * @param {string|RegExp|Array<string|RegExp>} source
+ */ function toSource(source) {
+    source = Array.isArray(source) ? source : [
+        source
+    ];
+    source = source.map((item)=>item instanceof RegExp ? item.source : item);
+    return source.join("");
+}
+function pattern(source) {
+    return new RegExp(toSource(source), "g");
+}
+function withoutCapturing(source) {
+    return new RegExp(`(?:${toSource(source)})`, "g");
+}
+function any(sources) {
+    return `(?:${sources.map(toSource).join("|")})`;
+}
+function optional(source) {
+    return `(?:${toSource(source)})?`;
+}
+function zeroOrMore(source) {
+    return `(?:${toSource(source)})*`;
+}
+function nestedBrackets(open, close, depth = 1) {
+    return withoutCapturing([
+        escape(open),
+        /[^\s]*/,
+        depth === 1 ? `[^${escape(open)}${escape(close)}\s]*` : any([
+            `[^${escape(open)}${escape(close)}\s]*`,
+            nestedBrackets(open, close, depth - 1)
+        ]),
+        /[^\s]*/,
+        escape(close), 
+    ]);
+}
+function escape(string) {
+    return string && REGEX_HAS_SPECIAL.test(string) ? string.replace(REGEX_SPECIAL, "\\$&") : string || "";
+}

package/lib/lib/resolveDefaultsAtRules.js

@@ -7,6 +7,85 @@ exports.elementSelectorParser = void 0;
 var _postcss = _interopRequireDefault(require("postcss"));
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
 var _featureFlags = require("../featureFlags");
+function resolveDefaultsAtRules({ tailwindConfig  }) {
+    return (root)=>{
+        let variableNodeMap = new Map();
+        /** @type {Set<import('postcss').AtRule>} */ let universals = new Set();
+        root.walkAtRules("defaults", (rule)=>{
+            if (rule.nodes && rule.nodes.length > 0) {
+                universals.add(rule);
+                return;
+            }
+            let variable = rule.params;
+            if (!variableNodeMap.has(variable)) {
+                variableNodeMap.set(variable, new Set());
+            }
+            variableNodeMap.get(variable).add(rule.parent);
+            rule.remove();
+        });
+        if ((0, _featureFlags).flagEnabled(tailwindConfig, "optimizeUniversalDefaults")) {
+            for (let universal of universals){
+                /** @type {Map<string, Set<string>>} */ let selectorGroups = new Map();
+                var ref;
+                let rules = (ref = variableNodeMap.get(universal.params)) !== null && ref !== void 0 ? ref : [];
+                for (let rule of rules){
+                    for (let selector of extractElementSelector(rule.selector)){
+                        // If selector contains a vendor prefix after a pseudo element or class,
+                        // we consider them separately because merging the declarations into
+                        // a single rule will cause browsers that do not understand the
+                        // vendor prefix to throw out the whole rule
+                        let selectorGroupName = selector.includes(":-") || selector.includes("::-") ? selector : "__DEFAULT__";
+                        var ref1;
+                        let selectors = (ref1 = selectorGroups.get(selectorGroupName)) !== null && ref1 !== void 0 ? ref1 : new Set();
+                        selectorGroups.set(selectorGroupName, selectors);
+                        selectors.add(selector);
+                    }
+                }
+                if ((0, _featureFlags).flagEnabled(tailwindConfig, "optimizeUniversalDefaults")) {
+                    if (selectorGroups.size === 0) {
+                        universal.remove();
+                        continue;
+                    }
+                    for (let [, selectors] of selectorGroups){
+                        let universalRule = _postcss.default.rule({
+                            source: universal.source
+                        });
+                        universalRule.selectors = [
+                            ...selectors
+                        ];
+                        universalRule.append(universal.nodes.map((node)=>node.clone()));
+                        universal.before(universalRule);
+                    }
+                }
+                universal.remove();
+            }
+        } else if (universals.size) {
+            let universalRule = _postcss.default.rule({
+                selectors: [
+                    "*",
+                    "::before",
+                    "::after"
+                ]
+            });
+            for (let universal of universals){
+                universalRule.append(universal.nodes);
+                if (!universalRule.parent) {
+                    universal.before(universalRule);
+                }
+                if (!universalRule.source) {
+                    universalRule.source = universal.source;
+                }
+                universal.remove();
+            }
+            let backdropRule = universalRule.clone({
+                selectors: [
+                    "::backdrop"
+                ]
+            });
+            universalRule.after(backdropRule);
+        }
+    };
+}
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -15,8 +94,8 @@ function _interopRequireDefault(obj) {
 let getNode = {
     id (node) {
         return _postcssSelectorParser.default.attribute({
-            attribute: 'id',
-            operator: '=',
+            attribute: "id",
+            operator: "=",
             value: node.value,
             quoteMark: '"'
         });
@@ -25,33 +104,31 @@ let getNode = {
 function minimumImpactSelector(nodes) {
     let rest = nodes.filter((node)=>{
         // Keep non-pseudo nodes
-        if (node.type !== 'pseudo') return true;
+        if (node.type !== "pseudo") return true;
         // Keep pseudo nodes that have subnodes
         // E.g.: `:not()` contains subnodes inside the parentheses
         if (node.nodes.length > 0) return true;
         // Keep pseudo `elements`
         // This implicitly means that we ignore pseudo `classes`
-        return node.value.startsWith('::') || [
-            ':before',
-            ':after',
-            ':first-line',
-            ':first-letter'
+        return node.value.startsWith("::") || [
+            ":before",
+            ":after",
+            ":first-line",
+            ":first-letter"
         ].includes(node.value);
     }).reverse();
     let searchFor = new Set([
-        'tag',
-        'class',
-        'id',
-        'attribute'
+        "tag",
+        "class",
+        "id",
+        "attribute"
     ]);
-    let splitPointIdx = rest.findIndex((n)=>searchFor.has(n.type)
-    );
-    if (splitPointIdx === -1) return rest.reverse().join('').trim();
+    let splitPointIdx = rest.findIndex((n)=>searchFor.has(n.type));
+    if (splitPointIdx === -1) return rest.reverse().join("").trim();
     let node1 = rest[splitPointIdx];
     let bestNode = getNode[node1.type] ? getNode[node1.type](node1) : node1;
     rest = rest.slice(0, splitPointIdx);
-    let combinatorIdx = rest.findIndex((n)=>n.type === 'combinator' && n.value === '>'
-    );
+    let combinatorIdx = rest.findIndex((n)=>n.type === "combinator" && n.value === ">");
     if (combinatorIdx !== -1) {
         rest.splice(0, combinatorIdx);
         rest.unshift(_postcssSelectorParser.default.universal());
@@ -59,12 +136,11 @@ function minimumImpactSelector(nodes) {
     return [
         bestNode,
         ...rest.reverse()
-    ].join('').trim();
+    ].join("").trim();
 }
 let elementSelectorParser = (0, _postcssSelectorParser).default((selectors)=>{
     return selectors.map((s)=>{
-        let nodes = s.split((n)=>n.type === 'combinator' && n.value === ' '
-        ).pop();
+        let nodes = s.split((n)=>n.type === "combinator" && n.value === " ").pop();
         return minimumImpactSelector(nodes);
     });
 });
@@ -76,64 +152,3 @@ function extractElementSelector(selector) {
     }
     return cache.get(selector);
 }
-function resolveDefaultsAtRules({ tailwindConfig  }) {
-    return (root)=>{
-        let variableNodeMap = new Map();
-        /** @type {Set<import('postcss').AtRule>} */ let universals = new Set();
-        root.walkAtRules('defaults', (rule)=>{
-            if (rule.nodes && rule.nodes.length > 0) {
-                universals.add(rule);
-                return;
-            }
-            let variable = rule.params;
-            if (!variableNodeMap.has(variable)) {
-                variableNodeMap.set(variable, new Set());
-            }
-            variableNodeMap.get(variable).add(rule.parent);
-            rule.remove();
-        });
-        for (let universal of universals){
-            /** @type {Map<string, Set<string>>} */ let selectorGroups = new Map();
-            var ref;
-            let rules = (ref = variableNodeMap.get(universal.params)) !== null && ref !== void 0 ? ref : [];
-            for (let rule of rules){
-                for (let selector of extractElementSelector(rule.selector)){
-                    // If selector contains a vendor prefix after a pseudo element or class,
-                    // we consider them separately because merging the declarations into
-                    // a single rule will cause browsers that do not understand the
-                    // vendor prefix to throw out the whole rule
-                    let selectorGroupName = selector.includes(':-') || selector.includes('::-') ? selector : '__DEFAULT__';
-                    var ref1;
-                    let selectors = (ref1 = selectorGroups.get(selectorGroupName)) !== null && ref1 !== void 0 ? ref1 : new Set();
-                    selectorGroups.set(selectorGroupName, selectors);
-                    selectors.add(selector);
-                }
-            }
-            if ((0, _featureFlags).flagEnabled(tailwindConfig, 'optimizeUniversalDefaults')) {
-                if (selectorGroups.size === 0) {
-                    universal.remove();
-                    continue;
-                }
-                for (let [, selectors] of selectorGroups){
-                    let universalRule = _postcss.default.rule();
-                    universalRule.selectors = [
-                        ...selectors
-                    ];
-                    universalRule.append(universal.nodes.map((node)=>node.clone()
-                    ));
-                    universal.before(universalRule);
-                }
-            } else {
-                let universalRule = _postcss.default.rule();
-                universalRule.selectors = [
-                    '*',
-                    '::before',
-                    '::after'
-                ];
-                universalRule.append(universal.nodes);
-                universal.before(universalRule);
-            }
-            universal.remove();
-        }
-    };
-}