From db02aa95fef74d26b24d7742433ba9f24f3d047c Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 5 Jun 2026 20:38:25 +0000 Subject: [PATCH] fix: upgrade tailwind-merge from 3.5.0 to 3.6.0 Snyk has created this PR to upgrade tailwind-merge from 3.5.0 to 3.6.0. See this package in npm: tailwind-merge See this project in Snyk: https://app.snyk.io/org/unknown-MKcVLyZJkLRtVvumWzZQgb/project/0aa1178e-25dd-4573-96ca-12af8d29bfe8?utm_source=github&utm_medium=referral&page=upgrade-pr --- databricks-builder-app/client/package-lock.json | 8 ++++---- databricks-builder-app/client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/databricks-builder-app/client/package-lock.json b/databricks-builder-app/client/package-lock.json index d7a52815..810c2a92 100644 --- a/databricks-builder-app/client/package-lock.json +++ b/databricks-builder-app/client/package-lock.json @@ -20,7 +20,7 @@ "react-syntax-highlighter": "^16.1.0", "remark-gfm": "^4.0.1", "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0" + "tailwind-merge": "^3.6.0" }, "devDependencies": { "@types/node": "^25.0.3", @@ -5284,9 +5284,9 @@ } }, "node_modules/tailwind-merge": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", - "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz", + "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==", "license": "MIT", "funding": { "type": "github", diff --git a/databricks-builder-app/client/package.json b/databricks-builder-app/client/package.json index bd36f50d..b2a13558 100644 --- a/databricks-builder-app/client/package.json +++ b/databricks-builder-app/client/package.json @@ -23,7 +23,7 @@ "react-syntax-highlighter": "^16.1.0", "remark-gfm": "^4.0.1", "sonner": "^2.0.7", - "tailwind-merge": "^3.5.0" + "tailwind-merge": "^3.6.0" }, "devDependencies": { "@types/node": "^25.0.3",