tailwind_merge 0.9.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671c8c7c69b02946b8df9ffa5a07211e5a00ad564aefc81927d5653a5b77e9a3
-  data.tar.gz: 890d2ed86cb560af7245b40efb9275fc4eefa6b3458dd46170dfc4e41263e5fb
+  metadata.gz: eb9ce33e9e3b1376a95325263d7e3091edbc8ee077f0d3fb023b8e9494345f99
+  data.tar.gz: c1548d94345b50b51074dc54534357d5415ce8feebd2666162840a06a7f6c29b
 SHA512:
-  metadata.gz: 58ddfe25ea801d1a480aebc2c065ee1cf74886b2e2c37a1a1c1ade85d0c88ff11500650152b7e0bb8591736f87493ee99f0e34ae1001244b824c6670e60fbf2f
-  data.tar.gz: 181f01df6b0f03e8ec24545c3d2397420c5a8872f3fc0ac7b3522a632b55dd75afdd144f329444dd75fe52cf97e4cca47e5bf0a78301b2c36d7b09e762b04623
+  metadata.gz: 3af858c685680c51fb0b53eed278b12f42005be6d776aa9795a0757cee0dad204523fc7524f95958843588150356c8e9066f577ccf30a47ea31640b3c0f3d40e
+  data.tar.gz: 12dba99eb0c963292e860378faf0bb57d60a8ad9f4231e7965b26dc3c60ed32f7704554d0b616548108450418c69c18b526f7d69000bcdcf3768b44413f067d0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v0.10.0] - 23-12-2023
+## What's Changed
+* Support Tailwind 3.4 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/23
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.9.1...v0.10.0
+## [v0.9.1] - 20-11-2023
+## What's Changed
+* Fix display removal when preceding line-clamp by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/22
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.9.0...v0.9.1
 ## [v0.9.0] - 04-11-2023
 ## What's Changed
 * Updates by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/21

data/lib/tailwind_merge/config.rb

@@ -212,12 +212,12 @@ module TailwindMerge
         # Floats
         # @see https://tailwindcss.com/docs/float
         ##
-        "float" => [{ "float" => ["right", "left", "none"] }],
+        "float" => [{ "float" => ["right", "left", "none", "start", "end"] }],
         ##
         # Clear
         # @see https://tailwindcss.com/docs/clear
         ##
-        "clear" => [{ "clear" => ["left", "right", "both", "none"] }],
+        "clear" => [{ "clear" => ["left", "right", "both", "none", "start", "end"] }],
         ##
         # Isolation
         # @see https://tailwindcss.com/docs/isolation
@@ -591,12 +591,24 @@ module TailwindMerge
         # Width
         # @see https://tailwindcss.com/docs/width
         ##
-        "w" => [{ "w" => ["auto", "min", "max", "fit", IS_ARBITRARY_VALUE, SPACING] }],
+        "w" => [{
+          "w" => [
+            "auto",
+            "min",
+            "max",
+            "fit",
+            "svw",
+            "lvw",
+            "dvw",
+            IS_ARBITRARY_VALUE,
+            SPACING,
+          ],
+        }],
         ##
         # Min-Width
         # @see https://tailwindcss.com/docs/min-width
         ##
-        "min-w" => [{ "min-w" => ["min", "max", "fit", IS_ARBITRARY_VALUE, IS_LENGTH] }],
+        "min-w" => [{ "min-w" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit"] }],
         ##
         # Max-Width
         # @see https://tailwindcss.com/docs/max-width
@@ -604,7 +616,8 @@ module TailwindMerge
         "max-w" => [
           {
             "max-w" => [
-              "0",
+              IS_ARBITRARY_VALUE,
+              SPACING,
               "none",
               "full",
               "min",
@@ -613,7 +626,6 @@ module TailwindMerge
               "prose",
               { "screen" => [IS_TSHIRT_SIZE] },
               IS_TSHIRT_SIZE,
-              IS_ARBITRARY_VALUE,
             ],
           },
         ],
@@ -621,17 +633,22 @@ module TailwindMerge
         # Height
         # @see https://tailwindcss.com/docs/height
         ##
-        "h" => [{ "h" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit"] }],
+        "h" => [{ "h" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit", "svh", "lvh", "dvh"] }],
         ##
         # Min-Height
         # @see https://tailwindcss.com/docs/min-height
         ##
-        "min-h" => [{ "min-h" => ["min", "max", "fit", IS_LENGTH, IS_ARBITRARY_VALUE] }],
+        "min-h" => [{ "min-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit", "svh", "lvh", "dvh"] }],
         ##
         # Max-Height
         # @see https://tailwindcss.com/docs/max-height
         ##
-        "max-h" => [{ "max-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit"] }],
+        "max-h" => [{ "max-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit", "svh", "lvh", "dvh"] }],
+        ##
+        # Size
+        # @see https://tailwindcss.com/docs/size
+        ##
+        "size" => [{ "size" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit"] }],
         # Typography
         ##
         # Font Size
@@ -809,6 +826,11 @@ module TailwindMerge
         ##
         "text-overflow" => ["truncate", "text-ellipsis", "text-clip"],
         ##
+        # Text Wrap
+        # @see https://tailwindcss.com/docs/text-wrap
+        ##
+        "text-wrap" => [{ "text" => ["wrap", "nowrap", "balance", "pretty"] }],
+        ##
         # Text Indent
         # @see https://tailwindcss.com/docs/text-indent
         ##
@@ -1463,7 +1485,7 @@ module TailwindMerge
         # Appearance
         # @see https://tailwindcss.com/docs/appearance
         ##
-        "appearance" => ["appearance-none"],
+        "appearance" => [{ "appearance" => ["none", "auto"] }],
         ##
         # Cursor
         # @see https://tailwindcss.com/docs/cursor
@@ -1707,6 +1729,11 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/screen-readers
         ##
         "sr" => ["sr-only", "not-sr-only"],
+        ##
+        # Forced Color Adjust
+        # @see https://tailwindcss.com/docs/forced-color-adjust
+        ##
+        "forced-color-adjust" => [{ "forced-color-adjust": ["auto", "none"] }],
       },
       conflicting_class_groups: {
         "overflow" => ["overflow-x", "overflow-y"],
@@ -1722,6 +1749,7 @@ module TailwindMerge
         "m" => ["mx", "my", "ms", "me", "mt", "mr", "mb", "ml"],
         "mx" => ["mr", "ml"],
         "my" => ["mt", "mb"],
+        "size" => ["w", "h"],
         "font-size" => ["leading"],
         "fvn-normal" => [
           "fvn-ordinal",

data/lib/tailwind_merge/validators.rb

@@ -31,6 +31,7 @@ module TailwindMerge
     FRACTION_REGEX = %r{^\d+/\d+$}
     LENGTH_UNIT_REGEX = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/
     TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
+    COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/
     # Shadow always begins with x and y offset separated by underscore
     SHADOW_REGEX = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
     IMAGE_REGEX = /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/
@@ -39,7 +40,10 @@ module TailwindMerge
     IMAGE_LABELS = Set.new(["image", "url"]).freeze
 
     is_length_only = ->(value) {
-      LENGTH_UNIT_REGEX.match?(value)
+      # `colorFunctionRegex` check is necessary because color functions can have percentages in them which which would be incorrectly classified as lengths.
+      # For example, `hsl(0 0% 0%)` would be classified as a length without this check.
+      # I could also use lookbehind assertion in `lengthUnitRegex` but that isn't supported widely enough.
+      LENGTH_UNIT_REGEX.match?(value) && !COLOR_FUNCTION_REGEX.match?(value)
     }
 
     is_never = ->(_) { false }
@@ -110,6 +114,6 @@ module TailwindMerge
       arbitrary_value?(value, "", is_shadow)
     }
 
-    IS_ANY = ->(_) { return true }
+    IS_ANY = ->(_) { true }
   end
 end

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.9.1"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style