From 0ac5640002d7f8dc010ddf90e4671d1668bf1d92 Mon Sep 17 00:00:00 2001 From: Masahiro Date: Tue, 21 Jan 2025 01:54:05 +0900 Subject: [PATCH 1/4] Uninstall lru_redux and install sin_lru_redux --- tailwind_merge.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind_merge.gemspec b/tailwind_merge.gemspec index 126618e..a706e9d 100644 --- a/tailwind_merge.gemspec +++ b/tailwind_merge.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency("lru_redux", "~> 1.1") + spec.add_dependency("sin_lru_redux") spec.add_development_dependency("minitest", "~> 5.6") spec.add_development_dependency("minitest-focus", "~> 1.1") From 3adad1207eade3c1a963cb7237f2c1b92195aaa6 Mon Sep 17 00:00:00 2001 From: Masahiro Date: Tue, 21 Jan 2025 01:54:24 +0900 Subject: [PATCH 2/4] Add ignore_empty_cache option for saving memory --- README.md | 2 ++ lib/tailwind_merge.rb | 2 +- lib/tailwind_merge/config.rb | 1 + test/test_config.rb | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1142be2..03dd8da 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,8 @@ The `tailwind_merge` config is an object with several keys: tailwind_merge_config = { # ↓ *Optional* Define how many values should be stored in cache. cache_size: 500, + # ↓ *Optional* Enable or disable caching nil values. + ignore_empty_cache: true, # ↓ *Optional* modifier separator from Tailwind config separator: ":", # ↓ *Optional* prefix from Tailwind config diff --git a/lib/tailwind_merge.rb b/lib/tailwind_merge.rb index 3dc4f9f..058578a 100644 --- a/lib/tailwind_merge.rb +++ b/lib/tailwind_merge.rb @@ -26,7 +26,7 @@ def initialize(config: {}) end @class_utils = TailwindMerge::ClassUtils.new(@config) - @cache = LruRedux::Cache.new(@config[:cache_size]) + @cache = LruRedux::Cache.new(@config[:cache_size], @config[:ignore_empty_cache]) end def merge(classes) diff --git a/lib/tailwind_merge/config.rb b/lib/tailwind_merge/config.rb index 05d3e6a..b01b0b5 100644 --- a/lib/tailwind_merge/config.rb +++ b/lib/tailwind_merge/config.rb @@ -84,6 +84,7 @@ module Config DEFAULTS = { cache_size: 500, + ignore_empty_cache: true, separator: ":", theme: { "colors" => [IS_ANY], diff --git a/test/test_config.rb b/test/test_config.rb index f7f9e5e..f845679 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -7,6 +7,7 @@ def test_default_config_has_correct_types config = TailwindMerge::Config::DEFAULTS assert_equal(500, config[:cache_size]) + assert(config[:ignore_empty_cache]) refute(config[:nonexistent]) assert_equal("block", config[:class_groups]["display"].first) assert_equal("auto", config[:class_groups]["overflow"].first["overflow"].first) From 9094b97a8078003e3b10cbfc4273ed03335a78e4 Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Thu, 23 Jan 2025 18:45:40 -0500 Subject: [PATCH 3/4] constrict version --- tailwind_merge.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind_merge.gemspec b/tailwind_merge.gemspec index a706e9d..933733f 100644 --- a/tailwind_merge.gemspec +++ b/tailwind_merge.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency("sin_lru_redux") + spec.add_dependency("sin_lru_redux", "~> 2.5") spec.add_development_dependency("minitest", "~> 5.6") spec.add_development_dependency("minitest-focus", "~> 1.1") From 58e3d47b97b188f1c60a948a288b90e45deef1dc Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Thu, 23 Jan 2025 18:46:06 -0500 Subject: [PATCH 4/4] :gem: 0.15.0 --- lib/tailwind_merge/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tailwind_merge/version.rb b/lib/tailwind_merge/version.rb index 9b2bfb8..f136aba 100644 --- a/lib/tailwind_merge/version.rb +++ b/lib/tailwind_merge/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module TailwindMerge - VERSION = "0.14.0" + VERSION = "0.15.0" end