From c3810f07c9a69e4558fc8a4e5d4027df7626e2e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2026 17:55:09 +0000 Subject: [PATCH] build(deps): bump tailwind-merge from 2.5.4 to 3.7.0 in /nextjs-frontend Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge/tree/HEAD/packages/tailwind-merge) from 2.5.4 to 3.7.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/commits/tailwind-merge@3.7.0/packages/tailwind-merge) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- nextjs-frontend/package.json | 2 +- nextjs-frontend/pnpm-lock.yaml | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/nextjs-frontend/package.json b/nextjs-frontend/package.json index 26b7172ea..4e6a63923 100644 --- a/nextjs-frontend/package.json +++ b/nextjs-frontend/package.json @@ -43,7 +43,7 @@ "react": "19.3.0", "react-dom": "19.3.0", "react-hook-form": "^7.89.0", - "tailwind-merge": "^2.5.4", + "tailwind-merge": "^3.7.0", "tailwindcss-animate": "^1.0.7", "yjs": "13.6.33", "zod": "^4.6.5" diff --git a/nextjs-frontend/pnpm-lock.yaml b/nextjs-frontend/pnpm-lock.yaml index da26ad5ae..e36f520ee 100644 --- a/nextjs-frontend/pnpm-lock.yaml +++ b/nextjs-frontend/pnpm-lock.yaml @@ -117,8 +117,8 @@ importers: specifier: ^7.89.0 version: 7.89.0(@types/react@19.3.0)(react@19.3.0) tailwind-merge: - specifier: ^2.5.4 - version: 2.5.4 + specifier: ^3.7.0 + version: 3.7.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.19(ts-node@10.9.2(@types/node@20.17.6)(typescript@6.0.3))) @@ -390,6 +390,10 @@ packages: peerDependencies: '@babel/core': ^7.29.7 + '@babel/runtime@7.29.10': + resolution: {integrity: sha512-NpugTzbKgGrNe45Ui32cN8vCFFMxVtP/9rtfwv0nP5FRDAjvYBxJcLVpYA9mr1jxP6cnIT7x9LUzuDTbWYYNRA==} + engines: {node: '>=6.9.0'} + '@babel/runtime@7.29.7': resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==} engines: {node: '>=6.9.0'} @@ -4451,8 +4455,8 @@ packages: resolution: {integrity: sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==} engines: {node: ^14.18.0 || >=16.0.0} - tailwind-merge@2.5.4: - resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==} + tailwind-merge@3.7.0: + resolution: {integrity: sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -5074,6 +5078,8 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 + '@babel/runtime@7.29.10': {} + '@babel/runtime@7.29.7': {} '@babel/template@7.29.7': @@ -6603,7 +6609,7 @@ snapshots: '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.29.7 - '@babel/runtime': 7.29.7 + '@babel/runtime': 7.29.10 '@types/aria-query': 5.0.4 aria-query: 5.3.0 chalk: 4.1.2 @@ -10058,7 +10064,7 @@ snapshots: dependencies: '@pkgr/core': 0.3.6 - tailwind-merge@2.5.4: {} + tailwind-merge@3.7.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.19(ts-node@10.9.2(@types/node@20.17.6)(typescript@6.0.3))): dependencies: