From e704671281f20029777f61515b841294c4f5fcd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 14:31:06 +0000 Subject: [PATCH] Bump tailwind_merge from 0.13.3 to 1.2.0 Bumps [tailwind_merge](https://github.com/gjtorikian/tailwind_merge) from 0.13.3 to 1.2.0. - [Release notes](https://github.com/gjtorikian/tailwind_merge/releases) - [Changelog](https://github.com/gjtorikian/tailwind_merge/blob/main/CHANGELOG.md) - [Commits](https://github.com/gjtorikian/tailwind_merge/compare/v0.13.3...v1.2.0) --- updated-dependencies: - dependency-name: tailwind_merge dependency-version: 1.2.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 1c9b21f2..608fd730 100644 --- a/Gemfile +++ b/Gemfile @@ -79,6 +79,6 @@ gem "ruby_ui", github: "ruby-ui/ruby_ui", branch: "main", require: false gem "pry", "0.15.2" -gem "tailwind_merge", "~> 0.13.2" +gem "tailwind_merge", "~> 1.2.0" gem "rouge", "~> 4.5" diff --git a/Gemfile.lock b/Gemfile.lock index 6293a055..11929f65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,6 @@ GEM loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lru_redux (1.1.0) lucide-rails (0.5.1) railties (>= 4.1.0) mail (2.8.1) @@ -270,6 +269,7 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) + sin_lru_redux (2.5.2) sqlite3 (2.6.0) mini_portile2 (~> 2.8.0) sqlite3 (2.6.0-x86_64-linux-gnu) @@ -288,8 +288,8 @@ GEM stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.7) - tailwind_merge (0.13.3) - lru_redux (~> 1.1) + tailwind_merge (1.2.0) + sin_lru_redux (~> 2.5) thor (1.3.2) timeout (0.4.3) turbo-rails (2.0.13) @@ -340,7 +340,7 @@ DEPENDENCIES sqlite3 (>= 1.4) standard stimulus-rails (= 1.3.4) - tailwind_merge (~> 0.13.2) + tailwind_merge (~> 1.2.0) turbo-rails (= 2.0.13) tzinfo-data web-console