tailwind_merge 0.12.2 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd029b3106698874b67142336e597f9369c92664531879ad22eedd0cba6645b
-  data.tar.gz: 5389d8adf19d10d5f4edd08bff8cfd94f23e8ce65f6893400b0a8416de629faa
+  metadata.gz: 3d9510eb868ab28e1293dd1e1ff8d4beab6753b4ce2d6be928df305293b61fbe
+  data.tar.gz: e7c146b9e58a58e5cef2a5826cf3a88b01ee7722326a8c778dccfc7c820cb75a
 SHA512:
-  metadata.gz: 2236d20be8ac16e9fb1ee61682c00d8cc00a8102a1f12ef6ab2d56bd9829a041feb08e5448ebcf09e7940a43b3d6ca512ce0f381bdd006275302167c245700b1
-  data.tar.gz: aa34f52e7f697c8b1c01d3bead20a4868393f054dfbf9dbb7595d842d3883c26c23e1039dc6b14cd309671b198f6751181465478f246f5b609acf628694de861
+  metadata.gz: acbefd880e9a661e85cbc2effc55675f13472b02b54d4d434b3baa80139473145ca7ac01bb2c666b9e3cdef9c58f8ba1c5ee8fe3254a5a57931efecf860081c7
+  data.tar.gz: 2988a83311e3a6779e9b91a350f2245a5d2c0a4f721170455962575223fe3ac53a46a62a45f7301b265e36cbce2f5ebe705fd96dceb7d71d27826eed62491bc8

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v0.13.1] - 03-10-2024
+## What's Changed
+* Add missing logical border color properties by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/34
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.13.0...v0.13.1
+# [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

data/README.md

@@ -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") }
@@ -1134,6 +1134,16 @@ module TailwindMerge
         ##
         "border-color-y" => [{ "border-y" => [BORDER_COLOR] }],
         ##
+        # Border Color S
+        # @see https://tailwindcss.com/docs/border-color
+        ##
+        "border-color-s" => [{ "border-s" => [BORDER_COLOR] }],
+        ##
+        # Border Color E
+        # @see https://tailwindcss.com/docs/border-color
+        ##
+        "border-color-e" => [{ "border-e" => [BORDER_COLOR] }],
+        ##
         # Border Color Top
         # @see https://tailwindcss.com/docs/border-color
         ##
@@ -1796,6 +1806,8 @@ module TailwindMerge
         "border-w-x" => ["border-w-r", "border-w-l"],
         "border-w-y" => ["border-w-t", "border-w-b"],
         "border-color" => [
+          "border-color-s",
+          "border-color-e",
           "border-color-t",
           "border-color-r",
           "border-color-b",
@@ -1840,10 +1852,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.2"
+  VERSION = "0.13.1"
 end

metadata

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