tailwind_merge 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11bdac9bc7e383d03e99dfcde6ed68cbb68a66949471a588d9b20b1fde0fe131
-  data.tar.gz: d406c2b1fc35551201b90fc45091141e1361f0205312c32101af44d72179e139
+  metadata.gz: 17f5ed4729928d04102694bdba3a69b5ae4a58af125b9808cf2cc23c30aab860
+  data.tar.gz: d7439b878d4e8e0ab3750ddefdd7a6137f73e6e53d365c3b3e598f2b27b1674d
 SHA512:
-  metadata.gz: d6f89f756d614e384e769be8f45b64530c051159b9a2eff5a5e0159ea58c20332c14de2e25d9e1304d174846bb094ebc34d24d1b6ff1a0bf0802f27a2f91d08b
-  data.tar.gz: 5ff6834884a37392265f131afae80a0fc8f7296a83073ab65afd44bc546ac9b5a6964ec156b1cc3e0e04ca15e135083da72055f4b9fd9cbc54c07ed5094619cd
+  metadata.gz: c100e23dfb78b8b36ce1b6234ad0ab71b640047bd63056851f8fc0b8102ef048e878653e651aae9858fee579878c89495703d6674c62a5874b678825666211e3
+  data.tar.gz: d8fd01d2ce37a8f643d1cec519749881d5866e39fec57a49d2d0070dce2979a1c0fe5dc2d04b777eb6a9c5d4a312b15916bb0eb2eee47e472fe271ee1c17f018

data/CHANGELOG.md

@@ -1,5 +1,22 @@
-## [Unreleased]
+# Changelog
 
-## [0.1.0] - 2022-07-17
+## [Unreleased](https://github.com/gjtorikian/tailwind_merge/tree/HEAD)
 
-- Initial release
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.1.0...HEAD)
+
+**Closed issues:**
+
+- Should arrays be supported? [\#1](https://github.com/gjtorikian/tailwind_merge/issues/1)
+
+**Merged pull requests:**
+
+- Fix h-min [\#3](https://github.com/gjtorikian/tailwind_merge/pull/3) ([gjtorikian](https://github.com/gjtorikian))
+- Fix example in README [\#2](https://github.com/gjtorikian/tailwind_merge/pull/2) ([marcoroth](https://github.com/marcoroth))
+
+## [v0.1.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.1.0) (2022-08-15)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/e748f00d53e86ece8ce2543735f3327cb30c1959...v0.1.0)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -73,7 +73,7 @@ tailwind-merge overrides conflicting classes and keeps everything else untouched
 ### Resolves non-trivial conflicts
 
 ```ruby
-twMe@merger.mergerge('inset-x-px -inset-1') # → '-inset-1'
+@merger.merge('inset-x-px -inset-1') # → '-inset-1'
 @merger.merge('bottom-auto inset-y-6') # → 'inset-y-6'
 @merger.merge('inline block') # → 'block'
 ```

data/Rakefile

@@ -12,5 +12,3 @@ end
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
-
-task default: [:test, :rubocop]

data/lib/tailwind_merge/class_utils.rb

@@ -63,7 +63,7 @@ module TailwindMerge
 
       prefixed_class_group_entries = get_prefixed_class_group_entries(
         config[:class_groups].map { |cg| [cg[0], cg[1]] },
-        prefix
+        prefix,
       )
 
       prefixed_class_group_entries.each do |(class_group_id, class_group)|
@@ -103,7 +103,7 @@ module TailwindMerge
               class_definition.call(@config),
               class_part_object,
               class_group_id,
-              theme
+              theme,
             )
             next
           end
@@ -121,7 +121,7 @@ module TailwindMerge
             class_group,
             get_class_part(class_part_object, key),
             class_group_id,
-            theme
+            theme,
           )
         end
       end

data/lib/tailwind_merge/config.rb

@@ -583,7 +583,7 @@ module TailwindMerge
         # Height
         # @see https://tailwindcss.com/docs/height
         ##
-        "h" => [{ "h" => SPACING_WITH_AUTO.call }],
+        "h" => [{ "h" => ["auto", "min", "max", "fit", SPACING] }],
         ##
         # Min-Height
         # @see https://tailwindcss.com/docs/min-height

data/lib/tailwind_merge/version.rb

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

data/lib/tailwind_merge.rb

@@ -96,6 +96,7 @@ module TailwindMerge
       end.reverse.map { |parsed| parsed[:original_class_name] }.join(" ")
     end
 
+    SPLIT_MODIFIER_REGEX = /[:\[\]]/
     private def split_modifiers(class_name)
       modifiers = []
 
@@ -105,7 +106,7 @@ module TailwindMerge
       ss = StringScanner.new(class_name)
 
       until ss.eos?
-        portion = ss.scan_until(/[:\[\]]/)
+        portion = ss.scan_until(SPLIT_MODIFIER_REGEX)
 
         if portion.nil?
           ss.terminate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux