tailwindcss 3.1.2 → 3.1.5

package/CHANGELOG.md

@@ -9,6 +9,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.1.5] - 2022-07-07
+
+### Added
+
+- Support default `font-weight`s in font size utilities ([#8763](https://github.com/tailwindlabs/tailwindcss/pull/8763))
+
+### Fixed
+
+- Allows fallback values in plugin API helpers ([#8762](https://github.com/tailwindlabs/tailwindcss/pull/8762))
+- Fix usage of postcss.config.js in standalone CLI ([#8769](https://github.com/tailwindlabs/tailwindcss/pull/8769))
+- Fix usage of special-character prefixes ([#8772](https://github.com/tailwindlabs/tailwindcss/pull/8772))
+- Don’t prefix selectors in arbitrary variants ([#8773](https://github.com/tailwindlabs/tailwindcss/pull/8773))
+- Add support for alpha values in safe list ([#8774](https://github.com/tailwindlabs/tailwindcss/pull/8774))
+- Add more explicit types for the default theme ([#8780](https://github.com/tailwindlabs/tailwindcss/pull/8780))
+
+## [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
@@ -1968,7 +2004,10 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.2...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...HEAD
+[3.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...v3.1.5
+[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

package/defaultTheme.d.ts

@@ -1,3 +1,4 @@
 import type { Config } from './types/config'
-declare const theme: Config['theme']
+import { DefaultTheme } from './types/generated/default-theme'
+declare const theme: Config['theme'] & DefaultTheme
 export = theme

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";
                 }, 
             ],
@@ -2657,7 +2657,7 @@ let corePlugins = {
                 let [fontSize, options] = Array.isArray(value) ? value : [
                     value
                 ];
-                let { lineHeight , letterSpacing  } = (0, _isPlainObject).default(options) ? options : {
+                let { lineHeight , letterSpacing , fontWeight  } = (0, _isPlainObject).default(options) ? options : {
                     lineHeight: options
                 };
                 return {
@@ -2667,6 +2667,9 @@ let corePlugins = {
                     },
                     ...letterSpacing === undefined ? {} : {
                         "letter-spacing": letterSpacing
+                    },
+                    ...fontWeight === undefined ? {} : {
+                        "font-weight": fontWeight
                     }
                 };
             }

package/lib/lib/defaultExtractor.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.defaultExtractor = defaultExtractor;
-var _featureFlagsJs = require("../featureFlags.js");
+var _featureFlags = require("../featureFlags");
 var regex = _interopRequireWildcard(require("./regex"));
 function _getRequireWildcardCache() {
     if (typeof WeakMap !== "function") return null;
@@ -52,14 +52,21 @@ 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);
     };
 }
 function* buildRegExps(context) {
     let separator = context.tailwindConfig.separator;
-    let variantGroupingEnabled = (0, _featureFlagsJs).flagEnabled(context.tailwindConfig, "variantGrouping");
+    let variantGroupingEnabled = (0, _featureFlags).flagEnabled(context.tailwindConfig, "variantGrouping");
+    let prefix = context.tailwindConfig.prefix !== "" ? regex.optional(regex.pattern([
+        /-?/,
+        regex.escape(context.tailwindConfig.prefix)
+    ])) : "";
     let utility = regex.any([
         // Arbitrary properties
         /\[[^\s:'"`]+:[^\s\]]+\]/,
@@ -71,7 +78,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 +86,7 @@ function* buildRegExps(context) {
                 ]),
                 regex.pattern([
                     // Arbitrary values
-                    /-\[[^\s]+\]/,
+                    /-(?:\w+-)*\[[^\s]+\]/,
                     // Not immediately followed by an `{[(`
                     /(?![{([]])/,
                     // optionally followed by an opacity modifier
@@ -90,9 +97,8 @@ function* buildRegExps(context) {
             ])), 
         ]), 
     ]);
-    yield regex.pattern([
-        // Variants
-        "((?=((",
+    let variantPatterns = [
+        // Without quotes
         regex.any([
             regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
@@ -102,25 +108,44 @@ function* buildRegExps(context) {
                 /[^\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)
+            /!?/,
+            prefix,
+            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

@@ -171,6 +171,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);
@@ -182,6 +183,7 @@ function applyVariant(variant, matches, context) {
         if (!(0, _setupContextUtils).isValidVariantFormatString(selector)) {
             return [];
         }
+        isArbitraryVariant = true;
         let fn = (0, _setupContextUtils).parseVariant(selector);
         let sort = Array.from(context.variantOrder.values()).pop() << 1n;
         context.variantMap.set(variant, [
@@ -205,13 +207,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 +269,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 +283,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
@@ -321,7 +331,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], 
                 ];
@@ -631,6 +642,7 @@ function* resolveMatches(candidate, context, original = candidate) {
                         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(),
+                        isArbitraryVariant: match1[0].isArbitraryVariant,
                         context
                     });
                 });

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)) {
@@ -746,6 +747,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

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/formatVariantSelector.js

@@ -39,7 +39,7 @@ function formatVariantSelector(current, ...others) {
     return current;
 }
 var ref1;
-function finalizeSelector(format, { selector: selector1 , candidate , context , // Split by the separator, but ignore the separator inside square brackets:
+function finalizeSelector(format, { selector: selector1 , candidate , context , isArbitraryVariant , // Split by the separator, but ignore the separator inside square brackets:
 //
 // E.g.: dark:lg:hover:[paint-order:markers]
 //           ┬  ┬     ┬            ┬
@@ -49,7 +49,8 @@ function finalizeSelector(format, { selector: selector1 , candidate , context ,
 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() ,  }) {
     var ref2;
     let ast = (0, _postcssSelectorParser).default().astSync(selector1);
-    if (context === null || context === void 0 ? void 0 : (ref2 = context.tailwindConfig) === null || ref2 === void 0 ? void 0 : ref2.prefix) {
+    // We explicitly DO NOT prefix classes in arbitrary variants
+    if ((context === null || context === void 0 ? void 0 : (ref2 = context.tailwindConfig) === null || ref2 === void 0 ? void 0 : ref2.prefix) && !isArbitraryVariant) {
         format = (0, _prefixSelector).default(context.tailwindConfig.prefix, format);
     }
     format = format.replace(PARENT, `.${(0, _escapeClassName).default(candidate)}`);

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.2",
+  "version": "3.1.5",
   "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",
-    "eslint": "^8.16.0",
+    "cssnano": "^5.1.12",
+    "esbuild": "^0.14.48",
+    "eslint": "^8.18.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",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^28.1.2",
+    "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",
@@ -79,12 +79,12 @@
     "postcss": "^8.4.14",
     "postcss-import": "^14.1.0",
     "postcss-js": "^4.0.0",
-    "postcss-load-config": "^3.1.4",
+    "postcss-load-config": "^4.0.1",
     "postcss-nested": "5.0.6",
     "postcss-selector-parser": "^6.0.10",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
-    "resolve": "^1.22.0"
+    "resolve": "^1.22.1"
   },
   "browserslist": [
     "> 1%",