From f98f63aee1b1aacfcc0142094c8abc01988cdc13 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 10 Dec 2024 06:52:18 +0000 Subject: [PATCH] fix: upgrade tailwind-merge from 2.5.2 to 2.5.4 Snyk has created this PR to upgrade tailwind-merge from 2.5.2 to 2.5.4. See this package in npm: tailwind-merge See this project in Snyk: https://app.snyk.io/org/rsaz/project/0a5c9e8a-cdcd-4522-a946-c1a8fad069a2?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3acd52c..3f287b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "react": "18.3.1", "react-dom": "18.3.1", "scrollen": "^0.0.2", - "tailwind-merge": "2.5.2", + "tailwind-merge": "^2.5.4", "tailwindcss": "3.4.10", "typescript": "5.5.4" }, @@ -6878,9 +6878,9 @@ "license": "MIT" }, "node_modules/tailwind-merge": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz", - "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==", + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", "license": "MIT", "funding": { "type": "github", diff --git a/package.json b/package.json index 858bf44..22c2bfa 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "react": "18.3.1", "react-dom": "18.3.1", "scrollen": "^0.0.2", - "tailwind-merge": "2.5.2", + "tailwind-merge": "2.5.4", "tailwindcss": "3.4.10", "typescript": "5.5.4" },