Merge pull request #6 from gjtorikian/support-decimals

Support decimals

Author: gjtorikian

Gemfile

@@ -12,3 +12,8 @@ gem "minitest", "~> 5.0"
 gem "rubocop", "~> 1.21"
 
 gem "github_changelog_generator", "~> 1.16"
+
+gem "rubocop-standard"
+
+gem "amazing_print"
+gem "debug"

lib/tailwind_merge/validators.rb

@@ -19,7 +19,7 @@ def integer?(x)
     ARBITRARY_VALUE_REGEX = /^\[(.+)\]$/
     FRACTION_REGEX = %r{^\d+/\d+$}
     LENGTH_UNIT_REGEX = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh)/
-    TSHIRT_UNIT_REGEX = /^(\d+)?(xs|sm|md|lg|xl)$/
+    TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
     # Shadow always begins with x and y offset separated by underscore
     SHADOW_REGEX = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
 

lib/tailwind_merge/version.rb

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

script/generate_changelog

@@ -1,3 +1,3 @@
 #!/bin/sh
 
- CHANGELOG_GITHUB_TOKEN="$GITHUB_TOKEN" bundle exec github_changelog_generator -u gjtorikian -p tailwind_merge
+bundle exec github_changelog_generator --token $GITHUB_TOKEN -u gjtorikian -p tailwind_merge

tailwind_merge.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://www.github.com/gjtorikian/tailwind_merge"
   spec.license = "MIT"
 
-  spec.required_ruby_version = [">= 3.0", "< 4.0"]
+  spec.required_ruby_version = [">= 3.1", "< 4.0"]
 
   spec.metadata = {
     "funding_uri" => "https://github.com/sponsors/gjtorikian/",
@@ -34,11 +34,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("lru_redux", "~> 1.1")
 
-  spec.add_development_dependency("amazing_print")
-  spec.add_development_dependency("debug") if "#{RbConfig::CONFIG["MAJOR"]}.#{RbConfig::CONFIG["MINOR"]}".to_f >= 3.1
   spec.add_development_dependency("minitest", "~> 5.6")
   spec.add_development_dependency("minitest-focus", "~> 1.1")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("redcarpet")
-  spec.add_development_dependency("rubocop-standard")
 end