tailwind_merge 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49468c0bdbf4ddb68d243dccfa35e4625ea4f703629a4e544e61776a38eeb2b
-  data.tar.gz: 1679630fbd3af2a407cdc64d73ea2fedbf0bcafa7b299fbfd7a2c673d643ae21
+  metadata.gz: b6224f510ea4b41c69dcfd5afebd2275a160f35a4bd0d566abf939de17467e73
+  data.tar.gz: 703cde0f5f4995926c368abd799db4a2b39a495ad8563958d6efe6a5b10c1e1b
 SHA512:
-  metadata.gz: 69f000a1202366ebe7b98845248db99266a639ff286eb944be5eb6443bc7d40500a328946dd44ad03a82ca049f6ceb12daec62fc7f143ca0bac80f42b38cb466
-  data.tar.gz: 99e3566837682b68b64096730b1443ff8ccde5a19cb483a15defc344c6a5a7a6d24fc20838fe80a9834e4c6ecbee86ca5916c6bea5862ee54ca0e8da9cc0c442
+  metadata.gz: 20a49d6ed7f51d50c9397e187ec1ebd5244b9ad3757008d7dadbdae866a2660d29b2cec4b55e39f1daea444ba3f2acec1a0d3a24217d5a0f4888ba932c7b259a
+  data.tar.gz: c11f641d5314e975bfd0cdfe7e25e5b21245645bec46649b7ffbe1c35dedeff94951a3984bb6dce9f99852e6c393f4a1e402489b1d7286466aacbe11991de8f4

data/CHANGELOG.md

@@ -1,30 +1,4 @@
-# Changelog
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.3.0...v0.3.1
 
-## [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)
-
-**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

@@ -2,7 +2,7 @@
 
 Utility function to efficiently merge [Tailwind CSS](https://tailwindcss.com/) classes without style conflicts. Essentially, a Ruby port of [tailwind-merge](https://github.com/dcastil/tailwind-merge).
 
-Supports Tailwind v3.0+.
+Supports Tailwind v3.0 up to v3.2.
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+require "rubygems/package_task"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -12,3 +13,8 @@ end
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
+
+GEMSPEC = Bundler.load_gemspec("tailwind_merge.gemspec")
+gem_path = Gem::PackageTask.new(GEMSPEC).define
+desc "Package the ruby gem"
+task "package" => [gem_path]

data/lib/tailwind_merge/config.rb

@@ -300,7 +300,7 @@ module TailwindMerge
         # Visibility
         # @see https://tailwindcss.com/docs/visibility
         ##
-        "visibility" => ["visible", "invisible"],
+        "visibility" => ["visible", "invisible", "collapse"],
         ##
         # Z-Index
         # @see https://tailwindcss.com/docs/z-index
@@ -431,7 +431,7 @@ module TailwindMerge
         # Align Content
         # @see https://tailwindcss.com/docs/align-content
         ##
-        "align-content" => [{ "content" => ALIGN.call }],
+        "align-content" => [{ content: [*ALIGN.call, "baseline"] }],
         ##
         # Align Items
         # @see https://tailwindcss.com/docs/align-items
@@ -446,12 +446,12 @@ module TailwindMerge
         # Place Content
         # @see https://tailwindcss.com/docs/place-content
         ##
-        "place-content" => [{ "place-content" => [*ALIGN.call, "stretch"] }],
+        "place-content" => [{ "place-content" => [*ALIGN.call, "baseline", "stretch"] }],
         ##
         # Place Items
         # @see https://tailwindcss.com/docs/place-items
         ##
-        "place-items" => [{ "place-items" => ["start", "end", "center", "stretch"] }],
+        "place-items" => [{ "place-items" => ["start", "end", "center", "baseline", "stretch"] }],
         ##
         # Place Self
         # @see https://tailwindcss.com/docs/place-self
@@ -793,7 +793,7 @@ module TailwindMerge
         # Word Break
         # @see https://tailwindcss.com/docs/word-break
         ##
-        "break" => [{ "break" => ["normal", "words", "all"] }],
+        "break" => [{ "break" => ["normal", "words", "all", "keep"] }],
         ##
         # Content
         # @see https://tailwindcss.com/docs/content
@@ -1034,7 +1034,7 @@ module TailwindMerge
         # Outline Style
         # @see https://tailwindcss.com/docs/outline-style
         ##
-        "outline-style" => [{ "outline" => ["", *LINE_STYLES.call, "hidden"] }],
+        "outline-style" => [{ "outline" => ["", *LINE_STYLES.call] }],
         ##
         # Outline Offset
         # @see https://tailwindcss.com/docs/outline-offset
@@ -1540,7 +1540,7 @@ module TailwindMerge
         # Fill
         # @see https://tailwindcss.com/docs/fill
         ##
-        "fill" => [{ "fill" => [COLORS] }],
+        "fill" => [{ "fill" => [COLORS, "none"] }],
         ##
         # Stroke Width
         # @see https://tailwindcss.com/docs/stroke-width
@@ -1550,7 +1550,7 @@ module TailwindMerge
         # Stroke
         # @see https://tailwindcss.com/docs/stroke
         ##
-        "stroke" => [{ "stroke" => [COLORS] }],
+        "stroke" => [{ "stroke" => [COLORS, "none"] }],
         # Accessibility
         ##
         # Screen Readers

data/lib/tailwind_merge/validators.rb

@@ -18,7 +18,7 @@ module TailwindMerge
 
     ARBITRARY_VALUE_REGEX = /^\[(.+)\]$/
     FRACTION_REGEX = %r{^\d+/\d+$}
-    LENGTH_UNIT_REGEX = /\d+(%|px|em|rem|vh|vw|pt|pc|in|cm|mm|cap|ch|ex|lh|rlh|vi|vb|vmin|vmax)/
+    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)$/
     # 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.2.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Garen J. Torikian
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - gjtorikian@gmail.com
 executables: []
@@ -140,7 +140,6 @@ files:
 - lib/tailwind_merge/config.rb
 - lib/tailwind_merge/validators.rb
 - lib/tailwind_merge/version.rb
-- script/generate_changelog
 - tailwind_merge.gemspec
 homepage: https://www.github.com/gjtorikian/tailwind_merge
 licenses:
@@ -149,7 +148,7 @@ metadata:
   funding_uri: https://github.com/sponsors/gjtorikian/
   rubygems_mfa_required: 'true'
   homepage_uri: https://www.github.com/gjtorikian/tailwind_merge
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -168,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Utility function to efficiently merge Tailwind CSS classes without style
   conflicts.

data/script/generate_changelog

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-CHANGELOG_GITHUB_TOKEN="$GH_TOKEN" github_changelog_generator -u gjtorikian -p tailwind_merge