tailwind_merge 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 991c169d4f9e2e472db150202e1a6c523a7f4698ef04d576557d0bfd25ffef0e
-  data.tar.gz: f7f0e832b00f4dfbcb61e1460a53f80d2c438354a412c953f7ab3a59a78d9fdd
+  metadata.gz: 8ceeee90371decde955283bda7c8fd9a7199fee27df0e6be6668ac1c2b61b441
+  data.tar.gz: 824a08e451eb452722483e18bc9e24b7eacefd0627bc3e6ecc3a8aa2655a5f5f
 SHA512:
-  metadata.gz: 2d431e7225fb7720d7ef50f4998820f8be9c84c5944b686005f78ef90a27895552c98ae39f4e9093c8bb90f1577cac4dc3a4d9483badb6b8b04088df7b00a611
-  data.tar.gz: 996fe4b3bdf0bb8a8a4ddf2b3f9cf6c950879c38bac9ec39bfc4e6b65913f2f48764fc6923e625e0aefcdfcab985556e805dc0ff41f3381766be5c3d9a8d59df
+  metadata.gz: 77fee0fb6c3e17c2c9bed2c47f7996716dc36e042c01cffc5c68a1e1d80ae18aa78339ff0522527b6bf53899a06dd7efeea133640954d42c7c2b5a49778149ce
+  data.tar.gz: ae13784b989a225eb436ca40565dc8a022366229b7a97c58c2135b328392fa12ed29c0ce8dc3af4b222858149dc68b0bba310e983f19a897e814dcc24a6cb576

data/.rubocop.yml

@@ -2,3 +2,6 @@ inherit_gem:
   rubocop-standard:
     - config/default.yml
     - config/minitest.yml
+
+Metrics/CollectionLiteralLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# [v1.2.0] - 07-04-2025
+## What's Changed
+* Support TailwindCSS v4.1 by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/58
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.1.1...v1.2.0
+# [v1.1.1] - 01-04-2025
+## What's Changed
+* fix length variable not being detected via classes by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/56
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.1.0...v1.1.1
+# [v1.1.0] - 10-03-2025
+## What's Changed
+* Add  and utilities for grid-column and grid-row  by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/54
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.0.0...v1.1.0
 # [v1.0.0] - 25-02-2025
 ## What's Changed
 * Add matrix to test CI by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/47

data/lib/tailwind_merge/config.rb

@@ -19,6 +19,7 @@ module TailwindMerge
       "radius",
       "shadow",
       "inset-shadow",
+      "text-shadow",
       "drop-shadow",
       "blur",
       "perspective",
@@ -37,17 +38,26 @@ module TailwindMerge
     SCALE_BREAK = -> { ["auto", "avoid", "all", "avoid-page", "page", "left", "right", "column"] }
     SCALE_POSITION = -> {
       [
-        "bottom",
         "center",
+        "top",
+        "bottom",
         "left",
-        "left-bottom",
-        "left-top",
         "right",
-        "right-bottom",
+        "top-left",
+        # Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+        "left-top",
+        "top-right",
+        # Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
         "right-top",
-        "top",
+        "bottom-right",
+        # Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+        "right-bottom",
+        "bottom-left",
+        # Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+        "left-bottom",
       ]
     }
+    SCALE_POSITION_WITH_ARBITRARY = -> { [*SCALE_POSITION.call, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
     SCALE_OVERFLOW = -> { ["auto", "hidden", "clip", "visible", "scroll"] }
     SCALE_OVERSCROLL = -> { ["auto", "contain", "none"] }
     SCALE_UNAMBIGUOUS_SPACING = -> { [IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE, THEME_SPACING] }
@@ -65,14 +75,15 @@ module TailwindMerge
       [
         "auto",
         { "span" => ["full", IS_INTEGER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] },
+        IS_INTEGER,
         IS_ARBITRARY_VARIABLE,
         IS_ARBITRARY_VALUE,
       ]
     }
     SCALE_GRID_COL_ROW_START_OR_END = -> { [IS_INTEGER, "auto", IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
     SCALE_GRID_AUTO_COLS_ROWS = -> { ["auto", "min", "max", "fr", IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
-    SCALE_ALIGN_PRIMARY_AXIS = -> { ["start", "end", "center", "between", "around", "evenly", "stretch", "baseline"] }
-    SCALE_ALIGN_SECONDARY_AXIS = -> { ["start", "end", "center", "stretch"] }
+    SCALE_ALIGN_PRIMARY_AXIS = -> { ["start", "end", "center", "between", "around", "evenly", "stretch", "baseline", "center-safe", "end-sage"] }
+    SCALE_ALIGN_SECONDARY_AXIS = -> { ["start", "end", "center", "stretch", "center-safe", "end-safe"] }
     SCALE_MARGIN = -> { ["auto", *SCALE_UNAMBIGUOUS_SPACING.call] }
     SCALE_SIZING = -> {
       [
@@ -92,7 +103,10 @@ module TailwindMerge
       ]
     }
     SCALE_COLOR = -> { [THEME_COLOR, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
-    SCALE_GRADIENT_STOP_POSITION = -> { [IS_PERCENT, IS_ARBITRARY_LENGTH] }
+    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"]] }
+    SCALE_BG_SIZE = -> { ["auto", "cover", "contain", IS_ARBITRARY_VARIABLE_SIZE, IS_ARBITRARY_SIZE, "size" => [IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE]] }
+    SCALE_GRADIENT_STOP_POSITION = -> { [IS_PERCENT, IS_ARBITRARY_VARIABLE_LENGTH, IS_ARBITRARY_LENGTH] }
     SCALE_RADIUS = -> {
       [
         # Deprecated since Tailwind CSS v4.0.0
@@ -126,6 +140,7 @@ module TailwindMerge
         "luminosity",
       ]
     }
+    SCALE_MASK_IMAGE_POSITION = -> { [IS_NUMBER, IS_PERCENT, IS_ARBITRARY_VARIABLE_POSITION, IS_ARBITRARY_POSITION] }
     SCALE_BLUR = -> {
       [
         "",
@@ -135,21 +150,7 @@ module TailwindMerge
         IS_ARBITRARY_VALUE,
       ]
     }
-    SCALE_ORIGIN = -> {
-      [
-        "center",
-        "top",
-        "top-right",
-        "right",
-        "bottom-right",
-        "bottom",
-        "bottom-left",
-        "left",
-        "top-left",
-        IS_ARBITRARY_VARIABLE,
-        IS_ARBITRARY_VALUE,
-      ]
-    }
+
     SCALE_ROTATE = -> { ["none", IS_NUMBER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
     SCALE_SCALE = -> { ["none", IS_NUMBER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
     SCALE_SKEW = -> { [IS_NUMBER, IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }
@@ -187,9 +188,10 @@ module TailwindMerge
         "shadow" => [IS_TSHIRT_SIZE],
         "spacing" => ["px", IS_NUMBER],
         "text" => [IS_TSHIRT_SIZE],
+        "text-shadow" => [IS_TSHIRT_SIZE],
         "tracking" => ["tighter", "tight", "normal", "wide", "wider", "widest"],
       },
-      class_groups: { # rubocop:disable Metrics/CollectionLiteralLength
+      class_groups: {
         ##########
         # Layout
         ##########
@@ -302,7 +304,7 @@ module TailwindMerge
         # Object Position
         # @see https://tailwindcss.com/docs/object-position
         ##
-        "object-position" => [{ "object" => [*SCALE_POSITION.call, IS_ARBITRARY_VALUE, Validators::IS_ARBITRARY_VARIABLE] }],
+        "object-position" => [{ "object" => SCALE_POSITION_WITH_ARBITRARY.call }],
         ##
         # Overflow
         # @see https://tailwindcss.com/docs/overflow
@@ -544,12 +546,12 @@ module TailwindMerge
         # Align Items
         # @see https://tailwindcss.com/docs/align-items
         ##
-        "align-items" => [{ "items" => [*SCALE_ALIGN_SECONDARY_AXIS.call, "baseline"] }],
+        "align-items" => [{ "items" => [*SCALE_ALIGN_SECONDARY_AXIS.call, "baseline" => ["", "last"]] }],
         ##
         # Align Self
         # @see https://tailwindcss.com/docs/align-self
         ##
-        "align-self" => [{ "self" => ["auto", *SCALE_ALIGN_SECONDARY_AXIS.call, "baseline"] }],
+        "align-self" => [{ "self" => ["auto", *SCALE_ALIGN_SECONDARY_AXIS.call, { "baseline" => ["", "last"] }] }],
         ##
         # Place Content
         # @see https://tailwindcss.com/docs/place-content
@@ -702,7 +704,7 @@ module TailwindMerge
           "min-w" => [
             THEME_CONTAINER,
             "screen",
-            # Deprecated. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+            # Deprecated. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 ##
             "none",
             *SCALE_SIZING.call,
           ],
@@ -717,9 +719,9 @@ module TailwindMerge
               THEME_CONTAINER,
               "screen",
               "none",
-              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 ##
               "prose",
-              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 ##
               { "screen" => [THEME_BREAKPOINT] },
               *SCALE_SIZING.call,
             ],
@@ -849,7 +851,7 @@ module TailwindMerge
         "leading" => [
           {
             "leading" => [
-              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+              # Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 ##
               THEME_LEADING,
               *SCALE_UNAMBIGUOUS_SPACING.call,
             ],
@@ -960,6 +962,11 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/word-break
         ##
         "break" => [{ "break" => ["normal", "words", "all", "keep"] }],
+        ##
+        # Overflow Wrap
+        # @see https://tailwindcss.com/docs/overflow-wrap
+        ##
+        "wrap" => [{ "wrap" => ["break-word", "anywhere", "normal"] }],
         #
         # Hyphens
         # @see https://tailwindcss.com/docs/hyphens
@@ -993,17 +1000,17 @@ module TailwindMerge
         # Background Position
         # @see https://tailwindcss.com/docs/background-position
         ##
-        "bg-position" => [{ "bg" => [*SCALE_POSITION.call, IS_ARBITRARY_VARIABLE_POSITION, IS_ARBITRARY_POSITION] }],
+        "bg-position" => [{ "bg" => SCALE_BG_POSITION.call }],
         ##
         # Background Repeat
         # @see https://tailwindcss.com/docs/background-repeat
         ##
-        "bg-repeat" => [{ "bg" => ["no-repeat", { "repeat" => ["", "x", "y", "space", "round"] }] }],
+        "bg-repeat" => [{ "bg" => SCALE_BG_REPEAT.call }],
         ##
         # Background Size
         # @see https://tailwindcss.com/docs/background-size
         ##
-        "bg-size" => [{ "bg" => ["auto", "cover", "contain", IS_ARBITRARY_VARIABLE_SIZE, IS_ARBITRARY_SIZE] }],
+        "bg-size" => [{ "bg" => SCALE_BG_SIZE.call }],
         ##
         # Background Image
         # @see https://tailwindcss.com/docs/background-image
@@ -1286,7 +1293,7 @@ module TailwindMerge
         # Outline Color
         # @see https://tailwindcss.com/docs/outline-color
         ##
-        "outline-color" => [{ "outline" => [THEME_COLOR] }],
+        "outline-color" => [{ "outline" => SCALE_COLOR.call }],
 
         #########
         # Effects
@@ -1321,9 +1328,9 @@ module TailwindMerge
           {
             "inset-shadow" => [
               "none",
-              IS_ARBITRARY_VARIABLE,
-              IS_ARBITRARY_VALUE,
               THEME_INSET_SHADOW,
+              IS_ARBITRARY_VARIABLE_SHADOW,
+              IS_ARBITRARY_SHADOW,
             ],
           },
         ],
@@ -1372,6 +1379,25 @@ module TailwindMerge
         ##
         "inset-ring-color" => [{ "inset-ring" => SCALE_COLOR.call }],
         ##
+        # Text Shadow
+        # @see https://tailwindcss.com/docs/text-shadow
+        ##
+        "text-shadow" => [
+          {
+            "text-shadow" => [
+              "none",
+              THEME_TEXT_SHADOW,
+              IS_ARBITRARY_VARIABLE_SHADOW,
+              IS_ARBITRARY_SHADOW,
+            ],
+          },
+        ],
+        ##
+        # Text Shadow Color
+        # @see https://tailwindcss.com/docs/text-shadow#setting-the-shadow-color
+        ##
+        "text-shadow-color" => [{ "text-shadow": SCALE_COLOR.call }],
+        ##
         # Opacity
         # @see https://tailwindcss.com/docs/opacity
         ##
@@ -1386,6 +1412,104 @@ module TailwindMerge
         # @see https://tailwindcss.com/docs/background-blend-mode
         ##
         "bg-blend" => [{ "bg-blend" => SCALE_BLEND_MODE.call }],
+        ##
+        # Mask Clip
+        # @see https://tailwindcss.com/docs/mask-clip
+        ##
+        "mask-clip" => [
+          { "mask-clip" => ["border", "padding", "content", "fill", "stroke", "view"] },
+          "mask-no-clip",
+        ],
+        ##
+        # Mask Composite
+        # @see https://tailwindcss.com/docs/mask-composite
+        ##
+        "mask-composite" => [{ "mask" => ["add", "subtract", "intersect", "exclude"] }],
+        ##
+        # Mask Image
+        # @see https://tailwindcss.com/docs/mask-image
+        ##
+        "mask-image-linear-pos" => [{ "mask-linear" => [Validators::IS_NUMBER] }],
+        "mask-image-linear-from-pos" => [{ "mask-linear-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-linear-to-pos" => [{ "mask-linear-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-linear-from-color" => [{ "mask-linear-from": SCALE_COLOR.call }],
+        "mask-image-linear-to-color" => [{ "mask-linear-to": SCALE_COLOR.call }],
+        "mask-image-t-from-pos" => [{ "mask-t-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-t-to-pos" => [{ "mask-t-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-t-from-color" => [{ "mask-t-from": SCALE_COLOR.call }],
+        "mask-image-t-to-color" => [{ "mask-t-to": SCALE_COLOR.call }],
+        "mask-image-r-from-pos" => [{ "mask-r-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-r-to-pos" => [{ "mask-r-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-r-from-color" => [{ "mask-r-from": SCALE_COLOR.call }],
+        "mask-image-r-to-color" => [{ "mask-r-to": SCALE_COLOR.call }],
+        "mask-image-b-from-pos" => [{ "mask-b-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-b-to-pos" => [{ "mask-b-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-b-from-color" => [{ "mask-b-from": SCALE_COLOR.call }],
+        "mask-image-b-to-color" => [{ "mask-b-to": SCALE_COLOR.call }],
+        "mask-image-l-from-pos" => [{ "mask-l-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-l-to-pos" => [{ "mask-l-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-l-from-color" => [{ "mask-l-from": SCALE_COLOR.call }],
+        "mask-image-l-to-color" => [{ "mask-l-to": SCALE_COLOR.call }],
+        "mask-image-x-from-pos" => [{ "mask-x-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-x-to-pos" => [{ "mask-x-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-x-from-color" => [{ "mask-x-from": SCALE_COLOR.call }],
+        "mask-image-x-to-color" => [{ "mask-x-to": SCALE_COLOR.call }],
+        "mask-image-y-from-pos" => [{ "mask-y-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-y-to-pos" => [{ "mask-y-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-y-from-color" => [{ "mask-y-from": SCALE_COLOR.call }],
+        "mask-image-y-to-color" => [{ "mask-y-to": SCALE_COLOR.call }],
+        "mask-image-radial" => [{ "mask-radial" => [IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }],
+        "mask-image-radial-from-pos" => [{ "mask-radial-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-radial-to-pos" => [{ "mask-radial-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-radial-from-color" => [{ "mask-radial-from": SCALE_COLOR.call }],
+        "mask-image-radial-to-color" => [{ "mask-radial-to": SCALE_COLOR.call }],
+        "mask-image-radial-shape" => [{ "mask-radial" => ["circle", "ellipse"] }],
+        "mask-image-radial-size" => [
+          { "mask-radial" => [{ "closest" => ["side", "corner"], "farthest" => ["side", "corner"] }] },
+        ],
+        "mask-image-radial-pos" => [{ "mask-radial-at": SCALE_POSITION.call }],
+        "mask-image-conic-pos" => [{ "mask-conic" => [IS_NUMBER] }],
+        "mask-image-conic-from-pos" => [{ "mask-conic-from": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-conic-to-pos" => [{ "mask-conic-to": SCALE_MASK_IMAGE_POSITION.call }],
+        "mask-image-conic-from-color" => [{ "mask-conic-from": SCALE_COLOR.call }],
+        "mask-image-conic-to-color" => [{ "mask-conic-to": SCALE_COLOR.call }],
+        ##
+        # Mask Mode
+        # @see https://tailwindcss.com/docs/mask-mode
+        ##
+        "mask-mode" => [{ "mask" => ["alpha", "luminance", "match"] }],
+        ##
+        # Mask Origin
+        # @see https://tailwindcss.com/docs/mask-origin
+        ##
+        "mask-origin" => [
+          { "mask-origin" => ["border", "padding", "content", "fill", "stroke", "view"] },
+        ],
+        ##
+        # Mask Position
+        # @see https://tailwindcss.com/docs/mask-position
+        ##
+        "mask-position" => [{ "mask" => SCALE_BG_POSITION.call }],
+        ##
+        # Mask Repeat
+        # @see https://tailwindcss.com/docs/mask-repeat
+        ##
+        "mask-repeat" => [{ "mask" => SCALE_BG_REPEAT.call }],
+        ##
+        # Mask Size
+        # @see https://tailwindcss.com/docs/mask-size
+        ##
+        "mask-size" => [{ "mask" => SCALE_BG_SIZE.call }],
+        ##
+        # Mask Type
+        # @see https://tailwindcss.com/docs/mask-type
+        ##
+        "mask-type" => [{ "mask-type" => ["alpha", "luminance"] }],
+        ##
+        # Mask Image
+        # @see https://tailwindcss.com/docs/mask-image
+        ##
+        "mask-image" => [{ "mask" => ["none", IS_ARBITRARY_VARIABLE, IS_ARBITRARY_VALUE] }],
 
         #########
         # Filters
@@ -1433,11 +1557,16 @@ module TailwindMerge
             "",
             "none",
             THEME_DROP_SHADOW,
-            IS_ARBITRARY_VARIABLE,
-            IS_ARBITRARY_VALUE,
+            IS_ARBITRARY_VARIABLE_SHADOW,
+            IS_ARBITRARY_SHADOW,
           ],
         }],
         ##
+        # Drop Shadow Color
+        # @see https://tailwindcss.com/docs/filter-drop-shadow#setting-the-shadow-color
+        ##
+        "drop-shadow-color" => [{ "drop-shadow": SCALE_COLOR.call }],
+        ##
         # Grayscale
         # @see https://tailwindcss.com/docs/grayscale
         ##
@@ -1625,7 +1754,7 @@ module TailwindMerge
         # Perspective Origin
         # @see https://tailwindcss.com/docs/perspective-origin
         ##
-        "perspective-origin" => [{ "perspective-origin" => SCALE_ORIGIN.call }],
+        "perspective-origin" => [{ "perspective-origin" => SCALE_POSITION_WITH_ARBITRARY.call }],
         ##
         # Rotate
         # @see https://tailwindcss.com/docs/rotate
@@ -1696,7 +1825,7 @@ module TailwindMerge
         ##
         "transform-origin" => [
           {
-            "origin" => SCALE_ORIGIN.call,
+            "origin" => SCALE_POSITION_WITH_ARBITRARY.call,
           },
         ],
         ##
@@ -2062,6 +2191,8 @@ module TailwindMerge
         "rounded-l" => ["rounded-tl", "rounded-bl"],
         "border-spacing" => ["border-spacing-x", "border-spacing-y"],
         "border-w" => [
+          "border-w-x",
+          "border-w-y",
           "border-w-s",
           "border-w-e",
           "border-w-t",
@@ -2072,6 +2203,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-x",
+          "border-color-y",
           "border-color-s",
           "border-color-e",
           "border-color-t",
@@ -2116,17 +2249,18 @@ module TailwindMerge
         "font-size" => ["leading"],
       },
       order_sensitive_modifiers: [
-        "before",
+        "*",
+        "**",
         "after",
-        "placeholder",
+        "backdrop",
+        "before",
+        "details-content",
         "file",
+        "first-letter",
+        "first-line",
         "marker",
+        "placeholder",
         "selection",
-        "first-line",
-        "first-letter",
-        "backdrop",
-        "*",
-        "**",
       ],
     }.freeze
 

data/lib/tailwind_merge/validators.rb

@@ -111,7 +111,7 @@ module TailwindMerge
     }
 
     IS_ARBITRARY_SHADOW = ->(value) {
-      arbitrary_value?(value, IS_NEVER, IS_SHADOW)
+      arbitrary_value?(value, IS_LABEL_SHADOW, IS_SHADOW)
     }
 
     IS_ARBITRARY_VARIABLE = ->(value) {
@@ -146,36 +146,32 @@ module TailwindMerge
     # Labels
     ############
 
-    IS_LABEL_POSITION = ->(value) {
-      value == "position"
+    IS_LABEL_POSITION = ->(label) {
+      label == "position" || label == "percentage"
     }
 
-    IMAGE_LABELS = Set.new(["image", "url"]).freeze
-
-    IS_LABEL_IMAGE = ->(value) {
-      IMAGE_LABELS.include?(value)
+    IS_LABEL_IMAGE = ->(label) {
+      label == "image" || label == "url"
     }
 
-    SIZE_LABELS = Set.new(["length", "size", "percentage"]).freeze
-
-    IS_LABEL_SIZE = ->(value) {
-      SIZE_LABELS.include?(value)
+    IS_LABEL_SIZE = ->(label) {
+      label == "length" || label == "size" || label == "bg-size"
     }
 
-    IS_LABEL_LENGTH = ->(value) {
-      value == "length"
+    IS_LABEL_LENGTH = ->(label) {
+      label == "length"
     }
 
-    IS_LABEL_NUMBER = ->(value) {
-      value == "number"
+    IS_LABEL_NUMBER = ->(label) {
+      label == "number"
     }
 
-    IS_LABEL_FAMILY_NAME = ->(value) {
-      value == "family-name"
+    IS_LABEL_FAMILY_NAME = ->(label) {
+      label == "family-name"
     }
 
-    IS_LABEL_SHADOW = ->(value) {
-      value == "shadow"
+    IS_LABEL_SHADOW = ->(label) {
+      label == "shadow"
     }
   end
 end

data/lib/tailwind_merge/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sin_lru_redux
@@ -76,15 +76,15 @@ files:
 - lib/tailwind_merge/version.rb
 - script/test
 - tailwind_merge.gemspec
-homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.0.0
+homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.2.0
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.0.0
-  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.0.0
-  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.0.0/CHANGELOG.md
+  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.2.0
+  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.2.0
+  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.2.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
-  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.0.0
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.2.0
   funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
 post_install_message: