tailwind_merge 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aadbe94d7d509ee795a2b34277fa7195f443d83081d2adaf88a11c07d2918302
-  data.tar.gz: a6b99aea1b699341b88d7052f7e7c6b588326d74decca79a3c0caaf256042107
+  metadata.gz: 0c8e3fe7605ec55fd88225d16bcc919092e3710a81ee581ded2fa09e0bb06013
+  data.tar.gz: 71053feef40855a9f240bf7e9e32945239adcb36206b570e137fc6ec99d2044f
 SHA512:
-  metadata.gz: bfadf225da1834890e98ee7b89202db8714b954c8cc077ad33eabdc1731f5617c85747aa1cd8641d659ea45b95f61b8ea9e0c00d1b852d3cc4b99ae4210850f4
-  data.tar.gz: c5b300134da62796aaa0697e7ad341bd223139cb07a5b51a556de469692271c2750ad52d1c1ec032968dcc50f295c4e68d5c7ef502c81452ab0b4ec23baf214d
+  metadata.gz: 643732e00316338a5fbf76e146eceed8dfead1bf5aa779c01766778e345824068014632a30096b0ea14a4a2fe17a65d6a0f1dd4900d65e524cf3e32f165b4419
+  data.tar.gz: 5e7f29df21553b91c046b57781006a7673f06b24a29718a17aaca6ebe98b851f0481eaebb46299a8756d4aec823a82ee1844d31715d258ea783b5958699422bd

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.5.4](https://github.com/gjtorikian/tailwind_merge/compare/v1.5.3...v1.5.4) (2026-08-13)
+
+### Bug Fixes
+
+* **config:** axis shorthands override logical sides ([#87](https://github.com/gjtorikian/tailwind_merge/pull/87))
+
+
+## [1.5.3](https://github.com/gjtorikian/tailwind_merge/compare/v1.5.2...v1.5.3) (2026-08-11)
+
+### Bug Fixes
+
+* **config:** classify shadow-inner into the shadow class group ([99bccc2](https://github.com/gjtorikian/tailwind_merge/commit/99bccc2b66d5a6e94735515676102534a3f29e37))
+
+### Performance Improvements
+
+* **parse:** skip modifiers array alloc for no-modifier classes ([0ee620e](https://github.com/gjtorikian/tailwind_merge/commit/0ee620e7e464074fb490fd363afaa5b404a4faf4))
+
+### Miscellaneous Chores
+
+* trigger release-please run ([65e80ae](https://github.com/gjtorikian/tailwind_merge/commit/65e80ae41d08e813c0d6ce9317aa235454bfc935))
+* **config:** deep-freeze DEFAULTS to prevent global-state mutation ([9bf4778](https://github.com/gjtorikian/tailwind_merge/commit/9bf47789b778b4d1e0503e9b69ce30d407826483))
+
+
 # [v1.5.2] - 06-07-2026
 ## What's Changed
 * fix: thread-safety of Merger's internal LRU cache by @svyatov in https://github.com/gjtorikian/tailwind_merge/pull/79

data/lib/tailwind_merge/config.rb

@@ -6,6 +6,19 @@ module TailwindMerge
   module Config
     include Validators
 
+    class << self
+      # Recursively freezes nested Hash/Array structures so shared config
+      # constants can't be mutated in place. Keys are strings/symbols and are
+      # already immutable, so only values need walking.
+      private def deep_freeze(object)
+        case object
+        when Hash then object.each_value { |value| deep_freeze(value) }
+        when Array then object.each { |value| deep_freeze(value) }
+        end
+        object.freeze
+      end
+    end
+
     THEME_KEYS = [
       "color",
       "font",
@@ -1432,6 +1445,8 @@ module TailwindMerge
             "shadow" => [
               # Deprecated since Tailwind CSS v4.0.0
               "",
+              # Deprecated since Tailwind CSS v4.0.0
+              "inner",
               "none",
               THEME_SHADOW,
               IS_ARBITRARY_VARIABLE_SHADOW,
@@ -2312,16 +2327,16 @@ module TailwindMerge
         "overflow" => ["overflow-x", "overflow-y"],
         "overscroll" => ["overscroll-x", "overscroll-y"],
         "inset" => ["inset-x", "inset-y", "start", "end", "inset-bs", "inset-be", "top", "right", "bottom", "left"],
-        "inset-x" => ["right", "left"],
-        "inset-y" => ["top", "bottom"],
+        "inset-x" => ["start", "end", "right", "left"],
+        "inset-y" => ["inset-bs", "inset-be", "top", "bottom"],
         "flex" => ["basis", "grow", "shrink"],
         "gap" => ["gap-x", "gap-y"],
         "p" => ["px", "py", "ps", "pe", "pbs", "pbe", "pt", "pr", "pb", "pl"],
-        "px" => ["pr", "pl"],
-        "py" => ["pt", "pb"],
+        "px" => ["ps", "pe", "pr", "pl"],
+        "py" => ["pbs", "pbe", "pt", "pb"],
         "m" => ["mx", "my", "ms", "me", "mbs", "mbe", "mt", "mr", "mb", "ml"],
-        "mx" => ["mr", "ml"],
-        "my" => ["mt", "mb"],
+        "mx" => ["ms", "me", "mr", "ml"],
+        "my" => ["mbs", "mbe", "mt", "mb"],
         "size" => ["w", "h"],
         "font-size" => ["leading"],
         "fvn-normal" => [
@@ -2372,8 +2387,8 @@ module TailwindMerge
           "border-w-b",
           "border-w-l",
         ],
-        "border-w-x" => ["border-w-r", "border-w-l"],
-        "border-w-y" => ["border-w-t", "border-w-b"],
+        "border-w-x" => ["border-w-s", "border-w-e", "border-w-r", "border-w-l"],
+        "border-w-y" => ["border-w-bs", "border-w-be", "border-w-t", "border-w-b"],
         "border-color" => [
           "border-color-x",
           "border-color-y",
@@ -2386,8 +2401,8 @@ module TailwindMerge
           "border-color-b",
           "border-color-l",
         ],
-        "border-color-x" => ["border-color-r", "border-color-l"],
-        "border-color-y" => ["border-color-t", "border-color-b"],
+        "border-color-x" => ["border-color-s", "border-color-e", "border-color-r", "border-color-l"],
+        "border-color-y" => ["border-color-bs", "border-color-be", "border-color-t", "border-color-b"],
         "translate" => ["translate-x", "translate-y", "translate-none"],
         "translate-none" => ["translate", "translate-x", "translate-y", "translate-z"],
         "scroll-m" => [
@@ -2402,8 +2417,8 @@ module TailwindMerge
           "scroll-mb",
           "scroll-ml",
         ],
-        "scroll-mx" => ["scroll-mr", "scroll-ml"],
-        "scroll-my" => ["scroll-mt", "scroll-mb"],
+        "scroll-mx" => ["scroll-ms", "scroll-me", "scroll-mr", "scroll-ml"],
+        "scroll-my" => ["scroll-mbs", "scroll-mbe", "scroll-mt", "scroll-mb"],
         "scroll-p" => [
           "scroll-px",
           "scroll-py",
@@ -2416,8 +2431,8 @@ module TailwindMerge
           "scroll-pb",
           "scroll-pl",
         ],
-        "scroll-px" => ["scroll-pr", "scroll-pl"],
-        "scroll-py" => ["scroll-pt", "scroll-pb"],
+        "scroll-px" => ["scroll-ps", "scroll-pe", "scroll-pr", "scroll-pl"],
+        "scroll-py" => ["scroll-pbs", "scroll-pbe", "scroll-pt", "scroll-pb"],
         "touch" => ["touch-x", "touch-y", "touch-pz"],
         "touch-x" => ["touch"],
         "touch-y" => ["touch"],
@@ -2441,7 +2456,8 @@ module TailwindMerge
         "placeholder",
         "selection",
       ],
-    }.freeze
+    }
+    deep_freeze(DEFAULTS)
 
     def merge_config(incoming_config)
       extended_config = TailwindMerge::Config::DEFAULTS.dup

data/lib/tailwind_merge/parse_class_name.rb

@@ -6,6 +6,7 @@ module TailwindMerge
 
   module ParseClassName
     IMPORTANT_MODIFIER = "!"
+    EMPTY_MODIFIERS = [].freeze
     MODIFIER_SEPARATOR = ":"
     MODIFIER_SEPARATOR_LENGTH = MODIFIER_SEPARATOR.length
 
@@ -29,7 +30,7 @@ module TailwindMerge
         else
           return TailwindClass.new(
             is_external: true,
-            modifiers: [],
+            modifiers: EMPTY_MODIFIERS,
             has_important_modifier: false,
             base_class_name: class_name,
             maybe_postfix_modifier_position: nil,
@@ -37,7 +38,9 @@ module TailwindMerge
         end
       end
 
-      modifiers = []
+      # Stays nil until the first modifier separator, so the common no-modifier
+      # class (`px-2`, `block`) never allocates an array.
+      modifiers = nil
 
       bracket_depth = 0
       paren_depth = 0
@@ -55,7 +58,7 @@ module TailwindMerge
 
         if bracket_depth.zero? && paren_depth.zero?
           if byte == MODIFIER_SEPARATOR_BYTE
-            modifiers << class_name.byteslice(modifier_start, index - modifier_start)
+            (modifiers ||= []) << class_name.byteslice(modifier_start, index - modifier_start)
             modifier_start = index + MODIFIER_SEPARATOR_LENGTH
             index += 1
             next
@@ -76,7 +79,7 @@ module TailwindMerge
         index += 1
       end
 
-      base_class_name_with_important_modifier = modifiers.empty? ? class_name : class_name.byteslice(modifier_start, size - modifier_start)
+      base_class_name_with_important_modifier = modifiers ? class_name.byteslice(modifier_start, size - modifier_start) : class_name
 
       base_class_name, has_important_modifier = strip_important_modifier(base_class_name_with_important_modifier)
 
@@ -86,7 +89,7 @@ module TailwindMerge
 
       TailwindClass.new(
         is_external: false,
-        modifiers:,
+        modifiers: modifiers || EMPTY_MODIFIERS,
         has_important_modifier:,
         base_class_name: base_class_name,
         maybe_postfix_modifier_position:,

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Garen J. Torikian
@@ -74,15 +74,15 @@ files:
 - lib/tailwind_merge/version.rb
 - script/test
 - tailwind_merge.gemspec
-homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.2
+homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.4
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.2
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.2
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.2/CHANGELOG.md
+  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.4
+  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.4
+  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
-  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.2
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.4
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 rdoc_options: []