From 71cdfd22a84cdfc979f5b780f43d3cd15c7f3dbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Jan 2026 12:17:55 +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 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 520ffd9..f4154b6 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "react-dom": "^19.0.0", "react-pdf": "^10.2.0", "resend": "^6.6.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.4.0", "undici": "^7.16.0", "video.js": "^8.23.4", "web-push": "^3.6.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8907292..c9e125a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,8 +90,8 @@ importers: specifier: ^6.6.0 version: 6.6.0 tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.4.0 + version: 3.4.0 undici: specifier: ^7.16.0 version: 7.16.0 @@ -4210,8 +4210,8 @@ packages: symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} - 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==} @@ -4537,8 +4537,8 @@ packages: resolution: {integrity: sha512-oIjpuBrypApJ+RCZ8RRaHEncVSkt2cd25/I4Trb2sk9nlaEF92Dg1u8BCwqA4eJR7wIZQM95GyO7Wo4QTbrUUA==} engines: {node: '>=16'} - webworkify-webpack@https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: - resolution: {tarball: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef} + webworkify-webpack@git+https://git@github.com:xqq/webworkify-webpack.git#24d1e719b4a6cac37a518b2bb10fe124527ef4ef: + resolution: {commit: 24d1e719b4a6cac37a518b2bb10fe124527ef4ef, repo: git@github.com:xqq/webworkify-webpack.git, type: git} version: 2.1.5 whatwg-mimetype@3.0.0: @@ -8046,7 +8046,7 @@ snapshots: mpegts.js@1.8.0: dependencies: es6-promise: 4.2.8 - webworkify-webpack: https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef + webworkify-webpack: git+https://git@github.com:xqq/webworkify-webpack.git#24d1e719b4a6cac37a518b2bb10fe124527ef4ef ms@2.1.3: {} @@ -8903,7 +8903,7 @@ snapshots: symbol-tree@3.2.4: {} - tailwind-merge@2.6.0: {} + tailwind-merge@3.4.0: {} tailwindcss@3.4.19(tsx@4.21.0): dependencies: @@ -9369,7 +9369,7 @@ snapshots: - react-native-b4a - supports-color - webworkify-webpack@https://codeload.github.com/xqq/webworkify-webpack/tar.gz/24d1e719b4a6cac37a518b2bb10fe124527ef4ef: {} + webworkify-webpack@git+https://git@github.com:xqq/webworkify-webpack.git#24d1e719b4a6cac37a518b2bb10fe124527ef4ef: {} whatwg-mimetype@3.0.0: {}