tailwind-merge 1.9.0 → 1.9.1

package/README.md

@@ -2,7 +2,7 @@
     <br />
     <a href="https://github.com/dcastil/tailwind-merge">
         <!-- AUTOGENERATED VERSION START -->
-        <img src="https://github.com/dcastil/tailwind-merge/raw/v1.9.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
+        <img src="https://github.com/dcastil/tailwind-merge/raw/v1.9.1/assets/logo.svg" alt="tailwind-merge" height="150px" />
         <!-- AUTOGENERATED END -->
     </a>
 </div>
@@ -27,14 +27,14 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
 
 <!-- AUTOGENERATED VERSION START -->
 
--   [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/what-is-it-for.md)
--   [Features](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/features.md)
--   [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/configuration.md)
--   [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/recipes.md)
--   [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/api-reference.md)
--   [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/writing-plugins.md)
--   [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/versioning.md)
--   [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/.github/CONTRIBUTING.md)
--   [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.9.0/docs/similar-packages.md)
+-   [What is it for](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/what-is-it-for.md)
+-   [Features](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/features.md)
+-   [Configuration](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/configuration.md)
+-   [Recipes](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/recipes.md)
+-   [API reference](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/api-reference.md)
+-   [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/writing-plugins.md)
+-   [Versioning](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/versioning.md)
+-   [Contributing](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/.github/CONTRIBUTING.md)
+-   [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v1.9.1/docs/similar-packages.md)
 
 <!-- AUTOGENERATED END -->

package/dist/lib/default-config.d.ts

@@ -1,29 +1,29 @@
-import { isAny, isArbitraryLength, isArbitraryNumber, isArbitraryPosition, isArbitraryShadow, isArbitrarySize, isArbitraryUrl, isArbitraryValue, isInteger, isLength, isTshirtSize } from './validators';
+import { isAny, isArbitraryLength, isArbitraryNumber, isArbitraryPosition, isArbitraryShadow, isArbitrarySize, isArbitraryUrl, isArbitraryValue, isInteger, isLength, isNumber, isTshirtSize } from './validators';
 export declare function getDefaultConfig(): {
     readonly cacheSize: 500;
     readonly theme: {
         readonly colors: readonly [typeof isAny];
         readonly spacing: readonly [typeof isLength];
         readonly blur: readonly ["none", "", typeof isTshirtSize, typeof isArbitraryLength];
-        readonly brightness: readonly [typeof isInteger];
+        readonly brightness: (typeof isNumber)[];
         readonly borderColor: readonly [import("./types").ThemeGetter];
         readonly borderRadius: readonly ["none", "", "full", typeof isTshirtSize, typeof isArbitraryLength];
         readonly borderSpacing: readonly [import("./types").ThemeGetter];
         readonly borderWidth: readonly ["", typeof isLength];
-        readonly contrast: readonly [typeof isInteger];
+        readonly contrast: (typeof isNumber)[];
         readonly grayscale: readonly ["", "0", typeof isArbitraryValue];
-        readonly hueRotate: readonly [typeof isInteger];
+        readonly hueRotate: (typeof isNumber)[];
         readonly invert: readonly ["", "0", typeof isArbitraryValue];
         readonly gap: readonly [import("./types").ThemeGetter];
         readonly gradientColorStops: readonly [import("./types").ThemeGetter];
         readonly inset: readonly ["auto", import("./types").ThemeGetter];
         readonly margin: readonly ["auto", import("./types").ThemeGetter];
-        readonly opacity: readonly [typeof isInteger];
+        readonly opacity: (typeof isNumber)[];
         readonly padding: readonly [import("./types").ThemeGetter];
-        readonly saturate: readonly [typeof isInteger];
-        readonly scale: readonly [typeof isInteger];
+        readonly saturate: (typeof isNumber)[];
+        readonly scale: (typeof isNumber)[];
         readonly sepia: readonly ["", "0", typeof isArbitraryValue];
-        readonly skew: readonly [typeof isInteger, typeof isArbitraryValue];
+        readonly skew: (typeof isNumber)[];
         readonly space: readonly [import("./types").ThemeGetter];
         readonly translate: readonly [import("./types").ThemeGetter];
     };
@@ -226,7 +226,7 @@ export declare function getDefaultConfig(): {
          * @see https://tailwindcss.com/docs/z-index
          */
         readonly z: readonly [{
-            readonly z: readonly [typeof isInteger];
+            readonly z: readonly ["auto", typeof isInteger];
         }];
         /**
          * Flex Basis
@@ -291,21 +291,21 @@ export declare function getDefaultConfig(): {
         readonly 'col-start-end': readonly [{
             readonly col: readonly ["auto", {
                 readonly span: readonly [typeof isInteger];
-            }];
+            }, typeof isArbitraryValue];
         }];
         /**
          * Grid Column Start
          * @see https://tailwindcss.com/docs/grid-column
          */
         readonly 'col-start': readonly [{
-            readonly 'col-start': readonly ["auto", typeof isInteger];
+            readonly 'col-start': readonly ["auto", typeof isNumber, typeof isArbitraryValue];
         }];
         /**
          * Grid Column End
          * @see https://tailwindcss.com/docs/grid-column
          */
         readonly 'col-end': readonly [{
-            readonly 'col-end': readonly ["auto", typeof isInteger];
+            readonly 'col-end': readonly ["auto", typeof isNumber, typeof isArbitraryValue];
         }];
         /**
          * Grid Template Rows
@@ -321,21 +321,21 @@ export declare function getDefaultConfig(): {
         readonly 'row-start-end': readonly [{
             readonly row: readonly ["auto", {
                 readonly span: readonly [typeof isInteger];
-            }];
+            }, typeof isArbitraryValue];
         }];
         /**
          * Grid Row Start
          * @see https://tailwindcss.com/docs/grid-row
          */
         readonly 'row-start': readonly [{
-            readonly 'row-start': readonly ["auto", typeof isInteger];
+            readonly 'row-start': readonly ["auto", typeof isNumber, typeof isArbitraryValue];
         }];
         /**
          * Grid Row End
          * @see https://tailwindcss.com/docs/grid-row
          */
         readonly 'row-end': readonly [{
-            readonly 'row-end': readonly ["auto", typeof isInteger];
+            readonly 'row-end': readonly ["auto", typeof isNumber, typeof isArbitraryValue];
         }];
         /**
          * Grid Auto Flow
@@ -1412,7 +1412,7 @@ export declare function getDefaultConfig(): {
          * @see https://tailwindcss.com/docs/transition-duration
          */
         readonly duration: readonly [{
-            readonly duration: readonly [typeof isInteger];
+            readonly duration: (typeof isNumber)[];
         }];
         /**
          * Transition Timing Function
@@ -1426,7 +1426,7 @@ export declare function getDefaultConfig(): {
          * @see https://tailwindcss.com/docs/transition-delay
          */
         readonly delay: readonly [{
-            readonly delay: readonly [typeof isInteger];
+            readonly delay: (typeof isNumber)[];
         }];
         /**
          * Animation

package/dist/lib/default-config.mjs

@@ -1,5 +1,5 @@
 import { fromTheme } from './from-theme.mjs';
-import { isAny, isLength, isTshirtSize, isArbitraryLength, isInteger, isArbitraryValue, isArbitraryNumber, isArbitraryPosition, isArbitrarySize, isArbitraryUrl, isArbitraryShadow } from './validators.mjs';
+import { isAny, isLength, isTshirtSize, isArbitraryLength, isArbitraryValue, isInteger, isArbitraryNumber, isArbitraryPosition, isArbitrarySize, isArbitraryUrl, isArbitraryShadow, isNumber } from './validators.mjs';
 
 function getDefaultConfig() {
   var colors = fromTheme('colors');
@@ -38,8 +38,8 @@ function getDefaultConfig() {
   var getLengthWithEmpty = function getLengthWithEmpty() {
     return ['', isLength];
   };
-  var getIntegerWithAuto = function getIntegerWithAuto() {
-    return ['auto', isInteger];
+  var getNumberWithAutoAndArbitrary = function getNumberWithAutoAndArbitrary() {
+    return ['auto', isNumber, isArbitraryValue];
   };
   var getPositions = function getPositions() {
     return ['bottom', 'center', 'left', 'left-bottom', 'left-top', 'right', 'right-bottom', 'right-top', 'top'];
@@ -59,31 +59,37 @@ function getDefaultConfig() {
   var getBreaks = function getBreaks() {
     return ['auto', 'avoid', 'all', 'avoid-page', 'page', 'left', 'right', 'column'];
   };
+  var getNumber = function getNumber() {
+    return [isNumber, isArbitraryNumber];
+  };
+  var getNumberAndArbitrary = function getNumberAndArbitrary() {
+    return [isNumber, isArbitraryValue];
+  };
   return {
     cacheSize: 500,
     theme: {
       colors: [isAny],
       spacing: [isLength],
       blur: ['none', '', isTshirtSize, isArbitraryLength],
-      brightness: [isInteger],
+      brightness: getNumber(),
       borderColor: [colors],
       borderRadius: ['none', '', 'full', isTshirtSize, isArbitraryLength],
       borderSpacing: [spacing],
       borderWidth: getLengthWithEmpty(),
-      contrast: [isInteger],
+      contrast: getNumber(),
       grayscale: getZeroAndEmpty(),
-      hueRotate: [isInteger],
+      hueRotate: getNumberAndArbitrary(),
       invert: getZeroAndEmpty(),
       gap: [spacing],
       gradientColorStops: [colors],
       inset: getSpacingWithAuto(),
       margin: getSpacingWithAuto(),
-      opacity: [isInteger],
+      opacity: getNumber(),
       padding: [spacing],
-      saturate: [isInteger],
-      scale: [isInteger],
+      saturate: getNumber(),
+      scale: getNumber(),
       sepia: getZeroAndEmpty(),
-      skew: [isInteger, isArbitraryValue],
+      skew: getNumberAndArbitrary(),
       space: [spacing],
       translate: [spacing]
     },
@@ -287,7 +293,7 @@ function getDefaultConfig() {
        * @see https://tailwindcss.com/docs/z-index
        */
       z: [{
-        z: [isInteger]
+        z: ['auto', isInteger]
       }],
       // Flexbox and Grid
       /**
@@ -353,21 +359,21 @@ function getDefaultConfig() {
       'col-start-end': [{
         col: ['auto', {
           span: [isInteger]
-        }]
+        }, isArbitraryValue]
       }],
       /**
        * Grid Column Start
        * @see https://tailwindcss.com/docs/grid-column
        */
       'col-start': [{
-        'col-start': getIntegerWithAuto()
+        'col-start': getNumberWithAutoAndArbitrary()
       }],
       /**
        * Grid Column End
        * @see https://tailwindcss.com/docs/grid-column
        */
       'col-end': [{
-        'col-end': getIntegerWithAuto()
+        'col-end': getNumberWithAutoAndArbitrary()
       }],
       /**
        * Grid Template Rows
@@ -383,21 +389,21 @@ function getDefaultConfig() {
       'row-start-end': [{
         row: ['auto', {
           span: [isInteger]
-        }]
+        }, isArbitraryValue]
       }],
       /**
        * Grid Row Start
        * @see https://tailwindcss.com/docs/grid-row
        */
       'row-start': [{
-        'row-start': getIntegerWithAuto()
+        'row-start': getNumberWithAutoAndArbitrary()
       }],
       /**
        * Grid Row End
        * @see https://tailwindcss.com/docs/grid-row
        */
       'row-end': [{
-        'row-end': getIntegerWithAuto()
+        'row-end': getNumberWithAutoAndArbitrary()
       }],
       /**
        * Grid Auto Flow
@@ -1483,7 +1489,7 @@ function getDefaultConfig() {
        * @see https://tailwindcss.com/docs/transition-duration
        */
       duration: [{
-        duration: [isInteger]
+        duration: getNumberAndArbitrary()
       }],
       /**
        * Transition Timing Function
@@ -1497,7 +1503,7 @@ function getDefaultConfig() {
        * @see https://tailwindcss.com/docs/transition-delay
        */
       delay: [{
-        delay: [isInteger]
+        delay: getNumberAndArbitrary()
       }],
       /**
        * Animation