tailwind_merge 0.11.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9215c8da9ac6f18a5a552237e0f553b4dc055ca0fabd78821602517ebcf802c4
-  data.tar.gz: 382be551f40940cb23ca1983bc0040ca7f809339086988c394e4a555872f5446
+  metadata.gz: 7bd029b3106698874b67142336e597f9369c92664531879ad22eedd0cba6645b
+  data.tar.gz: 5389d8adf19d10d5f4edd08bff8cfd94f23e8ce65f6893400b0a8416de629faa
 SHA512:
-  metadata.gz: 9b0f002423acb683795d68040b049a2504f458bd4b4f7eee1818f85ca81c52daaf9eff09ac8a1ee3bf0af5596e9a1ef5f31c84f8ef1d2e208533d1daf581c906
-  data.tar.gz: 1b6ff1b9efe0ee53ca77fe433ebfbf217172a84aebd914986b25dbee6e125c9eaf3923cc43f2d0633f75acc41ca12ea58d2381ea387187d605f85b94f67907c1
+  metadata.gz: 2236d20be8ac16e9fb1ee61682c00d8cc00a8102a1f12ef6ab2d56bd9829a041feb08e5448ebcf09e7940a43b3d6ca512ce0f381bdd006275302167c245700b1
+  data.tar.gz: aa34f52e7f697c8b1c01d3bead20a4868393f054dfbf9dbb7595d842d3883c26c23e1039dc6b14cd309671b198f6751181465478f246f5b609acf628694de861

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [v0.12.2] - 18-08-2024
+## What's Changed
+* remove spurious debug statement by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/28
+* Port over latest updates + bugfixes by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/29
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.12.0...v0.12.2
+## [v0.12.0] - 25-04-2024
+## What's Changed
+* Add support for mix-blend-plus-darker utility by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/27
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.11.0...v0.12.0
+## [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

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 up to v3.2.
+Supports Tailwind v3.0 up to v3.4.
 
 ## Installation
 

data/lib/tailwind_merge/config.rb

@@ -100,13 +100,11 @@ module TailwindMerge
         "saturation",
         "color",
         "luminosity",
-        "plus-lighter",
       ]
     }
     ALIGN = -> { ["start", "end", "center", "between", "around", "evenly", "stretch"] }
     ZERO_AND_EMPTY = -> { ["", "0", IS_ARBITRARY_VALUE] }
     BREAKS = -> { ["auto", "avoid", "all", "avoid-page", "page", "left", "right", "column"] }
-    NUMBER = -> { [IS_NUMBER, IS_ARBITRARY_NUMBER] }
     NUMBER_AND_ARBITRARY = -> { [IS_NUMBER, IS_ARBITRARY_VALUE] }
 
     DEFAULTS = {
@@ -116,12 +114,12 @@ module TailwindMerge
         "colors" => [IS_ANY],
         "spacing" => [IS_LENGTH, IS_ARBITRARY_LENGTH],
         "blur" => ["none", "", IS_TSHIRT_SIZE, IS_ARBITRARY_VALUE],
-        "brightness" => NUMBER.call,
+        "brightness" => NUMBER_AND_ARBITRARY.call,
         "border-color" => [COLORS],
         "border-radius" => ["none", "", "full", IS_TSHIRT_SIZE, IS_ARBITRARY_VALUE],
         "border-spacing" => SPACING_WITH_ARBITRARY.call,
         "border-width" => LENGTH_WITH_EMPTY_AND_ARBITRARY.call,
-        "contrast" => NUMBER.call,
+        "contrast" => NUMBER_AND_ARBITRARY.call,
         "grayscale" => ZERO_AND_EMPTY.call,
         "hue-rotate" => NUMBER_AND_ARBITRARY.call,
         "invert" => ZERO_AND_EMPTY.call,
@@ -130,10 +128,10 @@ module TailwindMerge
         "gradient-color-stop-positions" => [IS_PERCENT, IS_ARBITRARY_LENGTH],
         "inset" => SPACING_WITH_AUTO_AND_ARBITRARY.call,
         "margin" => SPACING_WITH_AUTO_AND_ARBITRARY.call,
-        "opacity" => NUMBER.call,
+        "opacity" => NUMBER_AND_ARBITRARY.call,
         "padding" => SPACING_WITH_ARBITRARY.call,
-        "saturate" => NUMBER.call,
-        "scale" => NUMBER.call,
+        "saturate" => NUMBER_AND_ARBITRARY.call,
+        "scale" => NUMBER_AND_ARBITRARY.call,
         "sepia" => ZERO_AND_EMPTY.call,
         "skew" => NUMBER_AND_ARBITRARY.call,
         "space" => SPACING_WITH_ARBITRARY.call,
@@ -1230,7 +1228,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.11.0"
+  VERSION = "0.12.2"
 end

data/lib/tailwind_merge.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 if ENV.fetch("DEBUG", false)
-  require "amazing_print"
   require "debug"
+  begin
+    require "amazing_print"
+  rescue LoadError # rubocop:disable Lint/SuppressedException
+  end
 end
 
 require "lru_redux"
@@ -44,15 +47,24 @@ module TailwindMerge
       end
     end
 
-    private def merge_class_list(classes)
+    private def merge_class_list(class_list)
       # Set of class_group_ids in following format:
       # `{importantModifier}{variantModifiers}{classGroupId}`
       # @example 'float'
       # @example 'hover:focus:bg-color'
       # @example 'md:!pr'
-      class_groups_in_conflict = Set.new
+      class_groups_in_conflict = []
+      class_names = class_list.strip.split(SPLIT_CLASSES_REGEX)
+
+      result = ""
+
+      i = class_names.length - 1
+
+      loop do
+        break if i < 0
+
+        original_class_name = class_names[i]
 
-      classes.strip.split(SPLIT_CLASSES_REGEX).map do |original_class_name|
         modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position = split_modifiers(original_class_name, separator: @config[:separator])
 
         actual_base_class_name = maybe_postfix_modifier_position ? base_class_name[0...maybe_postfix_modifier_position] : base_class_name
@@ -60,61 +72,48 @@ module TailwindMerge
 
         unless class_group_id
           unless maybe_postfix_modifier_position
-            next {
-              is_tailwind_class: false,
-              original_class_name: original_class_name,
-            }
+            # not a Tailwind class
+            result = original_class_name + (!result.empty? ? " " + result : result)
+            i -= 1
+            next
           end
 
           class_group_id = @class_utils.class_group_id(base_class_name)
 
           unless class_group_id
-            next {
-              isTailwindClass: false,
-              original_class_name: original_class_name,
-            }
-
+            # not a Tailwind class
+            result = original_class_name + (!result.empty? ? " " + result : result)
+            i -= 1
+            next
           end
 
           has_postfix_modifier = false
-
-          next {
-            is_tailwind_class: false,
-            original_class_name: original_class_name,
-          }
         end
 
         variant_modifier = sort_modifiers(modifiers).join(":")
 
         modifier_id = has_important_modifier ? "#{variant_modifier}#{IMPORTANT_MODIFIER}" : variant_modifier
-
-        {
-          is_tailwind_class: true,
-          modifier_id: modifier_id,
-          class_group_id: class_group_id,
-          original_class_name: original_class_name,
-          has_postfix_modifier: has_postfix_modifier,
-        }
-      end.reverse # Last class in conflict wins, so filter conflicting classes in reverse order.
-        .select do |parsed|
-        next(true) unless parsed[:is_tailwind_class]
-
-        modifier_id = parsed[:modifier_id]
-        class_group_id = parsed[:class_group_id]
-        has_postfix_modifier = parsed[:has_postfix_modifier]
-
         class_id = "#{modifier_id}#{class_group_id}"
 
-        next if class_groups_in_conflict.include?(class_id)
+        # Tailwind class omitted due to pre-existing conflict
+        if class_groups_in_conflict.include?(class_id)
+          i -= 1
+          next
+        end
 
-        class_groups_in_conflict.add(class_id)
+        class_groups_in_conflict.push(class_id)
 
         @class_utils.get_conflicting_class_group_ids(class_group_id, has_postfix_modifier).each do |group|
-          class_groups_in_conflict.add("#{modifier_id}#{group}")
+          class_groups_in_conflict.push("#{modifier_id}#{group}")
         end
 
-        true
-      end.reverse.map { |parsed| parsed[:original_class_name] }.join(" ")
+        # no conflict!
+        result = original_class_name + (!result.empty? ? " " + result : result)
+
+        i -= 1
+      end
+
+      result
     end
   end
 end

metadata

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