tailwind_merge 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62945b1857b5eed46ed2e7c1364c5f4ef76cb47bb8b79a73f2bbaa4b637910f9
-  data.tar.gz: 4f5a75acf2536ddfef9800750d957a81686613ba6863deef580957ef05494da9
+  metadata.gz: 963bec3ea5a28c6f2e282b5836fd2b1bb317aafee92a6c65872b1b52919bca3a
+  data.tar.gz: 8b86c7e251064a52b8a591933bb09dcdf5e72efba0edc508066d0bcbf3bf3cfa
 SHA512:
-  metadata.gz: 3380302a5365edc1e461ceb42af2431ace5ca770f6288ed565fe5c8493db188c0af44abcd7021543e1f798045bcca9a4fabffcf0db11b672439a43a33075d247
-  data.tar.gz: 8a9b8701b292cf0d21b65d8d4c4bb94527615b92a7ed38328e084e4f23b719065a105b76d4021739893fb31ababa10bc00dd69a1d9620f5e95db97e11bf59016
+  metadata.gz: f980fb0cb733e00de99e109fa12c36a125af360f62ee471ec49da0c2aaa4d57590dcd2957cb3531ab4ebb25bf197ca8e3ccd85b679c140e0dcecb5b38b96324d
+  data.tar.gz: 7327cef609f7617f99196d2ef8dd2f98190e7eaf90dc7af0305b5eb4062bc3c8887b5653ce13be427602b9665671745c788a57fa8fa4b1775253b4784ed7bbee

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [v0.13.0] - 29-08-2024
+## What's Changed
+* Add theme support by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/32
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.12.2...v0.13.0
+# [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

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
 
@@ -310,7 +310,18 @@ In the Tailwind config you can modify theme scales. `tailwind_merge` follows the
 - `space`
 - `translate`
 
-If you modified one of these theme scales in your Tailwind config, you can add all your keys right here and tailwind-merge will take care of the rest. If you modified other theme scales, you need to figure out the class group to modify in the [default config](#getdefaultconfig).
+If you modified one of these theme scales in your Tailwind config, you can add all your keys right here and tailwind-merge will take care of the rest. For example, to add custom spaces and margin, you would provide the following `theme`:
+
+```ruby
+merger = TailwindMerge::Merger.new(config: {
+    theme: {
+    "spacing" => ["my-space"],
+    "margin" => ["my-margin"],
+    },
+})
+```
+
+If you modified other theme scales, you need to figure out the class group to modify in the [default config](#getdefaultconfig).
 
 ### Validators
 

data/lib/tailwind_merge/config.rb

@@ -4,8 +4,8 @@ module TailwindMerge
   module Config
     include Validators
 
-    FROM_THEME = ->(config, theme) {
-      config.fetch(:theme, {}).fetch(theme, nil)
+    FROM_THEME = ->(config, key) {
+      config[:theme].fetch(key, nil)
     }
 
     COLORS = ->(config) { FROM_THEME.call(config, "colors") }
@@ -105,7 +105,6 @@ module TailwindMerge
     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 = {
@@ -115,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,
@@ -129,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,
@@ -1841,10 +1840,13 @@ module TailwindMerge
     def merge_configs(extension_config)
       config = TailwindMerge::Config::DEFAULTS
       [:theme].each do |type|
-        extension_config.fetch(type, {}).each_pair do |key, value|
-          config[type][value] = ->(config) { FROM_THEME.call(config, key) }
+        extension_config.fetch(type, {}).each_pair do |key, scales|
+          config[type][key] << ->(klass) {
+            scales.include?(klass)
+          }
         end
       end
+
       config
     end
   end

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 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.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux