tailwind_merge 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68866007d409f90232114a3954cc9df8b852bf8cabaf719c778cb5074ff4ee9
-  data.tar.gz: d8c11eccbfb6fccfc78d03f7d7e5c0aba582b8cae3d37da4978a4d3b3ca8186f
+  metadata.gz: c92f465b5aa6ea57a71afc60b37c61b05986667919ff88754a97b846921e191c
+  data.tar.gz: e83db43c20ac8b867dd8c2dfb0450c6e5a5de3a6c03dc37563bc787b4f71f0e3
 SHA512:
-  metadata.gz: e2a806dee8941c3a6e203cc57c7c72245bdd6402b08859e6575fb7dc3626a56a16caf78252c363adc31e241ef0b796e5eab97f87392838ba7361862695e5da61
-  data.tar.gz: 00154a1c2915432a42eb6cd2e26fc23b0159a1e78e1e5fbaa86bc16c9db3130527f1d278d6a6207c36f1765fd736c78656214a07ec25ef0bbb026cf550aa7617
+  metadata.gz: 3ab5af9395abec32b81c841db1e2a5a54b6b96456167fae54d5792264cb2effcc3605ab1ee3a33ca84e45262267839ff70846caf09786aab284e5cdfda330fc8
+  data.tar.gz: e91081abf6c23662126192a2c2431497bbcda86e95bd25be166ecde54fa2a447cf664300d190af4e424cb1af1428e086730aba557fc826e6d71b77d10a83293e

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v1.4.0] - 22-02-2026
+## What's Changed
+* Support Tailwind v4.2 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/73
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.3.3...v1.4.0
+# [v1.3.3] - 31-01-2026
+## What's Changed
+* Update minitest requirement from ~> 5.6 to ~> 6.0 in the bundler-dependencies group by @dependabot[bot] in https://github.com/gjtorikian/tailwind_merge/pull/70
+* prevent arbitrary font-family and font-weight from merging by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/71
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.3.2...v1.3.3
 # [v1.3.2] - 26-12-2025
 ## What's Changed
 * Bump actions/checkout from 4 to 5 by @dependabot[bot] in https://github.com/gjtorikian/tailwind_merge/pull/64

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "minitest", "~> 5.0"
+gem "minitest", "~> 6.0"
 
 gem "rubocop", "~> 1.21"
 

data/lib/tailwind_merge/config.rb

@@ -102,6 +102,35 @@ module TailwindMerge
         *SCALE_UNAMBIGUOUS_SPACING.call,
       ]
     }
+    SCALE_SIZING_INLINE = -> {
+      [
+        IS_FRACTION,
+        "screen",
+        "full",
+        "dvw",
+        "lvw",
+        "svw",
+        "min",
+        "max",
+        "fit",
+        *SCALE_UNAMBIGUOUS_SPACING.call,
+      ]
+    }
+    SCALE_SIZING_BLOCK = -> {
+      [
+        IS_FRACTION,
+        "screen",
+        "full",
+        "lh",
+        "dvh",
+        "lvh",
+        "svh",
+        "min",
+        "max",
+        "fit",
+        *SCALE_UNAMBIGUOUS_SPACING.call,
+      ]
+    }
     SCALE_COLOR = -> { [THEME_COLOR, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
     SCALE_BG_POSITION = -> { [*SCALE_POSITION.call, IS_ARBITRARY_VARIABLE_POSITION, IS_ARBITRARY_POSITION, "position" => [IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE]] }
     SCALE_BG_REPEAT = -> { ["no-repeat", "repeat" => ["", "x", "y", "space", "round"]] }
@@ -359,12 +388,22 @@ module TailwindMerge
         # Start
         # @see https://tailwindcss.com/docs/top-right-bottom-left
         #
-        "start" => [{ "start" => [SCALE_INSET] }],
+        "start" => [{ "inset-s" => [SCALE_INSET], "start" => [SCALE_INSET] }],
         #
         # End
         # @see https://tailwindcss.com/docs/top-right-bottom-left
         #
-        "end" => [{ "end" => [SCALE_INSET] }],
+        "end" => [{ "inset-e" => [SCALE_INSET], "end" => [SCALE_INSET] }],
+        #
+        # Inset Block Start
+        # @see https://tailwindcss.com/docs/top-right-bottom-left
+        #
+        "inset-bs" => [{ "inset-bs" => [SCALE_INSET] }],
+        #
+        # Inset Block End
+        # @see https://tailwindcss.com/docs/top-right-bottom-left
+        #
+        "inset-be" => [{ "inset-be" => [SCALE_INSET] }],
         ##
         # Top
         # @see https://tailwindcss.com/docs/top-right-bottom-left
@@ -593,6 +632,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/padding
         #
         "pe" => [{ "pe" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Padding Block Start
+        # @see https://tailwindcss.com/docs/padding
+        #
+        "pbs" => [{ "pbs" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Padding Block End
+        # @see https://tailwindcss.com/docs/padding
+        #
+        "pbe" => [{ "pbe" => SCALE_UNAMBIGUOUS_SPACING.call }],
         ##
         # Padding Top
         # @see https://tailwindcss.com/docs/padding
@@ -638,6 +687,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/margin
         #
         "me" => [{ "me" => SCALE_MARGIN.call  }],
+        #
+        # Margin Block Start
+        # @see https://tailwindcss.com/docs/margin
+        #
+        "mbs" => [{ "mbs" => SCALE_MARGIN.call }],
+        #
+        # Margin Block End
+        # @see https://tailwindcss.com/docs/margin
+        #
+        "mbe" => [{ "mbe" => SCALE_MARGIN.call }],
         ##
         # Margin Top
         # @see https://tailwindcss.com/docs/margin
@@ -688,6 +747,30 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/width#setting-both-width-and-height
         ##
         "size" => [{ "size" => SCALE_SIZING.call }],
+        ##
+        # Inline Size
+        ##
+        "inline-size" => [{ "inline" => ["auto", *SCALE_SIZING_INLINE.call] }],
+        ##
+        # Min Inline Size
+        ##
+        "min-inline-size" => [{ "min-inline" => ["auto", *SCALE_SIZING_INLINE.call] }],
+        ##
+        # Max Inline Size
+        ##
+        "max-inline-size" => [{ "max-inline" => ["none", *SCALE_SIZING_INLINE.call] }],
+        ##
+        # Block Size
+        ##
+        "block-size" => [{ "block" => ["auto", *SCALE_SIZING_BLOCK.call] }],
+        ##
+        # Min Block Size
+        ##
+        "min-block-size" => [{ "min-block" => ["auto", *SCALE_SIZING_BLOCK.call] }],
+        ##
+        # Max Block Size
+        ##
+        "max-block-size" => [{ "max-block" => ["none", *SCALE_SIZING_BLOCK.call] }],
         # Width
         # @see https://tailwindcss.com/docs/width
         ##
@@ -769,8 +852,8 @@ module TailwindMerge
           {
             "font" => [
               THEME_FONT_WEIGHT,
-              IS_ARBITRARY_VARIABLE,
-              IS_ARBITRARY_NUMBER,
+              IS_ARBITRARY_VARIABLE_WEIGHT,
+              IS_ARBITRARY_WEIGHT,
             ],
           },
         ],
@@ -799,7 +882,11 @@ module TailwindMerge
         # Font Family
         # @see https://tailwindcss.com/docs/font-family
         ##
-        "font-family" => [{ "font" => [IS_ARBITRARY_VARIABLE_FAMILY_NAME, IS_ARBITRARY_VALUE, THEME_FONT] }],
+        "font-family" => [{ "font" => [IS_ARBITRARY_VARIABLE_FAMILY_NAME, IS_ARBITRARY_FAMILY_NAME, THEME_FONT] }],
+        ##
+        # Font Feature Settings
+        ##
+        "font-features" => [{ "font-features" => [IS_ARBITRARY_VALUE] }],
         ##
         # Font Variant Numeric
         # @see https://tailwindcss.com/docs/font-variant-numeric
@@ -1173,6 +1260,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/border-width
         #
         "border-w-e" => [{ "border-e" => SCALE_BORDER_WIDTH.call }],
+        #
+        # Border Width Block Start
+        # @see https://tailwindcss.com/docs/border-width
+        #
+        "border-w-bs" => [{ "border-bs" => SCALE_BORDER_WIDTH.call }],
+        #
+        # Border Width Block End
+        # @see https://tailwindcss.com/docs/border-width
+        #
+        "border-w-be" => [{ "border-be" => SCALE_BORDER_WIDTH.call }],
         ##
         # Border Width Top
         # @see https://tailwindcss.com/docs/border-width
@@ -1249,6 +1346,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/border-color
         ##
         "border-color-e" => [{ "border-e" => SCALE_COLOR.call }],
+        #
+        # Border Color Block Start
+        # @see https://tailwindcss.com/docs/border-color
+        #
+        "border-color-bs" => [{ "border-bs" => SCALE_COLOR.call }],
+        #
+        # Border Color Block End
+        # @see https://tailwindcss.com/docs/border-color
+        #
+        "border-color-be" => [{ "border-be" => SCALE_COLOR.call }],
         ##
         # Border Color Top
         # @see https://tailwindcss.com/docs/border-color
@@ -1978,6 +2085,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/scroll-margin
         #
         "scroll-me" => [{ "scroll-me" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Scroll Margin Block Start
+        # @see https://tailwindcss.com/docs/scroll-margin
+        #
+        "scroll-mbs" => [{ "scroll-mbs" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Scroll Margin Block End
+        # @see https://tailwindcss.com/docs/scroll-margin
+        #
+        "scroll-mbe" => [{ "scroll-mbe" => SCALE_UNAMBIGUOUS_SPACING.call }],
         ##
         # Scroll Margin Top
         # @see https://tailwindcss.com/docs/scroll-margin
@@ -2023,6 +2140,16 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/scroll-padding
         #
         "scroll-pe" => [{ "scroll-pe" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Scroll Padding Block Start
+        # @see https://tailwindcss.com/docs/scroll-padding
+        #
+        "scroll-pbs" => [{ "scroll-pbs" => SCALE_UNAMBIGUOUS_SPACING.call }],
+        #
+        # Scroll Padding Block End
+        # @see https://tailwindcss.com/docs/scroll-padding
+        #
+        "scroll-pbe" => [{ "scroll-pbe" => SCALE_UNAMBIGUOUS_SPACING.call }],
         ##
         # Scroll Padding Top
         # @see https://tailwindcss.com/docs/scroll-padding
@@ -2141,15 +2268,15 @@ module TailwindMerge
       conflicting_class_groups: {
         "overflow" => ["overflow-x", "overflow-y"],
         "overscroll" => ["overscroll-x", "overscroll-y"],
-        "inset" => ["inset-x", "inset-y", "start", "end", "top", "right", "bottom", "left"],
+        "inset" => ["inset-x", "inset-y", "start", "end", "inset-bs", "inset-be", "top", "right", "bottom", "left"],
         "inset-x" => ["right", "left"],
         "inset-y" => ["top", "bottom"],
         "flex" => ["basis", "grow", "shrink"],
         "gap" => ["gap-x", "gap-y"],
-        "p" => ["px", "py", "ps", "pe", "pt", "pr", "pb", "pl"],
+        "p" => ["px", "py", "ps", "pe", "pbs", "pbe", "pt", "pr", "pb", "pl"],
         "px" => ["pr", "pl"],
         "py" => ["pt", "pb"],
-        "m" => ["mx", "my", "ms", "me", "mt", "mr", "mb", "ml"],
+        "m" => ["mx", "my", "ms", "me", "mbs", "mbe", "mt", "mr", "mb", "ml"],
         "mx" => ["mr", "ml"],
         "my" => ["mt", "mb"],
         "size" => ["w", "h"],
@@ -2195,6 +2322,8 @@ module TailwindMerge
           "border-w-y",
           "border-w-s",
           "border-w-e",
+          "border-w-bs",
+          "border-w-be",
           "border-w-t",
           "border-w-r",
           "border-w-b",
@@ -2207,6 +2336,8 @@ module TailwindMerge
           "border-color-y",
           "border-color-s",
           "border-color-e",
+          "border-color-bs",
+          "border-color-be",
           "border-color-t",
           "border-color-r",
           "border-color-b",
@@ -2221,6 +2352,8 @@ module TailwindMerge
           "scroll-my",
           "scroll-ms",
           "scroll-me",
+          "scroll-mbs",
+          "scroll-mbe",
           "scroll-mt",
           "scroll-mr",
           "scroll-mb",
@@ -2233,6 +2366,8 @@ module TailwindMerge
           "scroll-py",
           "scroll-ps",
           "scroll-pe",
+          "scroll-pbs",
+          "scroll-pbe",
           "scroll-pt",
           "scroll-pr",
           "scroll-pb",

data/lib/tailwind_merge/validators.rb

@@ -34,7 +34,7 @@ module TailwindMerge
 
     ARBITRARY_VALUE_REGEX = /^\[(?:(\w[\w-]*):)?(.+)\]$/i
     ARBITRARY_VARIABLE_REGEX = /^\((?:(\w[\w-]*):)?(.+)\)$/i
-    FRACTION_REGEX = %r{^\d+/\d+$}
+    FRACTION_REGEX = %r{^\d+(?:\.\d+)?/\d+(?:\.\d+)?$}
     TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
     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))|\b(calc|min|max|clamp)\(.+\)|^0$/
     COLOR_FUNCTION_REGEX = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix)\(.+\)$/
@@ -102,6 +102,14 @@ module TailwindMerge
       arbitrary_value?(value, IS_LABEL_NUMBER, IS_NUMBER)
     }
 
+    IS_ARBITRARY_WEIGHT = ->(value) {
+      arbitrary_value?(value, IS_LABEL_WEIGHT, IS_ANY)
+    }
+
+    IS_ARBITRARY_FAMILY_NAME = ->(value) {
+      arbitrary_value?(value, IS_LABEL_FAMILY_NAME, IS_NEVER)
+    }
+
     IS_ARBITRARY_POSITION = ->(value) {
       arbitrary_value?(value, IS_LABEL_POSITION, IS_NEVER)
     }
@@ -142,6 +150,10 @@ module TailwindMerge
       arbitrary_variable?(value, IS_LABEL_SHADOW, should_match_no_label: true)
     }
 
+    IS_ARBITRARY_VARIABLE_WEIGHT = ->(value) {
+      arbitrary_variable?(value, IS_LABEL_WEIGHT, should_match_no_label: true)
+    }
+
     ############
     # Labels
     ############
@@ -170,6 +182,10 @@ module TailwindMerge
       label == "family-name"
     }
 
+    IS_LABEL_WEIGHT = ->(label) {
+      label == "number" || label == "weight"
+    }
+
     IS_LABEL_SHADOW = ->(label) {
       label == "shadow"
     }

data/lib/tailwind_merge/version.rb

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

data/tailwind_merge.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
     "rubygems_mfa_required" => "true",
   }
 
+  spec.required_ruby_version = [">= 3.2"]
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(__dir__) do
@@ -35,6 +37,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("sin_lru_redux", "~> 2.5")
 
-  spec.add_development_dependency("minitest", "~> 5.6")
+  spec.add_development_dependency("minitest", "~> 6.0")
   spec.add_development_dependency("minitest-focus", "~> 1.1")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Garen J. Torikian
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -73,15 +73,15 @@ files:
 - lib/tailwind_merge/version.rb
 - script/test
 - tailwind_merge.gemspec
-homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.2
+homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.2
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.2
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.3.2/CHANGELOG.md
+  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
+  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.4.0
+  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.4.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
-  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.3.2
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.4.0
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="