tailwind_merge 1.5.5 → 1.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/lib/tailwind_merge/config.rb +1 -0
  4. data/lib/tailwind_merge/validators.rb +1 -1
  5. data/lib/tailwind_merge/version.rb +1 -1
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f048ad3bad246e67618239dd63a7155c2cf2b75a8be211ac14510f195ef8fc62
4
- data.tar.gz: 7e59c5aee2a7df93eb807799446fc49ffab26a3a4363507b84fd44d56a7be778
3
+ metadata.gz: bb50f702f4ea6dac1c810c4c5a4015a614a0da4ea335d76769cbe7ea49a9ebfa
4
+ data.tar.gz: 0b622a25d78d3ee6ab37c6b447c9294f737b7c8f9e70775ef8d3f917b53a3ffd
5
5
  SHA512:
6
- metadata.gz: a976cb0068d4d73e124052923d6bcc12acb92570e34c8337df914a353d6808b17227c6fbf4a51cc301597a3bbc9a8a6d7b90797a7879b7e15cbebc7f7f62d21d
7
- data.tar.gz: e8daab44638f2c203b51a3796d4fe9fb57a6770baadb30cac41427b467f04ddcbb733192307d326101fefcc3edc1dad20ddede70fb2ed41840d25592cdc76239
6
+ metadata.gz: 25fe2392173d3e8c7d5d09300303bc5d3f77068e40d17a36ff1db40e30308dcd247e72b93ea5e76127bbd7490627a41929c2cc0c23cc449377900e687476806d
7
+ data.tar.gz: 6fd92fd35008220b6dd402c003e50530cf592e290cab7ef63c5de0b6583c6a8c9852eb6653051750ba2b978672edd0bfbfca7026da76eb83ae1fec05d0abbb37
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ ## [1.5.6](https://github.com/gjtorikian/tailwind_merge/compare/v1.5.5...v1.5.6) (2026-09-13)
2
+
3
+ ### Bug Fixes
4
+
5
+ * **validators:** don't classify color() and light-dark() as lengths ([#96](https://github.com/gjtorikian/tailwind_merge/pull/96))
6
+ * **config:** keep leading-none in the leading class group ([#95](https://github.com/gjtorikian/tailwind_merge/pull/95))
7
+
8
+
1
9
  ## [1.5.5](https://github.com/gjtorikian/tailwind_merge/compare/v1.5.4...v1.5.5) (2026-08-24)
2
10
 
3
11
  ### Bug Fixes
data/lib/tailwind_merge/config.rb CHANGED
@@ -964,6 +964,7 @@ module TailwindMerge
964
964
  "leading" => [
965
965
  {
966
966
  "leading" => [
967
+ "none",
967
968
  # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 ##
968
969
  THEME_LEADING,
969
970
  *SCALE_UNAMBIGUOUS_SPACING.call,
data/lib/tailwind_merge/validators.rb CHANGED
@@ -37,7 +37,7 @@ module TailwindMerge
37
37
  FRACTION_REGEX = %r{^\d+(?:\.\d+)?/\d+(?:\.\d+)?$}
38
38
  TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
39
39
  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$/
40
- COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix)\(.+\)$/
40
+ COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix|color|light-dark)\(.+\)$/
41
41
 
42
42
  # Shadow always begins with x and y offset separated by underscore optionally prepended by inset
43
43
  SHADOW_REGEX = /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
data/lib/tailwind_merge/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module TailwindMerge
4
- VERSION = "1.5.5"
4
+ VERSION = "1.5.6"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tailwind_merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.5
4
+ version: 1.5.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Garen J. Torikian
@@ -75,15 +75,15 @@ files:
75
75
  - lib/tailwind_merge/version.rb
76
76
  - script/test
77
77
  - tailwind_merge.gemspec
78
- homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.5
78
+ homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.6
79
79
  licenses:
80
80
  - MIT
81
81
  metadata:
82
- homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.5
83
- source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.5
84
- changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.5/CHANGELOG.md
82
+ homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.6
83
+ source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.6
84
+ changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.6/CHANGELOG.md
85
85
  bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
86
- documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.5
86
+ documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.6
87
87
  funding_uri: https://github.com/sponsors/gjtorikian
88
88
  rubygems_mfa_required: 'true'
89
89
  rdoc_options: []