From 24e21b341c17713b9064c71776b318008b2419e8 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 15 Aug 2024 01:14:04 +0000 Subject: [PATCH] fix: upgrade tailwind-merge from 2.2.2 to 2.4.0 Snyk has created this PR to upgrade tailwind-merge from 2.2.2 to 2.4.0. See this package in npm: tailwind-merge See this project in Snyk: https://app.snyk.io/org/theoroblin/project/204ef26e-7d3d-46ec-a7e0-ae41ba2f7b77?utm_source=github&utm_medium=referral&page=upgrade-pr --- react-app/package-lock.json | 12 +++++------- react-app/package.json | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/react-app/package-lock.json b/react-app/package-lock.json index eec1d24..21175c5 100644 --- a/react-app/package-lock.json +++ b/react-app/package-lock.json @@ -39,7 +39,7 @@ "react-router-dom": "^6.22.3", "save": "^2.9.0", "sonner": "^1.4.41", - "tailwind-merge": "^2.2.2", + "tailwind-merge": "^2.4.0", "tailwindcss-animate": "^1.0.7", "zod": "^3.23.8" }, @@ -6023,12 +6023,10 @@ } }, "node_modules/tailwind-merge": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.2.tgz", - "integrity": "sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==", - "dependencies": { - "@babel/runtime": "^7.24.0" - }, + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz", + "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/react-app/package.json b/react-app/package.json index 25e0f10..a1af08c 100644 --- a/react-app/package.json +++ b/react-app/package.json @@ -42,7 +42,7 @@ "react-router-dom": "^6.22.3", "save": "^2.9.0", "sonner": "^1.4.41", - "tailwind-merge": "^2.2.2", + "tailwind-merge": "^2.4.0", "tailwindcss-animate": "^1.0.7", "zod": "^3.23.8" },