From 3db92477a46fa367094be58a8f2fc4604bfe3d1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 05:29:55 +0000 Subject: [PATCH] chore(deps-dev): bump tailwind-merge from 2.4.0 to 2.5.2 in /seeder Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.4.0 to 2.5.2. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.4.0...v2.5.2) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- seeder/package-lock.json | 9 ++++----- seeder/package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/seeder/package-lock.json b/seeder/package-lock.json index 16512f336d..7cdfb25065 100644 --- a/seeder/package-lock.json +++ b/seeder/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.2", "prettier-plugin-tailwindcss": "^0.6.6", "solid-js": "^1.8.20", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.2", "tailwindcss": "^3.4.9", "terser": "^5.31.5", "typescript": "^5.5.2", @@ -9110,11 +9110,10 @@ } }, "node_modules/tailwind-merge": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz", - "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==", + "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==", "dev": true, - "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/seeder/package.json b/seeder/package.json index 2f216b5a84..d7facce0f9 100644 --- a/seeder/package.json +++ b/seeder/package.json @@ -55,7 +55,7 @@ "prettier": "^3.3.2", "prettier-plugin-tailwindcss": "^0.6.6", "solid-js": "^1.8.20", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^2.5.2", "tailwindcss": "^3.4.9", "terser": "^5.31.5", "typescript": "^5.5.2",