tailwind_merge 0.10.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa6b6ffac6e2a45168871d6c032809d11c70f16106a15160d3f1072f71d8ccd
-  data.tar.gz: b09166dde7931054f168514e503ebdef87067902177721bb5377dec8f89aa7fa
+  metadata.gz: 62945b1857b5eed46ed2e7c1364c5f4ef76cb47bb8b79a73f2bbaa4b637910f9
+  data.tar.gz: 4f5a75acf2536ddfef9800750d957a81686613ba6863deef580957ef05494da9
 SHA512:
-  metadata.gz: 7f62b3a8857549d506d836ef12a60530ae7f243beb80996b820b2f35009cada16c8e5ba0aaec2579aa4e6a9060f6cc314e78e03204e3e01825725eee4f0b7951
-  data.tar.gz: 0b0bdafecbda35a3b1d453101a56a9e388c77836216f7c3db2105f32a3956105b80ad52f6c151ddce75fc5d6db05d3f77220518c431b11efeba6d900ddac38b8
+  metadata.gz: 3380302a5365edc1e461ceb42af2431ace5ca770f6288ed565fe5c8493db188c0af44abcd7021543e1f798045bcca9a4fabffcf0db11b672439a43a33075d247
+  data.tar.gz: 8a9b8701b292cf0d21b65d8d4c4bb94527615b92a7ed38328e084e4f23b719065a105b76d4021739893fb31ababa10bc00dd69a1d9620f5e95db97e11bf59016

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v0.11.0] - 26-03-2024
+## What's Changed
+* Support accepting an array of strings by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/26
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.10.2...v0.11.0
+## [v0.10.2] - 18-03-2024
+## What's Changed
+* Support shadow with  by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/25
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.10.1...v0.10.2
 ## [v0.10.1] - 30-01-2024
 ## What's Changed
 * Fix stroke-color being incorrectly detected as stroke-width by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/24

data/README.md

@@ -14,6 +14,8 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
     $ gem install tailwind_merge
 
+To use it, pass in a single string:
+
 ```ruby
 require "tailwind_merge"
 
@@ -21,6 +23,15 @@ TailwindMerge::Merger.new.merge("px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91
 # → 'hover:bg-dark-red p-3 bg-[#B91C1C]'
 ```
 
+Or, an array of strings:
+
+```ruby
+require "tailwind_merge"
+
+TailwindMerge::Merger.new.merge(["px-2 py-1", "bg-red hover:bg-dark-red", "p-3 bg-[#B91C1C]"])
+# → 'hover:bg-dark-red p-3 bg-[#B91C1C]'
+```
+
 ## What's it for?
 
 If you use Tailwind with a component-based UI renderer (like [ViewComponent](https://viewcomponent.org) or [Ariadne](https://github.com/yettoapp/ariadne)), you're probably familiar with the situation that you want to change some styles of an existing component:

data/lib/tailwind_merge/config.rb

@@ -100,7 +100,6 @@ module TailwindMerge
         "saturation",
         "color",
         "luminosity",
-        "plus-lighter",
       ]
     }
     ALIGN = -> { ["start", "end", "center", "between", "around", "evenly", "stretch"] }
@@ -1230,7 +1229,7 @@ module TailwindMerge
         # Mix Blend Mode
         # @see https://tailwindcss.com/docs/mix-blend-mode
         ##
-        "mix-blend" => [{ "mix-blend" => BLEND_MODES.call }],
+        "mix-blend" => [{ "mix-blend" => BLEND_MODES.call.push("plus-lighter", "plus-darker") }],
         ##
         # Background Blend Mode
         # @see https://tailwindcss.com/docs/background-blend-mode

data/lib/tailwind_merge/version.rb

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

data/lib/tailwind_merge.rb

@@ -35,6 +35,10 @@ module TailwindMerge
     end
 
     def merge(classes)
+      if classes.is_a?(Array)
+        classes = classes.compact.join(" ")
+      end
+
       @cache.getset(classes) do
         merge_class_list(classes)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux