tailwind_merge 1.3.0 → 1.3.1
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/lib/tailwind_merge/validators.rb +1 -1
- data/lib/tailwind_merge/version.rb +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f07a508b699ebc4c587bbc4eec6beba9ccab467556c3aeca42c50afb63830a0b
|
|
4
|
+
data.tar.gz: e758e188351382559cfba8719bcd87d34b229117d56d870e0fac6bada0b178f9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 88200c305a5ffe30452b0664cd502dab4c16e48b582a0cf3bc6f7c1f288b900ac3b56292f98100ae2b9d59cce93126ec36dd8437d15f758e8e115d4cc68bd731
|
|
7
|
+
data.tar.gz: 89c074376a553d93420c0b0a92f5f1e43315d75bb998f055e0b2c4723b6e83eba33261bfb6e00c0d713feb9c35445298b5fcdf05bcdd0a9bc0f20a5b926abeeb
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
# [v1.3.1] - 10-06-2025
|
|
2
|
+
## What's Changed
|
|
3
|
+
* Fix arbitrary color mix by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/62
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.3.0...v1.3.1
|
|
1
7
|
# [v1.3.0] - 09-06-2025
|
|
2
8
|
## What's Changed
|
|
3
9
|
* Add support for tailwind CSS v4.1.5 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/60
|
|
@@ -37,7 +37,7 @@ module TailwindMerge
|
|
|
37
37
|
FRACTION_REGEX = %r{^\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))\(.+\)$/
|
|
40
|
+
COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix)\(.+\)$/
|
|
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)/
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tailwind_merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Garen J. Torikian
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-06-
|
|
11
|
+
date: 2025-06-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: sin_lru_redux
|
|
@@ -76,15 +76,15 @@ files:
|
|
|
76
76
|
- lib/tailwind_merge/version.rb
|
|
77
77
|
- script/test
|
|
78
78
|
- tailwind_merge.gemspec
|
|
79
|
-
homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.
|
|
79
|
+
homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.1
|
|
80
80
|
licenses:
|
|
81
81
|
- MIT
|
|
82
82
|
metadata:
|
|
83
|
-
homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.
|
|
84
|
-
source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.
|
|
85
|
-
changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.3.
|
|
83
|
+
homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.1
|
|
84
|
+
source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.1
|
|
85
|
+
changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.3.1/CHANGELOG.md
|
|
86
86
|
bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
|
|
87
|
-
documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.3.
|
|
87
|
+
documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.3.1
|
|
88
88
|
funding_uri: https://github.com/sponsors/gjtorikian
|
|
89
89
|
rubygems_mfa_required: 'true'
|
|
90
90
|
post_install_message:
|