tailwind_merge 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e16a945fd3a3872687ebacc6fa3a18ca60424e735e31f28461e500116c7fd5f
-  data.tar.gz: 3b8b7ef9495914b7004cada2918c3ecb22099f1279607fe6dc1cd47db3018be6
+  metadata.gz: ab700417f6a4f25b6ca1f2dbc4fc88c8a4158107b3b446eb61c1806f9b017ed2
+  data.tar.gz: 888edaa673497e967d596d387968bbc87af4aba71a9ee8bd1d3a2f0c16d1453d
 SHA512:
-  metadata.gz: f13054805b9efa04fa50dd84f4ffb57823f026d865e050f7617a89bc4374cd520950887defe714c49e1d50ed9a88e8a0bb27383b0a67f4ba4cdba6f8b8918667
-  data.tar.gz: af31f90a35a33964f9fc5f0e141310c5437a322be4b906123de557e9c1a925bcea8709dc6888035905bb9eb3dbf29fb822ae0835e0529fbf36d354928445b538
+  metadata.gz: d54fcc8481da5c205749eab9552be39ba2eb4f4c747d6d454d021c0d3ac71f3f4880541c9d5f559c7cb7759e0e653ee78a3e2a34458f4b9947ce5d4618d0d58e
+  data.tar.gz: 355d00b020bd1db1345f15ce0833cf9af3baf3908b452355f4909dddd67e773ddbd861867ca60ebc9ef9dd59c10d744292ec39d1c7d69291ffbffd7acfe7cadb

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v0.5.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.5.0) (2023-01-30)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.4.1...v0.5.0)
+
+**Merged pull requests:**
+
+- Support decimals [\#6](https://github.com/gjtorikian/tailwind_merge/pull/6) ([gjtorikian](https://github.com/gjtorikian))
+
+## [v0.4.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.4.1) (2022-12-23)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.4.0...v0.4.1)
+
 ## [v0.4.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.4.0) (2022-11-11)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.3.1...v0.4.0)

data/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"

data/lib/tailwind_merge/config.rb

@@ -1566,8 +1566,6 @@ module TailwindMerge
         "inset-x" => ["right", "left"],
         "inset-y" => ["top", "bottom"],
         "flex" => ["basis", "grow", "shrink"],
-        "col-start-end" => ["col-start", "col-end"],
-        "row-start-end" => ["row-start", "row-end"],
         "gap" => ["gap-x", "gap-y"],
         "p" => ["px", "py", "pt", "pr", "pb", "pl"],
         "px" => ["pr", "pl"],

data/lib/tailwind_merge/validators.rb

@@ -19,7 +19,7 @@ module TailwindMerge
     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)/
 

data/lib/tailwind_merge/version.rb

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

data/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

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: amazing_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,48 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - gjtorikian@gmail.com
@@ -158,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'
@@ -168,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style