tailwind_merge 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1a99d9ee4d20e83c9f5c87005378fd99952a6f4b252e4f31d4ab7adc2ae2e02a
4
- data.tar.gz: 51292822b8b1fa87e90706a46b5c7f6a6d8e754f9062eefdcf12638e04aa908d
3
+ metadata.gz: 2be310d25aa48823e2782965b3d44202a26986ad59aaaf5672867e432c06dc15
4
+ data.tar.gz: 17e4ef04d443ab193c6b5b468008f2e0d1a9db1aaa6c37533e296531505c6bea
5
5
  SHA512:
6
- metadata.gz: f3df7fdc21a39f75890c1130fb911abc8a236666fafd469c1d1463ea2620286ad46fe8d8355410ae605325834d472da3c534e1b43a9d42da7f262297e2fc8649
7
- data.tar.gz: 3929d56d319c52a5631baefbee50ad6e25c055757a60ee5f9c2cff1f2d2c65898db3426b66b42ffcface6b17ee44edc401a378ff967ea08fe6c5c7df8d8fc8e0
6
+ metadata.gz: 260b41ff06162e8b0b25f65f269f978f3d947b19f418b2d77d8b6fc760a684826a3a7a9246aae0c86aae6791a21e87fef46961eae552e3a88bd495699eef057e
7
+ data.tar.gz: 46e891d347c8d5e73af2d3a92f6f4bb8e7c1e0b63b6fb32305183c7d36834cc8870a7b7e0f1dfb8c529ab0726ecf92d5fb2c24620b6a0320bd035fc60980056c
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ # [v1.5.1] - 18-05-2026
2
+ ## What's Changed
3
+ * Fix memory leak when passing in config by @ibrahima in https://github.com/gjtorikian/tailwind_merge/pull/77
4
+
5
+ ## New Contributors
6
+ * @ibrahima made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/77
7
+
8
+ **Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v1.5.0...v1.5.1
1
9
  # [v1.5.0] - 11-05-2026
2
10
  ## What's Changed
3
11
  * Add TW 4.3 features by @gjtorikian in https://github.com/gjtorikian/tailwind_merge/pull/75
@@ -2445,17 +2445,19 @@ module TailwindMerge
2445
2445
 
2446
2446
  def merge_config(incoming_config)
2447
2447
  extended_config = TailwindMerge::Config::DEFAULTS.dup
2448
+ extended_config[:theme] = TailwindMerge::Config::DEFAULTS[:theme].dup
2448
2449
 
2449
- incoming_theme = incoming_config.delete(:theme) || {}
2450
+ incoming_theme = incoming_config.fetch(:theme, nil) || {}
2450
2451
  # if the incoming config has a theme, we...
2451
2452
  incoming_theme.each_pair do |key, scales|
2452
2453
  # ...add new scales to the existing ones
2454
+ extended_config[:theme][key] = extended_config[:theme][key].dup
2453
2455
  extended_config[:theme][key] << ->(klass) {
2454
2456
  scales.include?(klass)
2455
2457
  }
2456
2458
  end
2457
2459
 
2458
- extended_config.merge(incoming_config)
2460
+ extended_config.merge(incoming_config.reject { |key, _| key == :theme })
2459
2461
  end
2460
2462
  end
2461
2463
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module TailwindMerge
4
- VERSION = "1.5.0"
4
+ VERSION = "1.5.1"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tailwind_merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Garen J. Torikian
@@ -73,15 +73,15 @@ files:
73
73
  - lib/tailwind_merge/version.rb
74
74
  - script/test
75
75
  - tailwind_merge.gemspec
76
- homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
76
+ homepage: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.1
77
77
  licenses:
78
78
  - MIT
79
79
  metadata:
80
- homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
81
- source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.0
82
- changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.0/CHANGELOG.md
80
+ homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.1
81
+ source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v1.5.1
82
+ changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v1.5.1/CHANGELOG.md
83
83
  bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
84
- documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.0
84
+ documentation_uri: https://rubydoc.info/gems/tailwind_merge/1.5.1
85
85
  funding_uri: https://github.com/sponsors/gjtorikian
86
86
  rubygems_mfa_required: 'true'
87
87
  rdoc_options: []
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
98
98
  - !ruby/object:Gem::Version
99
99
  version: '0'
100
100
  requirements: []
101
- rubygems_version: 4.0.6
101
+ rubygems_version: 4.0.10
102
102
  specification_version: 4
103
103
  summary: Utility function to efficiently merge Tailwind CSS classes without style
104
104
  conflicts.