From effa19a5524f073706afc10b83b52be9465f0564 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Dec 2025 13:55:32 +0000 Subject: [PATCH] deps(deps): bump tailwind-merge from 2.6.0 to 3.4.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 3.4.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.4.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8682041..0b2ad4b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-pdf": "^10.2.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.4.0", "video.js": "^8.23.4", "webtorrent": "^2.8.5" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d553102..0b96c84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -78,8 +78,8 @@ importers: specifier: ^10.2.0 version: 10.2.0(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.4.0 + version: 3.4.0 video.js: specifier: ^8.23.4 version: 8.23.4 @@ -3944,8 +3944,8 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} + tailwind-merge@3.4.0: + resolution: {integrity: sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==} tailwindcss@3.4.19: resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==} @@ -8328,7 +8328,7 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - tailwind-merge@2.6.0: {} + tailwind-merge@3.4.0: {} tailwindcss@3.4.19(tsx@4.21.0): dependencies: