tailwind_merge 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059b8e52b3a7bc182e6cae5db2a2c8dee46aa1d1176b6b7d26dd7f2313f566cc'
-  data.tar.gz: c94346250084798c59da34357f9e16acc058943eb5e64f759f87b06701adac7c
+  metadata.gz: 0c8e3fe7605ec55fd88225d16bcc919092e3710a81ee581ded2fa09e0bb06013
+  data.tar.gz: 71053feef40855a9f240bf7e9e32945239adcb36206b570e137fc6ec99d2044f
 SHA512:
-  metadata.gz: 61dc28329c357f7b1bb060b499c56d6d419672f2ccade9a3cb8442ae1c77da2f3c9c9526894c836294ef6128a78041adbd1b0c291b9c6b7fa33ef34b527400f1
-  data.tar.gz: 76ea9d360488b4945ce4b2a3ac642fdd20a0cd0eee20b85a3baec2f363ce3dcddbbd3dc9a6be2f7207d30a5776aeff328df792b742770e5b2d1c63867a076eac
+  metadata.gz: 643732e00316338a5fbf76e146eceed8dfead1bf5aa779c01766778e345824068014632a30096b0ea14a4a2fe17a65d6a0f1dd4900d65e524cf3e32f165b4419
+  data.tar.gz: 5e7f29df21553b91c046b57781006a7673f06b24a29718a17aaca6ebe98b851f0481eaebb46299a8756d4aec823a82ee1844d31715d258ea783b5958699422bd

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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

data/lib/tailwind_merge/config.rb

@@ -2327,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" => [
@@ -2387,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",
@@ -2401,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" => [
@@ -2417,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",
@@ -2431,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"],

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "1.5.3"
+  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.3
+  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.3
+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.3
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.3
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.3/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.3
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.4
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 rdoc_options: []