tailwind_merge 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beca3bcf02bb383ab1253a916c676f352a1b85e971cb9a3e903652671e6d2f8c
-  data.tar.gz: e7bb2df3ba1835f4eac421e27cacba0104eb258b73ff144a3027e2c6c7996e5f
+  metadata.gz: c49468c0bdbf4ddb68d243dccfa35e4625ea4f703629a4e544e61776a38eeb2b
+  data.tar.gz: 1679630fbd3af2a407cdc64d73ea2fedbf0bcafa7b299fbfd7a2c673d643ae21
 SHA512:
-  metadata.gz: 925b34356bde635711ce8e614a67a4bf8b96206436443c70b5fe5d7267ba049c88f150c66eb4b0b1b6cf087d106fbc4246edde09e2aa2b5ff90292b477c0f33d
-  data.tar.gz: 3f44962ec002d57cdf37e32b96df52891d88e1c6012443bb2d6f3b5935b0b56bc111f8f504a90684f78ca6b8e3e087e70c7e8f16db15be1757b6703ec963b1f9
+  metadata.gz: 69f000a1202366ebe7b98845248db99266a639ff286eb944be5eb6443bc7d40500a328946dd44ad03a82ca049f6ceb12daec62fc7f143ca0bac80f42b38cb466
+  data.tar.gz: 99e3566837682b68b64096730b1443ff8ccde5a19cb483a15defc344c6a5a7a6d24fc20838fe80a9834e4c6ecbee86ca5916c6bea5862ee54ca0e8da9cc0c442

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.1.3](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.3) (2022-10-11)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.2...v0.1.3)
+
+## [v0.1.2](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.2) (2022-10-11)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.1...v0.1.2)
+
 ## [v0.1.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.1) (2022-10-11)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.0...v0.1.1)

data/README.md

@@ -291,7 +291,7 @@ Here's a brief summary for each validator:
 -   `IS_ARBITRARY_SIZE` checks whether class part is an arbitrary value which starts with `size:` (`[size:200px_100px]`) which is necessary for background-size classNames.
 -   `IS_ARBITRARY_POSITION` checks whether class part is an arbitrary value which starts with `position:` (`[position:200px_100px]`) which is necessary for background-position classNames.
 -   `IS_ARBITRARY_URL` checks whether class part is an arbitrary value which starts with `url:` or `url(` (`[url('/path-to-image.png')]`, `url:var(--maybe-a-url-at-runtime)]`) which is necessary for background-image classNames.
--   `IS_ARBITRARY_WEIGHT` checks whether class part is an arbitrary value which starts with `number:` or is a number (`[number:var(--value)]`, `[450]`) which is necessary for font-weight classNames.
+-   `IS_ARBITRARY_NUMBER` checks whether class part is an arbitrary value which starts with `number:` or is a number (`[number:var(--value)]`, `[450]`) which is necessary for font-weight classNames.
 -   `IS_ARBITRARY_SHADOW` checks whether class part is an arbitrary value which starts with the same pattern as a shadow value (`[0_35px_60px_-15px_rgba(0,0,0,0.3)]`), namely with two lengths separated by a underscore.
 -   `IS_ANY` always returns true. Be careful with this validator as it might match unwanted classes. I use it primarily to match colors or when it's certain there are no other class groups in a namespace.
 

data/lib/tailwind_merge/config.rb

@@ -626,7 +626,7 @@ module TailwindMerge
               "bold",
               "extrabold",
               "black",
-              IS_ARBITRARY_WEIGHT,
+              IS_ARBITRARY_NUMBER,
             ],
           },
         ],
@@ -1545,7 +1545,7 @@ module TailwindMerge
         # Stroke Width
         # @see https://tailwindcss.com/docs/stroke-width
         ##
-        "stroke-w" => [{ "stroke" => [IS_LENGTH] }],
+        "stroke-w" => [{ "stroke" => [IS_LENGTH, IS_ARBITRARY_NUMBER] }],
         ##
         # Stroke
         # @see https://tailwindcss.com/docs/stroke

data/lib/tailwind_merge/validators.rb

@@ -68,7 +68,7 @@ module TailwindMerge
       false
     }
 
-    IS_ARBITRARY_WEIGHT = ->(class_part) {
+    IS_ARBITRARY_NUMBER = ->(class_part) {
       if (match = ARBITRARY_VALUE_REGEX.match(class_part))
         return match[1].start_with?("number:") || numeric?(match[1])
       end

data/lib/tailwind_merge/version.rb

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

data/lib/tailwind_merge.rb

@@ -34,17 +34,11 @@ module TailwindMerge
     end
 
     def merge(classes)
-      return merge_class_list(classes) unless has_cache?
-
       @cache.getset(classes) do
         merge_class_list(classes)
       end
     end
 
-    def has_cache?
-      @cache.nil?
-    end
-
     private def merge_class_list(classes)
       # Set of class_group_ids in following format:
       # `{importantModifier}{variantModifiers}{classGroupId}`
@@ -53,7 +47,7 @@ module TailwindMerge
       # @example 'md:!pr'
       class_groups_in_conflict = Set.new
 
-      classes.strip.split(SPLIT_CLASSES_REGEX).uniq.map do |original_class_name|
+      classes.strip.split(SPLIT_CLASSES_REGEX).map do |original_class_name|
         modifiers, has_important_modifier, base_class_name = split_modifiers(original_class_name)
 
         class_group_id = @class_utils.class_group_id(base_class_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -140,7 +140,7 @@ files:
 - lib/tailwind_merge/config.rb
 - lib/tailwind_merge/validators.rb
 - lib/tailwind_merge/version.rb
-- script/changelog_generator
+- script/generate_changelog
 - tailwind_merge.gemspec
 homepage: https://www.github.com/gjtorikian/tailwind_merge
 licenses: