From d29c41fbddec24568e3800cf1bc6dc9a110a85f5 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 12 Aug 2024 19:35:53 +0000 Subject: [PATCH] fix: upgrade tailwind-merge from 2.0.0 to 2.4.0 Snyk has created this PR to upgrade tailwind-merge from 2.0.0 to 2.4.0. See this package in npm: tailwind-merge See this project in Snyk: https://app.snyk.io/org/zeroxclem/project/94aec84f-7eb2-4669-9b17-03360674967a?utm_source=github&utm_medium=referral&page=upgrade-pr --- frontend/package-lock.json | 12 +++++------- frontend/package.json | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index aacdacf..8d80346 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -22,7 +22,7 @@ "remark-code-import": "^1.2.0", "remark-gfm": "^3.0.1", "remark-math": "^5.1.1", - "tailwind-merge": "^2" + "tailwind-merge": "^2.4.0" }, "devDependencies": { "@types/node": "^20", @@ -4165,12 +4165,10 @@ } }, "node_modules/tailwind-merge": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.0.0.tgz", - "integrity": "sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==", - "dependencies": { - "@babel/runtime": "^7.23.1" - }, + "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/frontend/package.json b/frontend/package.json index 5d028f4..7c196a5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,7 +13,7 @@ "next": "^13", "react": "^18", "react-dom": "^18", - "tailwind-merge": "^2", + "tailwind-merge": "^2.4.0", "@radix-ui/react-slot": "^1", "class-variance-authority": "^0.7", "lucide-react": "^0.291",