tailwind_merge 0.6.0 → 0.7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f76007fe9bc9eb3a01775ddfbc29e400884058373a9baeb001ccfff21ef9a7
-  data.tar.gz: 4d97ba3be89af9227c4b2aa6f38fc8e9926886b6c33225881630356d72576f3d
+  metadata.gz: 7447d7154d014a86a19be3f98b6ddefb312845fbb027a9a173da9ea9c6594e8c
+  data.tar.gz: d573c40fe6d30de2a42dcab8fcf79c1e5a535b6a3c1af2c26e9ee696f5f38530
 SHA512:
-  metadata.gz: 28794887eeb6e5f73ac74768cad06e52b4d5463e5ea436661e07d61a316f1e4a41b1a6607600746153f0b5464004472c1b98982d7770ca947ea03eb714e0f141
-  data.tar.gz: 88e8f3ab1bb6f2173a1f5aceca7416d8c1c1b4d73608ed78ed97b364f67560792996dcd72e5bcca1f81327bf8fd7aaef318aaab55011772019e9e677fa03f667
+  metadata.gz: 42727802539a4e2dc123df65265a19523c727eb5b3303689bd0363769e17d6ad998c6b48df52e81bf94d8091867fa9d073eb02cb2b83b31442016bde8ad83385
+  data.tar.gz: f54fcd81cd7d1f58b1aa8e5d0b2b0273d973126ccf82f7913d3e72dafd092a146072585c058fe4303b75d7e0f580b1f866091d209d4a08bd9a924813d2354a8f

data/.ruby-version

@@ -0,0 +1 @@
+3.2.1

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [v0.7.1.2](https://github.com/gjtorikian/tailwind_merge/tree/v0.7.1.2) (2023-06-02)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.7.1.1...v0.7.1.2)
+
+## [v0.7.1.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.7.1.1) (2023-06-02)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.7.1...v0.7.1.1)
+
+## [v0.7.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.7.1) (2023-06-02)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.7.0...v0.7.1)
+
+**Merged pull requests:**
+
+- Port updates [\#12](https://github.com/gjtorikian/tailwind_merge/pull/12) ([gjtorikian](https://github.com/gjtorikian))
+- Add Ruby 3.2 to CI. Minor additional cleanup. [\#11](https://github.com/gjtorikian/tailwind_merge/pull/11) ([petergoldstein](https://github.com/petergoldstein))
+
+## [v0.7.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.7.0) (2023-04-03)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.6.0...v0.7.0)
+
+**Merged pull requests:**
+
+- Add postfix support [\#10](https://github.com/gjtorikian/tailwind_merge/pull/10) ([gjtorikian](https://github.com/gjtorikian))
+
 ## [v0.6.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.6.0) (2023-03-29)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.5.2...v0.6.0)

data/README.md

@@ -23,7 +23,7 @@ TailwindMerge::Merger.new.merge("px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91
 
 ## 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/tree/main/ruby/ariadne_view_components)), you're probably familiar with the situation that you want to change some styles of an existing component:
+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:
 
 ```html
 <!-- app/components/confirm_email_component.html.erb -->
@@ -45,15 +45,13 @@ This is where `tailwind_merge` comes in:
 # border rounded p-5
 ```
 
-tailwind-merge overrides conflicting classes and keeps everything else untouched. In the case of the your implementation of `ConfirmEmailComponent`, the input now only renders the classes `border rounded p-5`.
+tailwind-merge overrides conflicting classes and keeps everything else untouched. In the case of the implementation of `ConfirmEmailComponent`, the input now only renders the classes `border rounded p-5`.
 
 ## Features
 
-### Optimized for speed
+### Merging behavior
 
-- Results get cached by default, so you don't need to worry about wasteful re-renders. The library uses a thread-safe [LRU cache](<https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used_(LRU)>) which stores up to 500 different results. The cache size can be modified via config options.
-- Expensive computations happen upfront so that `merge` calls without a cache hit stay fast.
-- These computations are called lazily on the first call to `merge` to prevent it from impacting app startup performance if it isn't used initially.
+`tailwind_merge` is designed to be predictable and intuitive. It follows a set of rules to determine which class "wins" when there are conflicts. Here is a brief overview of the conflict resolutions which `tailwind_merge` can do.
 
 ### Last conflicting class wins
 
@@ -84,6 +82,8 @@ tailwind-merge overrides conflicting classes and keeps everything else untouched
 @merger.merge('hover:focus:p-2 focus:hover:p-4') # → 'focus:hover:p-4'
 ```
 
+The order of standard modifiers does not matter for tailwind-merge.
+
 ### Supports arbitrary values
 
 ```ruby
@@ -101,7 +101,8 @@ tailwind-merge overrides conflicting classes and keeps everything else untouched
 @merger.merge('[padding:1rem] p-8') # → '[padding:1rem] p-8'
 ```
 
-Watch out when mixing arbitrary properties which could be expressed as Tailwind classes. `tailwind_merge` does not resolve conflicts between arbitrary properties and their matching Tailwind classes.
+> **Warning**
+> Watch out for using arbitrary properties which could be expressed as Tailwind classes. `tailwind_merge` does not resolve conflicts between arbitrary properties and their matching Tailwind classes to keep the bundle size small.
 
 ### Supports arbitrary variants
 
@@ -113,7 +114,9 @@ Watch out when mixing arbitrary properties which could be expressed as Tailwind
 @merger.merge('[&:focus]:ring focus:ring-4') # → '[&:focus]:ring focus:ring-4'
 ```
 
-Similarly to arbitrary properties, `tailwind_merge` does not resolve conflicts between arbitrary variants and their matching predefined modifiers.
+> **Warning**
+> Similarly to arbitrary properties, `tailwind_merge` does not resolve conflicts between arbitrary variants and their matching predefined modifiers for bundle size reasons.
+> The order of standard modifiers before and after an arbitrary variant in isolation (all modifiers before are one group, all modifiers after are another group) does not matter for `tailwind_merge`. However, it _does_ matter whether a standard modifier is before or after an arbitrary variant both for Tailwind CSS and `tailwind_merge` because the resulting CSS selectors are different.
 
 ### Supports important modifier
 
@@ -122,6 +125,12 @@ Similarly to arbitrary properties, `tailwind_merge` does not resolve conflicts b
 @merger.merge('!right-2 !-inset-x-1') # → '!-inset-x-1'
 ```
 
+## Supports postfix modifiers
+
+```ts
+twMerge("text-sm leading-6 text-lg/7"); // → 'text-lg/7'
+```
+
 ### Preserves non-Tailwind classes
 
 ```ruby
@@ -142,7 +151,7 @@ If you're using Tailwind CSS without any extra configs, you can use it right awa
 merger = TailwindMerge::Merger.new
 ```
 
-## Usage with custom Tailwind config
+### Usage with custom Tailwind config
 
 If you're using a custom Tailwind config, you may need to configure tailwind-merge as well to merge classes properly.
 
@@ -297,6 +306,22 @@ Here's a brief summary for each validator:
 - `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.
 
+## Performance
+
+### Results are cached
+
+Results are cached by default, so you don't need to worry about wasteful re-renders. The library uses a computationally lightweight [LRU cache](<https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used_(LRU)>) which stores up to 500 different results by default. The cache is applied after all arguments are joined together to a single string. This means that if you call `merge` repeatedly with different arguments that result in the same string when joined, the cache will be hit.
+
+The cache size can be modified or opted out of by setting the `cache_size` config variable.
+
+### Data structures are reused between calls
+
+Expensive computations happen upfront so that `merge` calls without a cache hit stay fast.
+
+### Lazy initialization
+
+The initial computations are called lazily on the first call to `merge` to prevent it from impacting startup performance if it isn't used initially.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/gjtorikian/tailwind_merge.
@@ -304,3 +329,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/gjtori
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Acknowledgements
+
+This gem is pretty much just a port of https://github.com/dcastil/tailwind-merge. Thank them, not me!

data/lib/tailwind_merge/class_utils.rb

@@ -51,8 +51,14 @@ module TailwindMerge
       result.nil? ? result : result[:class_group_id]
     end
 
-    def get_conflicting_class_group_ids(class_group_id)
-      @config[:conflicting_class_groups][class_group_id] || []
+    def get_conflicting_class_group_ids(class_group_id, has_postfix_modifier)
+      conflicts = @config[:conflicting_class_groups][class_group_id] || []
+
+      if has_postfix_modifier && @config[:conflicting_class_group_modifiers][class_group_id]
+        return [...conflicts, ...@config[:conflicting_class_group_modifiers][class_group_id]]
+      end
+
+      conflicts
     end
 
     private def create_class_map(config)

data/lib/tailwind_merge/config.rb

@@ -1782,6 +1782,9 @@ module TailwindMerge
         "scroll-px" => ["scroll-pr", "scroll-pl"],
         "scroll-py" => ["scroll-pt", "scroll-pb"],
       },
+      conflicting_class_group_modifiers: {
+        "font-size": ["leading"],
+      },
     }.freeze
 
     def merge_configs(extension_config)

data/lib/tailwind_merge/modifier_utils.rb

@@ -7,22 +7,29 @@ module TailwindMerge
     def split_modifiers(class_name, separator: nil)
       separator ||= ":"
       separator_length = separator.length
+      seperator_is_single_char = separator_length == 1
+      first_seperator_char = separator[0]
 
       modifiers = []
       bracket_depth = 0
       modifier_start = 0
+      postfix_modifier_position = 0
 
       class_name.each_char.with_index do |char, index|
-        if bracket_depth.zero? && char == separator[0]
-          if separator_length == 1 || class_name[index..(index + separator_length - 1)] == separator
+        if bracket_depth.zero?
+          if char == first_seperator_char && (seperator_is_single_char || class_name[index..(index + separator_length - 1)] == separator)
             modifiers << class_name[modifier_start..index]
             modifier_start = index + separator_length
+            next
+          elsif char == "/"
+            postfix_modifier_position = index
+            next
           end
         end
 
-        if class_name[index] == "["
+        if char == "["
           bracket_depth += 1
-        elsif class_name[index] == "]"
+        elsif char == "]"
           bracket_depth -= 1
         end
       end
@@ -30,8 +37,9 @@ module TailwindMerge
       base_class_name_with_important_modifier = modifiers.empty? ? class_name : class_name[modifier_start..-1]
       has_important_modifier = base_class_name_with_important_modifier.start_with?(IMPORTANT_MODIFIER)
       base_class_name = has_important_modifier ? base_class_name_with_important_modifier[1..-1] : base_class_name_with_important_modifier
+      maybe_postfix_modifier_position = postfix_modifier_position && postfix_modifier_position > modifier_start ? postfix_modifier_position - modifier_start : false
 
-      [modifiers, has_important_modifier, base_class_name]
+      [modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position]
     end
 
     # Sorts modifiers according to following schema:

data/lib/tailwind_merge/validators.rb

@@ -27,7 +27,7 @@ module TailwindMerge
 
     ARBITRARY_VALUE_REGEX = /^\[(?:([a-z-]+):)?(.+)\]$/i
     FRACTION_REGEX = %r{^\d+/\d+$}
-    LENGTH_UNIT_REGEX = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))/
+    LENGTH_UNIT_REGEX = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|^0$/
     TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
     # Shadow always begins with x and y offset separated by underscore
     SHADOW_REGEX = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
@@ -55,9 +55,9 @@ module TailwindMerge
     }
 
     IS_LENGTH = ->(value) {
-      numeric?(value) || \
-        STRING_LENGTHS.include?(value) || \
-        FRACTION_REGEX.match?(value) || \
+      numeric?(value) ||
+        STRING_LENGTHS.include?(value) ||
+        FRACTION_REGEX.match?(value) ||
         IS_ARBITRARY_LENGTH.call(value)
     }
 

data/lib/tailwind_merge/version.rb

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

data/lib/tailwind_merge.rb

@@ -49,11 +49,31 @@ module TailwindMerge
       class_groups_in_conflict = Set.new
 
       classes.strip.split(SPLIT_CLASSES_REGEX).map do |original_class_name|
-        modifiers, has_important_modifier, base_class_name = split_modifiers(original_class_name, separator: @config[:separator])
+        modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position = split_modifiers(original_class_name, separator: @config[:separator])
 
-        class_group_id = @class_utils.class_group_id(base_class_name)
+        actual_base_class_name = maybe_postfix_modifier_position ? base_class_name[0...maybe_postfix_modifier_position] : base_class_name
+        class_group_id = @class_utils.class_group_id(actual_base_class_name)
 
         unless class_group_id
+          unless maybe_postfix_modifier_position
+            next {
+              is_tailwind_class: false,
+              original_class_name: original_class_name,
+            }
+          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,
+            }
+
+          end
+
+          has_postfix_modifier = false
+
           next {
             is_tailwind_class: false,
             original_class_name: original_class_name,
@@ -69,6 +89,7 @@ module TailwindMerge
           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|
@@ -76,6 +97,7 @@ module TailwindMerge
 
         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}"
 
@@ -83,7 +105,7 @@ module TailwindMerge
 
         class_groups_in_conflict.add(class_id)
 
-        @class_utils.get_conflicting_class_group_ids(class_group_id).each do |group|
+        @class_utils.get_conflicting_class_group_ids(class_group_id, has_postfix_modifier).each do |group|
           class_groups_in_conflict.add("#{modifier_id}#{group}")
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1.2
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -24,6 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style