tailwindcss 3.1.1 → 3.1.4

package/CHANGELOG.md

@@ -9,6 +9,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.1.4] - 2022-06-21
+
+### Fixed
+
+- Provide default to `<alpha-value>` when using `theme()` ([#8652](https://github.com/tailwindlabs/tailwindcss/pull/8652))
+- Detect arbitrary variants with quotes ([#8687](https://github.com/tailwindlabs/tailwindcss/pull/8687))
+- Don’t add spaces around raw `/` that are preceded by numbers ([#8688](https://github.com/tailwindlabs/tailwindcss/pull/8688))
+
+## [3.1.3] - 2022-06-14
+
+### Fixed
+
+- Fix extraction of multi-word utilities with arbitrary values and quotes ([#8604](https://github.com/tailwindlabs/tailwindcss/pull/8604))
+- Fix casing of import of `corePluginList` type definition ([#8587](https://github.com/tailwindlabs/tailwindcss/pull/8587))
+- Ignore PostCSS nodes returned by `addVariant` ([#8608](https://github.com/tailwindlabs/tailwindcss/pull/8608))
+- Fix missing spaces around arithmetic operators ([#8615](https://github.com/tailwindlabs/tailwindcss/pull/8615))
+- Detect alpha value in CSS `theme()` function when using quotes ([#8625](https://github.com/tailwindlabs/tailwindcss/pull/8625))
+- Fix "Maximum call stack size exceeded" bug ([#8636](https://github.com/tailwindlabs/tailwindcss/pull/8636))
+- Allow functions returning parallel variants to mutate the container ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+- Remove text opacity CSS variables from `::marker` ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+
+## [3.1.2] - 2022-06-10
+
+### Fixed
+
+- Ensure `\` is a valid arbitrary variant token ([#8576](https://github.com/tailwindlabs/tailwindcss/pull/8576))
+- Enable `postcss-import` in the CLI by default in watch mode ([#8574](https://github.com/tailwindlabs/tailwindcss/pull/8574), [#8580](https://github.com/tailwindlabs/tailwindcss/pull/8580))
+
 ## [3.1.1] - 2022-06-09
 
 ### Fixed
@@ -1961,7 +1989,10 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...HEAD
+[3.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.3...v3.1.4
+[3.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.2...v3.1.3
+[3.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...v3.1.2
 [3.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...v3.1.0
 [3.0.24]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.23...v3.0.24

package/lib/cli.js

@@ -428,6 +428,43 @@ async function build() {
             config1.options
         ];
     }
+    function loadBuiltinPostcssPlugins() {
+        let postcss = loadPostcss();
+        let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
+        return [
+            [
+                (root)=>{
+                    root.walkAtRules("import", (rule)=>{
+                        if (rule.params.slice(1).startsWith("tailwindcss/")) {
+                            rule.after(postcss.comment({
+                                text: IMPORT_COMMENT + rule.params
+                            }));
+                            rule.remove();
+                        }
+                    });
+                },
+                (()=>{
+                    try {
+                        return require("postcss-import");
+                    } catch  {}
+                    return (0, _indexJs).lazyPostcssImport();
+                })(),
+                (root)=>{
+                    root.walkComments((rule)=>{
+                        if (rule.text.startsWith(IMPORT_COMMENT)) {
+                            rule.after(postcss.atRule({
+                                name: "import",
+                                params: rule.text.replace(IMPORT_COMMENT, "")
+                            }));
+                            rule.remove();
+                        }
+                    });
+                }, 
+            ],
+            [],
+            {}, 
+        ];
+    }
     function resolveConfig() {
         let config = configPath ? require(configPath) : {};
         if (args["--purge"]) {
@@ -503,40 +540,7 @@ async function build() {
             };
         };
         tailwindPlugin.postcss = true;
-        let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
-        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : [
-            [
-                (root)=>{
-                    root.walkAtRules("import", (rule)=>{
-                        if (rule.params.slice(1).startsWith("tailwindcss/")) {
-                            rule.after(postcss.comment({
-                                text: IMPORT_COMMENT + rule.params
-                            }));
-                            rule.remove();
-                        }
-                    });
-                },
-                (()=>{
-                    try {
-                        return require("postcss-import");
-                    } catch  {}
-                    return (0, _indexJs).lazyPostcssImport();
-                })(),
-                (root)=>{
-                    root.walkComments((rule)=>{
-                        if (rule.text.startsWith(IMPORT_COMMENT)) {
-                            rule.after(postcss.atRule({
-                                name: "import",
-                                params: rule.text.replace(IMPORT_COMMENT, "")
-                            }));
-                            rule.remove();
-                        }
-                    });
-                }, 
-            ],
-            [],
-            {}, 
-        ];
+        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             tailwindPlugin,
@@ -623,10 +627,7 @@ async function build() {
             env.DEBUG && console.timeEnd("Module dependencies");
             return resolveConfig();
         }
-        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : [
-            [],
-            []
-        ];
+        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             "__TAILWIND_PLUGIN_POSITION__",

package/lib/corePlugins.js

@@ -19,6 +19,7 @@ var _packageJson = require("../package.json");
 var _log = _interopRequireDefault(require("./util/log"));
 var _normalizeScreens = require("./util/normalizeScreens");
 var _parseBoxShadowValue = require("./util/parseBoxShadowValue");
+var _removeAlphaVariables = require("./util/removeAlphaVariables");
 var _featureFlags = require("./featureFlags");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -69,8 +70,18 @@ let variantPlugins = {
         addVariant("first-letter", "&::first-letter");
         addVariant("first-line", "&::first-line");
         addVariant("marker", [
-            "& *::marker",
-            "&::marker"
+            ({ container  })=>{
+                (0, _removeAlphaVariables).removeAlphaVariables(container, [
+                    "--tw-text-opacity"
+                ]);
+                return "& *::marker";
+            },
+            ({ container  })=>{
+                (0, _removeAlphaVariables).removeAlphaVariables(container, [
+                    "--tw-text-opacity"
+                ]);
+                return "&::marker";
+            }, 
         ]);
         addVariant("selection", [
             "& *::selection",
@@ -140,22 +151,11 @@ let variantPlugins = {
             [
                 "visited",
                 ({ container  })=>{
-                    let toRemove = [
+                    (0, _removeAlphaVariables).removeAlphaVariables(container, [
                         "--tw-text-opacity",
                         "--tw-border-opacity",
-                        "--tw-bg-opacity"
-                    ];
-                    container.walkDecls((decl)=>{
-                        if (toRemove.includes(decl.prop)) {
-                            decl.remove();
-                            return;
-                        }
-                        for (const varName of toRemove){
-                            if (decl.value.includes(`/ var(${varName})`)) {
-                                decl.value = decl.value.replace(`/ var(${varName})`, "");
-                            }
-                        }
-                    });
+                        "--tw-bg-opacity", 
+                    ]);
                     return "&:visited";
                 }, 
             ],

package/lib/lib/defaultExtractor.js

@@ -52,7 +52,10 @@ function defaultExtractor(context) {
         /** @type {(string|string)[]} */ let results = [];
         for (let pattern of patterns){
             var ref;
-            results.push(...(ref = content.match(pattern)) !== null && ref !== void 0 ? ref : []);
+            results = [
+                ...results,
+                ...(ref = content.match(pattern)) !== null && ref !== void 0 ? ref : []
+            ];
         }
         return results.filter((v)=>v !== undefined).map(clipAtBalancedParens);
     };
@@ -71,7 +74,7 @@ function* buildRegExps(context) {
             regex.optional(regex.any([
                 regex.pattern([
                     // Arbitrary values
-                    /-\[[^\s:]+\]/,
+                    /-(?:\w+-)*\[[^\s:]+\]/,
                     // Not immediately followed by an `{[(`
                     /(?![{([]])/,
                     // optionally followed by an opacity modifier
@@ -79,7 +82,7 @@ function* buildRegExps(context) {
                 ]),
                 regex.pattern([
                     // Arbitrary values
-                    /-\[[^\s]+\]/,
+                    /-(?:\w+-)*\[[^\s]+\]/,
                     // Not immediately followed by an `{[(`
                     /(?![{([]])/,
                     // optionally followed by an opacity modifier
@@ -90,37 +93,54 @@ function* buildRegExps(context) {
             ])), 
         ]), 
     ]);
-    yield regex.pattern([
-        // Variants
-        "((?=((",
+    let variantPatterns = [
+        // Without quotes
         regex.any([
             regex.pattern([
-                /([^\s"'`\[\\]+-)?\[[^\s"'`\\]+\]/,
+                /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
                 separator
             ]),
             regex.pattern([
                 /[^\s"'`\[\\]+/,
                 separator
             ]), 
-        ], true),
-        ")+))\\2)?",
-        // Important (optional)
-        /!?/,
-        variantGroupingEnabled ? regex.any([
-            // Or any of those things but grouped separated by commas
+        ]),
+        // With quotes allowed
+        regex.any([
             regex.pattern([
-                /\(/,
-                utility,
-                regex.zeroOrMore([
-                    /,/,
-                    utility
-                ]),
-                /\)/
+                /([^\s"'`\[\\]+-)?\[[^\s`]+\]/,
+                separator
             ]),
-            // Arbitrary properties, constrained utilities, arbitrary values, etc…
-            utility, 
-        ]) : utility, 
-    ]);
+            regex.pattern([
+                /[^\s`\[\\]+/,
+                separator
+            ]), 
+        ]), 
+    ];
+    for (const variantPattern of variantPatterns){
+        yield regex.pattern([
+            // Variants
+            "((?=((",
+            variantPattern,
+            ")+))\\2)?",
+            // Important (optional)
+            /!?/,
+            variantGroupingEnabled ? regex.any([
+                // Or any of those things but grouped separated by commas
+                regex.pattern([
+                    /\(/,
+                    utility,
+                    regex.zeroOrMore([
+                        /,/,
+                        utility
+                    ]),
+                    /\)/
+                ]),
+                // Arbitrary properties, constrained utilities, arbitrary values, etc…
+                utility, 
+            ]) : utility, 
+        ]);
+    }
     // 5. Inner matches
     yield /[^<>"'`\s.(){}[\]#=%$]*[^<>"'`\s.(){}[\]#=%:$]/g;
 }

package/lib/lib/evaluateTailwindFunctions.js

@@ -42,7 +42,7 @@ function listKeys(obj) {
     return list(Object.keys(obj));
 }
 function validatePath(config, path, defaultValue, themeOpts = {}) {
-    const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+/g, "").replace(/['"]+$/g, "");
+    const pathString = Array.isArray(path) ? pathToString(path) : path.replace(/^['"]+|['"]+$/g, "");
     const pathSegments = Array.isArray(path) ? path : (0, _toPath).toPath(pathString);
     const value = (0, _dlv).default(config.theme, pathSegments, defaultValue);
     if (value === undefined) {
@@ -140,6 +140,9 @@ let nodeTypePropertyMap = {
 function _default({ tailwindConfig: config  }) {
     let functions = {
         theme: (node, path, ...defaultValue)=>{
+            // Strip quotes from beginning and end of string
+            // This allows the alpha value to be present inside of quotes
+            path = path.replace(/^['"]+|['"]+$/g, "");
             let matches = path.match(/^([^\s]+)(?![^\[]*\])(?:\s*\/\s*([^\/\s]+))$/);
             let alpha = undefined;
             if (matches) {
@@ -152,9 +155,13 @@ function _default({ tailwindConfig: config  }) {
             if (!isValid) {
                 throw node.error(error);
             }
-            if (alpha !== undefined) {
-                value = (0, _pluginUtils).parseColorFormat(value);
-                value = (0, _withAlphaVariable).withAlphaValue(value, alpha, value);
+            let maybeColor = (0, _pluginUtils).parseColorFormat(value);
+            let isColorFunction = maybeColor !== undefined && typeof maybeColor === "function";
+            if (alpha !== undefined || isColorFunction) {
+                if (alpha === undefined) {
+                    alpha = 1.0;
+                }
+                value = (0, _withAlphaVariable).withAlphaValue(maybeColor, alpha, maybeColor);
             }
             return value;
         },

package/lib/lib/generateRules.js

@@ -205,13 +205,16 @@ function applyVariant(variant, matches, context) {
                     rule1.clone()
                 ]
             });
-            for (let [variantSort, variantFunction] of variantFunctionTuples){
-                let clone = container.clone();
+            for (let [variantSort, variantFunction, containerFromArray] of variantFunctionTuples){
+                let clone = containerFromArray !== null && containerFromArray !== void 0 ? containerFromArray : container.clone();
                 let collectedFormats = [];
-                let originals = new Map();
                 function prepareBackup() {
-                    if (originals.size > 0) return; // Already prepared, chicken out
-                    clone.walkRules((rule)=>originals.set(rule, rule.selector));
+                    // Already prepared, chicken out
+                    if (clone.raws.neededBackup) {
+                        return;
+                    }
+                    clone.raws.neededBackup = true;
+                    clone.walkRules((rule)=>rule.raws.originalSelector = rule.selector);
                 }
                 function modifySelectors(modifierFunction) {
                     prepareBackup();
@@ -264,7 +267,10 @@ 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, 
+                            variantFunction,
+                            // If the clone has been modified we have to pass that back
+                            // though so each rule can use the modified container
+                            clone.clone(), 
                         ]);
                     }
                     continue;
@@ -275,13 +281,15 @@ function applyVariant(variant, matches, context) {
                 if (ruleWithVariant === null) {
                     continue;
                 }
-                // We filled the `originals`, therefore we assume that somebody touched
+                // We had to backup selectors, therefore we assume that somebody touched
                 // `container` or `modifySelectors`. Let's see if they did, so that we
                 // can restore the selectors, and collect the format strings.
-                if (originals.size > 0) {
+                if (clone.raws.neededBackup) {
+                    delete clone.raws.neededBackup;
                     clone.walkRules((rule)=>{
-                        if (!originals.has(rule)) return;
-                        let before = originals.get(rule);
+                        let before = rule.raws.originalSelector;
+                        if (!before) return;
+                        delete rule.raws.originalSelector;
                         if (before === rule.selector) return; // No mutation happened
                         let modified = rule.selector;
                         // Rebuild the base selector, this is what plugin authors would do

package/lib/lib/setupContextUtils.js

@@ -478,10 +478,11 @@ function buildPluginApi(tailwindConfig, context, { variantList , variantMap , of
                             throw new Error(`Your custom variant \`${variantName}\` has an invalid format string. Make sure it's an at-rule or contains a \`&\` placeholder.`);
                         }
                         if (Array.isArray(result)) {
-                            return result.map((variant)=>parseVariant(variant));
+                            return result.filter((variant)=>typeof variant === "string").map((variant)=>parseVariant(variant));
                         }
                         // result may be undefined with legacy variants that use APIs like `modifySelectors`
-                        return result && parseVariant(result)(api);
+                        // result may also be a postcss node if someone was returning the result from `modifySelectors`
+                        return result && typeof result === "string" && parseVariant(result)(api);
                     };
                 }
                 if (!isValidVariantFormatString(variantFunction)) {

package/lib/util/dataTypes.js

@@ -46,14 +46,12 @@ function normalize(value, isRoot = true) {
     if (isRoot) {
         value = value.trim();
     }
-    // Add spaces around operators inside calc() that do not follow an operator
+    // Add spaces around operators inside math functions like calc() that do not follow an operator
     // or '('.
-    value = value.replace(/calc\(.+\)/g, (match)=>{
+    value = value.replace(/(calc|min|max|clamp)\(.+\)/g, (match)=>{
         return match.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ");
     });
-    // Add spaces around some operators not inside calc() that do not follow an operator
-    // or '('.
-    return value.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([\/])/g, "$1 $2 ");
+    return value;
 }
 function url(value) {
     return value.startsWith("url(");

package/lib/util/removeAlphaVariables.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.removeAlphaVariables = removeAlphaVariables;
+function removeAlphaVariables(container, toRemove) {
+    container.walkDecls((decl)=>{
+        if (toRemove.includes(decl.prop)) {
+            decl.remove();
+            return;
+        }
+        for (let varName of toRemove){
+            if (decl.value.includes(`/ var(${varName})`)) {
+                decl.value = decl.value.replace(`/ var(${varName})`, "");
+            }
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.1.1",
+  "version": "3.1.4",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -47,14 +47,14 @@
     "@swc/jest": "^0.2.21",
     "@swc/register": "^0.1.10",
     "autoprefixer": "^10.4.7",
-    "cssnano": "^5.1.9",
-    "esbuild": "^0.14.39",
+    "cssnano": "^5.1.11",
+    "esbuild": "^0.14.43",
     "eslint": "^8.16.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^28.1.0",
-    "jest-diff": "^28.1.0",
-    "prettier": "^2.6.2",
+    "jest": "^28.1.1",
+    "jest-diff": "^28.1.1",
+    "prettier": "^2.7.1",
     "prettier-plugin-tailwindcss": "^0.1.11",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2"
@@ -63,7 +63,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "arg": "^5.0.1",
+    "arg": "^5.0.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
     "detective": "^5.2.1",