tailwindcss 3.1.3 → 3.1.6

package/CHANGELOG.md

@@ -7,7 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Fixed
+
+- Fix usage on Node 12.x ([b4e637e](https://github.com/tailwindlabs/tailwindcss/commit/b4e637e2e096a9d6f2210efba9541f6fd4f28e56))
+- Handle theme keys with slashes when using `theme()` in CSS ([#8831](https://github.com/tailwindlabs/tailwindcss/pull/8831))
+
+## [3.1.5] - 2022-07-07
+
+### Added
+
+- Support configuring a default `font-weight` for each font size utility ([#8763](https://github.com/tailwindlabs/tailwindcss/pull/8763))
+- Add support for alpha values in safe list ([#8774](https://github.com/tailwindlabs/tailwindcss/pull/8774))
+
+### Fixed
+
+- Improve types to support fallback values in the CSS-in-JS syntax used in plugin APIs ([#8762](https://github.com/tailwindlabs/tailwindcss/pull/8762))
+- Support including `tailwindcss` and `autoprefixer` in `postcss.config.js` in standalone CLI ([#8769](https://github.com/tailwindlabs/tailwindcss/pull/8769))
+- Fix using special-characters as prefixes ([#8772](https://github.com/tailwindlabs/tailwindcss/pull/8772))
+- Don’t prefix classes used within arbitrary variants ([#8773](https://github.com/tailwindlabs/tailwindcss/pull/8773))
+- 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
 
@@ -1981,7 +2007,9 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.3...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

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

@@ -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;
@@ -62,7 +62,11 @@ function defaultExtractor(context) {
 }
 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\]]+\]/,
@@ -93,9 +97,8 @@ function* buildRegExps(context) {
             ])), 
         ]), 
     ]);
-    yield regex.pattern([
-        // Variants
-        "((?=((",
+    let variantPatterns = [
+        // Without quotes
         regex.any([
             regex.pattern([
                 /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
@@ -105,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

@@ -137,27 +137,59 @@ let nodeTypePropertyMap = {
     atrule: "params",
     decl: "value"
 };
+/**
+ * @param {string} path
+ * @returns {Iterable<[path: string, alpha: string|undefined]>}
+ */ function* toPaths(path) {
+    // 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;
+    yield [
+        path,
+        undefined
+    ];
+    if (matches) {
+        path = matches[1];
+        alpha = matches[2];
+        yield [
+            path,
+            alpha
+        ];
+    }
+}
+/**
+ *
+ * @param {any} config
+ * @param {string} path
+ * @param {any} defaultValue
+ */ function resolvePath(config, path1, defaultValue) {
+    const results = Array.from(toPaths(path1)).map(([path, alpha])=>{
+        return Object.assign(validatePath(config, path, defaultValue, {
+            opacityValue: alpha
+        }), {
+            resolvedPath: path,
+            alpha
+        });
+    });
+    var ref;
+    return (ref = results.find((result)=>result.isValid)) !== null && ref !== void 0 ? ref : results[0];
+}
 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) {
-                path = matches[1];
-                alpha = matches[2];
-            }
-            let { isValid , value , error  } = validatePath(config, path, defaultValue.length ? defaultValue : undefined, {
-                opacityValue: alpha
-            });
+            let { isValid , value , error , alpha  } = resolvePath(config, path, defaultValue.length ? defaultValue : undefined);
             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, [
@@ -329,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], 
                 ];
@@ -639,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

@@ -747,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

@@ -51,9 +51,7 @@ function normalize(value, isRoot = true) {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.1.3",
+  "version": "3.1.6",
   "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.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^28.1.2",
     "jest-diff": "^28.1.1",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "prettier-plugin-tailwindcss": "^0.1.11",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2"
@@ -84,7 +84,7 @@
     "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%",