Merge pull request #13 from gjtorikian/basis-spaces

Fix basis-auto and basis-full not being merged correctly

Author: gjtorikian

lib/tailwind_merge/config.rb

@@ -327,7 +327,7 @@ module Config
         # Flex Basis
         # @see https://tailwindcss.com/docs/flex-basis
         ##
-        "basis" => [{ "basis" => [SPACING] }],
+        "basis" => [{ "basis" => SPACING_WITH_AUTO.call }],
         ##
         # Flex Direction
         # @see https://tailwindcss.com/docs/flex-direction

lib/tailwind_merge/version.rb

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

test/test_class_group_conflicts.rb

@@ -9,6 +9,7 @@ def setup
 
   def test_merge_classes_from_same_group_correctly
     assert_equal("overflow-x-hidden", @merger.merge("overflow-x-auto overflow-x-hidden"))
+    assert_equal("basis-auto", @merger.merge("basis-full basis-auto"))
     assert_equal("w-fit", @merger.merge("w-full w-fit"))
     assert_equal("overflow-x-scroll", @merger.merge("overflow-x-auto overflow-x-hidden overflow-x-scroll"))
     assert_equal("hover:overflow-x-hidden overflow-x-scroll", @merger.merge("overflow-x-auto hover:overflow-x-hidden overflow-x-scroll"))