tailwind_merge 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400ee8fcc7d3e0247fa8fdfd1d41bcaee413cc8cc1470b3eae68eb637aec8a95
-  data.tar.gz: c31e306e40abc9e0663e5379709a7e60e3ae0f4d8ff4ffffacecbaadc16fefc1
+  metadata.gz: acd2f51e2649b7431dee68c8dfcc32d173ff034b9781234be67017f2c6631017
+  data.tar.gz: f029d5b0d2c31cfa0e93f8f5bcbd1b9b2846194c4489d03d9698f0ff034d4e42
 SHA512:
-  metadata.gz: 7c07a82f66386658a55a6b4d20253c337f882a1ca053b6a1498ba999b31f2817af75dfd2d839f7edc774ed0578d1b86a8a8f7c5be9eba118d9b0d77ccaf03ad1
-  data.tar.gz: f6eff1e3ffdebbd8a8d7361f8c53fff06ad6c109f2774d8661e4106ad61461ca2eef4100d3b3bc82289ea42e059f7613aa26a63229429bddc3c57322cf2213a0
+  metadata.gz: 0d5f11f2a351bd3ce9d042a82cceb0d13784ec1ed2355e93f6dd281c7d7ee6fa5859c227c77da5077cb9c8cb03d54bede87045b4924baf52c11c8fc2c512b81c
+  data.tar.gz: acb2e759fa33bbf36a1161f40ca0ffdf396812a6597366a518e06a9b78ae6212e2fb4077555a0b12d503d34d2adc29b2effa31c5918a370d0b2ad91ef552c18b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [v0.1.3](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.3) (2022-10-11)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.2...v0.1.3)
+
 ## [v0.1.2](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.2) (2022-10-11)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.1...v0.1.2)

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
 
@@ -291,7 +291,7 @@ Here's a brief summary for each validator:
 -   `IS_ARBITRARY_SIZE` checks whether class part is an arbitrary value which starts with `size:` (`[size:200px_100px]`) which is necessary for background-size classNames.
 -   `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_URL` checks whether class part is an arbitrary value which starts with `url:` or `url(` (`[url('/path-to-image.png')]`, `url:var(--maybe-a-url-at-runtime)]`) which is necessary for background-image classNames.
--   `IS_ARBITRARY_WEIGHT` 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_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_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.
 

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
@@ -626,7 +626,7 @@ module TailwindMerge
               "bold",
               "extrabold",
               "black",
-              IS_ARBITRARY_WEIGHT,
+              IS_ARBITRARY_NUMBER,
             ],
           },
         ],
@@ -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,17 +1540,17 @@ 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
         ##
-        "stroke-w" => [{ "stroke" => [IS_LENGTH] }],
+        "stroke-w" => [{ "stroke" => [IS_LENGTH, IS_ARBITRARY_NUMBER] }],
         ##
         # Stroke
         # @see https://tailwindcss.com/docs/stroke
         ##
-        "stroke" => [{ "stroke" => [COLORS] }],
+        "stroke" => [{ "stroke" => [COLORS, "none"] }],
         # Accessibility
         ##
         # Screen Readers

data/lib/tailwind_merge/validators.rb

@@ -68,7 +68,7 @@ module TailwindMerge
       false
     }
 
-    IS_ARBITRARY_WEIGHT = ->(class_part) {
+    IS_ARBITRARY_NUMBER = ->(class_part) {
       if (match = ARBITRARY_VALUE_REGEX.match(class_part))
         return match[1].start_with?("number:") || numeric?(match[1])
       end

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -140,7 +140,7 @@ files:
 - lib/tailwind_merge/config.rb
 - lib/tailwind_merge/validators.rb
 - lib/tailwind_merge/version.rb
-- script/changelog_generator
+- script/generate_changelog
 - tailwind_merge.gemspec
 homepage: https://www.github.com/gjtorikian/tailwind_merge
 licenses:
@@ -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