tailwind_merge 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49468c0bdbf4ddb68d243dccfa35e4625ea4f703629a4e544e61776a38eeb2b
-  data.tar.gz: 1679630fbd3af2a407cdc64d73ea2fedbf0bcafa7b299fbfd7a2c673d643ae21
+  metadata.gz: acd2f51e2649b7431dee68c8dfcc32d173ff034b9781234be67017f2c6631017
+  data.tar.gz: f029d5b0d2c31cfa0e93f8f5bcbd1b9b2846194c4489d03d9698f0ff034d4e42
 SHA512:
-  metadata.gz: 69f000a1202366ebe7b98845248db99266a639ff286eb944be5eb6443bc7d40500a328946dd44ad03a82ca049f6ceb12daec62fc7f143ca0bac80f42b38cb466
-  data.tar.gz: 99e3566837682b68b64096730b1443ff8ccde5a19cb483a15defc344c6a5a7a6d24fc20838fe80a9834e4c6ecbee86ca5916c6bea5862ee54ca0e8da9cc0c442
+  metadata.gz: 0d5f11f2a351bd3ce9d042a82cceb0d13784ec1ed2355e93f6dd281c7d7ee6fa5859c227c77da5077cb9c8cb03d54bede87045b4924baf52c11c8fc2c512b81c
+  data.tar.gz: acb2e759fa33bbf36a1161f40ca0ffdf396812a6597366a518e06a9b78ae6212e2fb4077555a0b12d503d34d2adc29b2effa31c5918a370d0b2ad91ef552c18b

data/README.md

@@ -2,7 +2,7 @@
 
 Utility function to efficiently merge [Tailwind CSS](https://tailwindcss.com/) classes without style conflicts. Essentially, a Ruby port of [tailwind-merge](https://github.com/dcastil/tailwind-merge).
 
-Supports Tailwind v3.0+.
+Supports Tailwind v3.0 up to v3.2.
 
 ## Installation
 

data/lib/tailwind_merge/config.rb

@@ -300,7 +300,7 @@ module TailwindMerge
         # Visibility
         # @see https://tailwindcss.com/docs/visibility
         ##
-        "visibility" => ["visible", "invisible"],
+        "visibility" => ["visible", "invisible", "collapse"],
         ##
         # Z-Index
         # @see https://tailwindcss.com/docs/z-index
@@ -431,7 +431,7 @@ module TailwindMerge
         # Align Content
         # @see https://tailwindcss.com/docs/align-content
         ##
-        "align-content" => [{ "content" => ALIGN.call }],
+        "align-content" => [{ content: [*ALIGN.call, "baseline"] }],
         ##
         # Align Items
         # @see https://tailwindcss.com/docs/align-items
@@ -446,12 +446,12 @@ module TailwindMerge
         # Place Content
         # @see https://tailwindcss.com/docs/place-content
         ##
-        "place-content" => [{ "place-content" => [*ALIGN.call, "stretch"] }],
+        "place-content" => [{ "place-content" => [*ALIGN.call, "baseline", "stretch"] }],
         ##
         # Place Items
         # @see https://tailwindcss.com/docs/place-items
         ##
-        "place-items" => [{ "place-items" => ["start", "end", "center", "stretch"] }],
+        "place-items" => [{ "place-items" => ["start", "end", "center", "baseline", "stretch"] }],
         ##
         # Place Self
         # @see https://tailwindcss.com/docs/place-self
@@ -793,7 +793,7 @@ module TailwindMerge
         # Word Break
         # @see https://tailwindcss.com/docs/word-break
         ##
-        "break" => [{ "break" => ["normal", "words", "all"] }],
+        "break" => [{ "break" => ["normal", "words", "all", "keep"] }],
         ##
         # Content
         # @see https://tailwindcss.com/docs/content
@@ -1034,7 +1034,7 @@ module TailwindMerge
         # Outline Style
         # @see https://tailwindcss.com/docs/outline-style
         ##
-        "outline-style" => [{ "outline" => ["", *LINE_STYLES.call, "hidden"] }],
+        "outline-style" => [{ "outline" => ["", *LINE_STYLES.call] }],
         ##
         # Outline Offset
         # @see https://tailwindcss.com/docs/outline-offset
@@ -1540,7 +1540,7 @@ module TailwindMerge
         # Fill
         # @see https://tailwindcss.com/docs/fill
         ##
-        "fill" => [{ "fill" => [COLORS] }],
+        "fill" => [{ "fill" => [COLORS, "none"] }],
         ##
         # Stroke Width
         # @see https://tailwindcss.com/docs/stroke-width
@@ -1550,7 +1550,7 @@ module TailwindMerge
         # Stroke
         # @see https://tailwindcss.com/docs/stroke
         ##
-        "stroke" => [{ "stroke" => [COLORS] }],
+        "stroke" => [{ "stroke" => [COLORS, "none"] }],
         # Accessibility
         ##
         # Screen Readers

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style