tailwind_merge 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bf15c918f86dec9988db87466221201dd93bcc324b27485cb5a952344de914
-  data.tar.gz: 679f38a50be8b69b220cd33ef25187aa4de16ebefab8ee140f92c013f9d1e6a4
+  metadata.gz: 5aa6b6ffac6e2a45168871d6c032809d11c70f16106a15160d3f1072f71d8ccd
+  data.tar.gz: b09166dde7931054f168514e503ebdef87067902177721bb5377dec8f89aa7fa
 SHA512:
-  metadata.gz: 5b72a46dc1d84563c18ca969213b3d34c0e49fa6bc3827210e8e47210aeaff01a577874d91d684f201cfefe86776b9fac7e066e3e849f44db5739f93b010fe89
-  data.tar.gz: 026f159e7fcf914f9bc2cc189ef7d5f5fdf32fb04dedc109548d8d9af6a61381f210269987955109388e95307a9ba933879aa098ec75369cb7eda0d5de854323
+  metadata.gz: 7f62b3a8857549d506d836ef12a60530ae7f243beb80996b820b2f35009cada16c8e5ba0aaec2579aa4e6a9060f6cc314e78e03204e3e01825725eee4f0b7951
+  data.tar.gz: 0b0bdafecbda35a3b1d453101a56a9e388c77836216f7c3db2105f32a3956105b80ad52f6c151ddce75fc5d6db05d3f77220518c431b11efeba6d900ddac38b8

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v0.10.1] - 30-01-2024
+## What's Changed
+* Fix stroke-color being incorrectly detected as stroke-width by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/24
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.10.0...v0.10.1
+## [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

data/README.md

@@ -315,7 +315,7 @@ Here's a brief summary for each validator:
 - `IS_ARBITRARY_POSITION` checks whether class part is an arbitrary value which starts with `position:` (`[position:200px_100px]`) which is necessary for background-position classNames.
 - `IS_ARBITRARY_IMAGE` checks whether class part is an arbitrary value which is an iamge, e.g. by starting with `image:`, `url:`, `linear-gradient(` or `url(` (`[url('/path-to-image.png')]`, `image:var(--maybe-an-image-at-runtime)]`) which is necessary for background-image classNames.
 - `IS_ARBITRARY_NUMBER` checks whether class part is an arbitrary value which starts with `number:` or is a number (`[number:var(--value)]`, `[450]`) which is necessary for font-weight classNames.
-- `IS_ARBITRARY_SHADOW` checks whether class part is an arbitrary value which starts with the same pattern as a shadow value (`[0_35px_60px_-15px_rgba(0,0,0,0.3)]`), namely with two lengths separated by a underscore.
+- `IS_ARBITRARY_SHADOW` checks whether class part is an arbitrary value which starts with the same pattern as a shadow value (`[0_35px_60px_-15px_rgba(0,0,0,0.3)]`), namely with two lengths separated by a underscore, optionally prepended by `inset`.
 - `IS_ANY` always returns true. Be careful with this validator as it might match unwanted classes. I use it primarily to match colors or when it's certain there are no other class groups in a namespace.
 
 ## Performance

data/lib/tailwind_merge/validators.rb

@@ -31,15 +31,19 @@ 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)$/
-    # Shadow always begins with x and y offset separated by underscore
-    SHADOW_REGEX = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
+    COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/
+    # Shadow always begins with x and y offset separated by underscore optionally prepended by inset
+    SHADOW_REGEX = /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
     IMAGE_REGEX = /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/
 
     SIZE_LABELS = Set.new(["length", "size", "percentage"]).freeze
     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 }

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-03-18 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.5.3
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style