tailwind_merge 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68866007d409f90232114a3954cc9df8b852bf8cabaf719c778cb5074ff4ee9
-  data.tar.gz: d8c11eccbfb6fccfc78d03f7d7e5c0aba582b8cae3d37da4978a4d3b3ca8186f
+  metadata.gz: 783e008ab85c57a6d835bcd2c2aeb0bf1c3ee97706a42673dc89a798534295a1
+  data.tar.gz: 48641de285e39bee44cde99ecc9977edea9da0541358d308cf6d28e53bb5ab48
 SHA512:
-  metadata.gz: e2a806dee8941c3a6e203cc57c7c72245bdd6402b08859e6575fb7dc3626a56a16caf78252c363adc31e241ef0b796e5eab97f87392838ba7361862695e5da61
-  data.tar.gz: 00154a1c2915432a42eb6cd2e26fc23b0159a1e78e1e5fbaa86bc16c9db3130527f1d278d6a6207c36f1765fd736c78656214a07ec25ef0bbb026cf550aa7617
+  metadata.gz: e1b4bbf12cc96c9480ebe0313569a1938ef210b8df82e42253e7edba1c9657923bc03eb874152dac5a910b2f3f7d8ca5731cc01826ab3373097b54652a89d5e9
+  data.tar.gz: 27d39e9beaad0731d1a64cdcc0d0831c9f29b5dd36c949e0a667fc6de4ca3759ff0202875a94c1be5ae1955c1da714f2c2ee1dab2f62c961ddb142ad02ae1b4e

data/CHANGELOG.md

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

@@ -769,8 +769,8 @@ module TailwindMerge
           {
             "font" => [
               THEME_FONT_WEIGHT,
-              IS_ARBITRARY_VARIABLE,
-              IS_ARBITRARY_NUMBER,
+              IS_ARBITRARY_VARIABLE_WEIGHT,
+              IS_ARBITRARY_WEIGHT,
             ],
           },
         ],
@@ -799,7 +799,7 @@ 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 Variant Numeric
         # @see https://tailwindcss.com/docs/font-variant-numeric

data/lib/tailwind_merge/validators.rb

@@ -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.3.3"
 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.3.3
 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.3.3
 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.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
   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.3.3
   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:
   - - ">="