From a8ab3b74e206eae96a8fba2036327d26422158e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2026 19:15:43 +0000 Subject: [PATCH] chore(deps-dev): bump tailwind-merge in /quantara/frontend Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 3.6.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.6.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.6.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- quantara/frontend/package.json | 2 +- quantara/frontend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/quantara/frontend/package.json b/quantara/frontend/package.json index c6a1e4e1..57556a52 100644 --- a/quantara/frontend/package.json +++ b/quantara/frontend/package.json @@ -72,7 +72,7 @@ "jsdom": "^26.0.0", "prettier": "^3.8.4", "prettier-plugin-tailwindcss": "^0.6.11", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.6.0", "vite-plugin-svgr": "^4.3.0", "vitest": "^3.0.4" } diff --git a/quantara/frontend/yarn.lock b/quantara/frontend/yarn.lock index 08bfa475..733dd87c 100644 --- a/quantara/frontend/yarn.lock +++ b/quantara/frontend/yarn.lock @@ -5054,10 +5054,10 @@ symbol-tree@^3.2.4: resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tailwind-merge@^2.6.0: - version "2.6.0" - resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz" - integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA== +tailwind-merge@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.6.0.tgz#88d83242d1dd7bc847223f73dcf210dd1f2ee11c" + integrity sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w== tailwindcss@4.0.15: version "4.0.15" @@ -5530,4 +5530,4 @@ yocto-queue@^0.1.0: zustand@^5.0.1: version "5.0.3" resolved "https://registry.npmjs.org/zustand/-/zustand-5.0.3.tgz" - integrity sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg== \ No newline at end of file + integrity sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg==