tailwind_merge 0.9.1 → 0.10.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 671c8c7c69b02946b8df9ffa5a07211e5a00ad564aefc81927d5653a5b77e9a3
4
- data.tar.gz: 890d2ed86cb560af7245b40efb9275fc4eefa6b3458dd46170dfc4e41263e5fb
3
+ metadata.gz: 34bf15c918f86dec9988db87466221201dd93bcc324b27485cb5a952344de914
4
+ data.tar.gz: 679f38a50be8b69b220cd33ef25187aa4de16ebefab8ee140f92c013f9d1e6a4
5
5
  SHA512:
6
- metadata.gz: 58ddfe25ea801d1a480aebc2c065ee1cf74886b2e2c37a1a1c1ade85d0c88ff11500650152b7e0bb8591736f87493ee99f0e34ae1001244b824c6670e60fbf2f
7
- data.tar.gz: 181f01df6b0f03e8ec24545c3d2397420c5a8872f3fc0ac7b3522a632b55dd75afdd144f329444dd75fe52cf97e4cca47e5bf0a78301b2c36d7b09e762b04623
6
+ metadata.gz: 5b72a46dc1d84563c18ca969213b3d34c0e49fa6bc3827210e8e47210aeaff01a577874d91d684f201cfefe86776b9fac7e066e3e849f44db5739f93b010fe89
7
+ data.tar.gz: 026f159e7fcf914f9bc2cc189ef7d5f5fdf32fb04dedc109548d8d9af6a61381f210269987955109388e95307a9ba933879aa098ec75369cb7eda0d5de854323
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [v0.9.1] - 20-11-2023
2
+ ## What's Changed
3
+ * Fix display removal when preceding line-clamp by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/22
4
+
5
+
6
+ **Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.9.0...v0.9.1
1
7
  ## [v0.9.0] - 04-11-2023
2
8
  ## What's Changed
3
9
  * Updates by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/21
@@ -212,12 +212,12 @@ module TailwindMerge
212
212
  # Floats
213
213
  # @see https://tailwindcss.com/docs/float
214
214
  ##
215
- "float" => [{ "float" => ["right", "left", "none"] }],
215
+ "float" => [{ "float" => ["right", "left", "none", "start", "end"] }],
216
216
  ##
217
217
  # Clear
218
218
  # @see https://tailwindcss.com/docs/clear
219
219
  ##
220
- "clear" => [{ "clear" => ["left", "right", "both", "none"] }],
220
+ "clear" => [{ "clear" => ["left", "right", "both", "none", "start", "end"] }],
221
221
  ##
222
222
  # Isolation
223
223
  # @see https://tailwindcss.com/docs/isolation
@@ -591,12 +591,24 @@ module TailwindMerge
591
591
  # Width
592
592
  # @see https://tailwindcss.com/docs/width
593
593
  ##
594
- "w" => [{ "w" => ["auto", "min", "max", "fit", IS_ARBITRARY_VALUE, SPACING] }],
594
+ "w" => [{
595
+ "w" => [
596
+ "auto",
597
+ "min",
598
+ "max",
599
+ "fit",
600
+ "svw",
601
+ "lvw",
602
+ "dvw",
603
+ IS_ARBITRARY_VALUE,
604
+ SPACING,
605
+ ],
606
+ }],
595
607
  ##
596
608
  # Min-Width
597
609
  # @see https://tailwindcss.com/docs/min-width
598
610
  ##
599
- "min-w" => [{ "min-w" => ["min", "max", "fit", IS_ARBITRARY_VALUE, IS_LENGTH] }],
611
+ "min-w" => [{ "min-w" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit"] }],
600
612
  ##
601
613
  # Max-Width
602
614
  # @see https://tailwindcss.com/docs/max-width
@@ -604,7 +616,8 @@ module TailwindMerge
604
616
  "max-w" => [
605
617
  {
606
618
  "max-w" => [
607
- "0",
619
+ IS_ARBITRARY_VALUE,
620
+ SPACING,
608
621
  "none",
609
622
  "full",
610
623
  "min",
@@ -613,7 +626,6 @@ module TailwindMerge
613
626
  "prose",
614
627
  { "screen" => [IS_TSHIRT_SIZE] },
615
628
  IS_TSHIRT_SIZE,
616
- IS_ARBITRARY_VALUE,
617
629
  ],
618
630
  },
619
631
  ],
@@ -621,17 +633,22 @@ module TailwindMerge
621
633
  # Height
622
634
  # @see https://tailwindcss.com/docs/height
623
635
  ##
624
- "h" => [{ "h" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit"] }],
636
+ "h" => [{ "h" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit", "svh", "lvh", "dvh"] }],
625
637
  ##
626
638
  # Min-Height
627
639
  # @see https://tailwindcss.com/docs/min-height
628
640
  ##
629
- "min-h" => [{ "min-h" => ["min", "max", "fit", IS_LENGTH, IS_ARBITRARY_VALUE] }],
641
+ "min-h" => [{ "min-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit", "svh", "lvh", "dvh"] }],
630
642
  ##
631
643
  # Max-Height
632
644
  # @see https://tailwindcss.com/docs/max-height
633
645
  ##
634
- "max-h" => [{ "max-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit"] }],
646
+ "max-h" => [{ "max-h" => [IS_ARBITRARY_VALUE, SPACING, "min", "max", "fit", "svh", "lvh", "dvh"] }],
647
+ ##
648
+ # Size
649
+ # @see https://tailwindcss.com/docs/size
650
+ ##
651
+ "size" => [{ "size" => [IS_ARBITRARY_VALUE, SPACING, "auto", "min", "max", "fit"] }],
635
652
  # Typography
636
653
  ##
637
654
  # Font Size
@@ -809,6 +826,11 @@ module TailwindMerge
809
826
  ##
810
827
  "text-overflow" => ["truncate", "text-ellipsis", "text-clip"],
811
828
  ##
829
+ # Text Wrap
830
+ # @see https://tailwindcss.com/docs/text-wrap
831
+ ##
832
+ "text-wrap" => [{ "text" => ["wrap", "nowrap", "balance", "pretty"] }],
833
+ ##
812
834
  # Text Indent
813
835
  # @see https://tailwindcss.com/docs/text-indent
814
836
  ##
@@ -1463,7 +1485,7 @@ module TailwindMerge
1463
1485
  # Appearance
1464
1486
  # @see https://tailwindcss.com/docs/appearance
1465
1487
  ##
1466
- "appearance" => ["appearance-none"],
1488
+ "appearance" => [{ "appearance" => ["none", "auto"] }],
1467
1489
  ##
1468
1490
  # Cursor
1469
1491
  # @see https://tailwindcss.com/docs/cursor
@@ -1707,6 +1729,11 @@ module TailwindMerge
1707
1729
  # @see https://tailwindcss.com/docs/screen-readers
1708
1730
  ##
1709
1731
  "sr" => ["sr-only", "not-sr-only"],
1732
+ ##
1733
+ # Forced Color Adjust
1734
+ # @see https://tailwindcss.com/docs/forced-color-adjust
1735
+ ##
1736
+ "forced-color-adjust" => [{ "forced-color-adjust": ["auto", "none"] }],
1710
1737
  },
1711
1738
  conflicting_class_groups: {
1712
1739
  "overflow" => ["overflow-x", "overflow-y"],
@@ -1722,6 +1749,7 @@ module TailwindMerge
1722
1749
  "m" => ["mx", "my", "ms", "me", "mt", "mr", "mb", "ml"],
1723
1750
  "mx" => ["mr", "ml"],
1724
1751
  "my" => ["mt", "mb"],
1752
+ "size" => ["w", "h"],
1725
1753
  "font-size" => ["leading"],
1726
1754
  "fvn-normal" => [
1727
1755
  "fvn-ordinal",
@@ -110,6 +110,6 @@ module TailwindMerge
110
110
  arbitrary_value?(value, "", is_shadow)
111
111
  }
112
112
 
113
- IS_ANY = ->(_) { return true }
113
+ IS_ANY = ->(_) { true }
114
114
  end
115
115
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module TailwindMerge
4
- VERSION = "0.9.1"
4
+ VERSION = "0.10.0"
5
5
  end
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: 0.9.1
4
+ version: 0.10.0
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: 2023-11-20 00:00:00.000000000 Z
11
+ date: 2023-12-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: lru_redux
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  - !ruby/object:Gem::Version
100
100
  version: '0'
101
101
  requirements: []
102
- rubygems_version: 3.4.22
102
+ rubygems_version: 3.5.3
103
103
  signing_key:
104
104
  specification_version: 4
105
105
  summary: Utility function to efficiently merge Tailwind CSS classes without style