From 509a009a083127320db99acc7e5e08c4e80b8395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Feb 2026 13:49:03 +0000 Subject: [PATCH] chore(deps): bump tailwind-merge from 3.4.1 to 3.5.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v3.4.1...v3.5.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 26121ab..01cf29c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "daisyui": "^5.5.18", "ember-primitives": "^0.53.0", "ember-truth-helpers": "^5.0.0", - "tailwind-merge": "^3.4.1" + "tailwind-merge": "^3.5.0" }, "devDependencies": { "@babel/core": "^7.29.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34a1a05..bbc4b39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^5.0.0 version: 5.0.0 tailwind-merge: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.5.0 + version: 3.5.0 devDependencies: '@babel/core': specifier: ^7.29.0 @@ -5878,8 +5878,8 @@ packages: tabster@8.7.0: resolution: {integrity: sha512-AKYquti8AdWzuqJdQo4LUMQDZrHoYQy6V+8yUq2PmgLZV10EaB+8BD0nWOfC/3TBp4mPNg4fbHkz6SFtkr0PpA==} - tailwind-merge@3.4.1: - resolution: {integrity: sha512-2OA0rFqWOkITEAOFWSBSApYkDeH9t2B3XSJuI4YztKBzK3mX0737A2qtxDZ7xkw9Zfh0bWl+r34sF3HXV+Ig7Q==} + tailwind-merge@3.5.0: + resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==} tailwindcss@4.1.18: resolution: {integrity: sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==} @@ -13222,7 +13222,7 @@ snapshots: optionalDependencies: '@rollup/rollup-linux-x64-gnu': 4.53.3 - tailwind-merge@3.4.1: {} + tailwind-merge@3.5.0: {} tailwindcss@4.1.18: {}