RubyGems - tailwind_merge - Versions diffs - 1.3.3 → 1.4.0 - Mend

tailwind_merge 1.3.3 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +6 -0
data/lib/tailwind_merge/config.rb +140 -5
data/lib/tailwind_merge/validators.rb +1 -1
data/lib/tailwind_merge/version.rb +1 -1
metadata +6 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783e008ab85c57a6d835bcd2c2aeb0bf1c3ee97706a42673dc89a798534295a1
-  data.tar.gz: 48641de285e39bee44cde99ecc9977edea9da0541358d308cf6d28e53bb5ab48
+  metadata.gz: c92f465b5aa6ea57a71afc60b37c61b05986667919ff88754a97b846921e191c
+  data.tar.gz: e83db43c20ac8b867dd8c2dfb0450c6e5a5de3a6c03dc37563bc787b4f71f0e3
 SHA512:
-  metadata.gz: e1b4bbf12cc96c9480ebe0313569a1938ef210b8df82e42253e7edba1c9657923bc03eb874152dac5a910b2f3f7d8ca5731cc01826ab3373097b54652a89d5e9
-  data.tar.gz: 27d39e9beaad0731d1a64cdcc0d0831c9f29b5dd36c949e0a667fc6de4ca3759ff0202875a94c1be5ae1955c1da714f2c2ee1dab2f62c961ddb142ad02ae1b4e
+  metadata.gz: 3ab5af9395abec32b81c841db1e2a5a54b6b96456167fae54d5792264cb2effcc3605ab1ee3a33ca84e45262267839ff70846caf09786aab284e5cdfda330fc8
+  data.tar.gz: e91081abf6c23662126192a2c2431497bbcda86e95bd25be166ecde54fa2a447cf664300d190af4e424cb1af1428e086730aba557fc826e6d71b77d10a83293e

data/CHANGELOG.md CHANGED Viewed

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

data/lib/tailwind_merge/config.rb CHANGED Viewed

@@ -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
         ##
@@ -801,6 +884,10 @@ module TailwindMerge
         ##
         "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 CHANGED Viewed

@@ -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)\(.+\)$/

data/lib/tailwind_merge/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Garen J. Torikian
@@ -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.3
+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.3
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.3.3
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.3.3/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.3
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.4.0
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 rdoc_options: []