From 139fc94e2ac0a4a112fdb18bb340994dc3656f70 Mon Sep 17 00:00:00 2001 From: WK Date: Tue, 29 Jul 2025 11:36:49 +0800 Subject: [PATCH] chore(deps): bump tailwind-variants version (#5538) * chore(deps): bump tailwind-variants version * chore(deps): add tailwind-merge --- .changeset/lazy-roses-lick.md | 6 ++++ apps/docs/package.json | 3 +- packages/core/system-rsc/package.json | 3 +- packages/core/theme/package.json | 4 +-- pnpm-lock.yaml | 41 +++++++++++++++++---------- 5 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 .changeset/lazy-roses-lick.md diff --git a/.changeset/lazy-roses-lick.md b/.changeset/lazy-roses-lick.md new file mode 100644 index 000000000..2020bfc86 --- /dev/null +++ b/.changeset/lazy-roses-lick.md @@ -0,0 +1,6 @@ +--- +"@heroui/system-rsc": patch +"@heroui/theme": patch +--- + +bump tailwind-variants version diff --git a/apps/docs/package.json b/apps/docs/package.json index b1c638c44..ce8f99a6e 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -81,7 +81,8 @@ "sharp": "^0.32.1", "shelljs": "^0.8.4", "swr": "2.2.5", - "tailwind-variants": "1.0.0", + "tailwind-variants": "2.0.1", + "tailwind-merge": "3.3.1", "unified": "^11.0.5", "unist-util-visit": "5.0.0", "usehooks-ts": "3.1.0", diff --git a/packages/core/system-rsc/package.json b/packages/core/system-rsc/package.json index e098e75f0..be08d8ca7 100644 --- a/packages/core/system-rsc/package.json +++ b/packages/core/system-rsc/package.json @@ -42,7 +42,8 @@ "@heroui/react-utils": "workspace:*", "@heroui/shared-utils": "workspace:*", "react": "18.3.0", - "tailwind-variants": "1.0.0", + "tailwind-variants": "2.0.1", + "tailwind-merge": "3.3.1", "clean-package": "2.2.0" }, "dependencies": { diff --git a/packages/core/theme/package.json b/packages/core/theme/package.json index 802e24564..d1ba4f470 100644 --- a/packages/core/theme/package.json +++ b/packages/core/theme/package.json @@ -51,8 +51,8 @@ "deepmerge": "4.3.1", "flat": "^5.0.2", "clsx": "^1.2.1", - "tailwind-variants": "1.0.0", - "tailwind-merge": "3.0.2", + "tailwind-variants": "2.0.1", + "tailwind-merge": "3.3.1", "@heroui/shared-utils": "workspace:*" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13d379260..20859ca7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -469,9 +469,12 @@ importers: swr: specifier: 2.2.5 version: 2.2.5(react@18.3.0) + tailwind-merge: + specifier: 3.3.1 + version: 3.3.1 tailwind-variants: - specifier: 1.0.0 - version: 1.0.0(tailwindcss@4.1.11) + specifier: 2.0.1 + version: 2.0.1(tailwind-merge@3.3.1)(tailwindcss@4.1.11) unified: specifier: ^11.0.5 version: 11.0.5 @@ -3210,9 +3213,12 @@ importers: react: specifier: 18.3.0 version: 18.3.0 + tailwind-merge: + specifier: 3.3.1 + version: 3.3.1 tailwind-variants: - specifier: 1.0.0 - version: 1.0.0(tailwindcss@4.1.11) + specifier: 2.0.1 + version: 2.0.1(tailwind-merge@3.3.1)(tailwindcss@4.1.11) packages/core/theme: dependencies: @@ -3235,11 +3241,11 @@ importers: specifier: ^5.0.2 version: 5.0.2 tailwind-merge: - specifier: 3.0.2 - version: 3.0.2 + specifier: 3.3.1 + version: 3.3.1 tailwind-variants: - specifier: 1.0.0 - version: 1.0.0(tailwindcss@4.1.11) + specifier: 2.0.1 + version: 2.0.1(tailwind-merge@3.3.1)(tailwindcss@4.1.11) devDependencies: '@types/color': specifier: ^4.2.0 @@ -14280,14 +14286,18 @@ packages: resolution: {integrity: sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==} engines: {node: ^14.18.0 || >=16.0.0} - tailwind-merge@3.0.2: - resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==} + tailwind-merge@3.3.1: + resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==} - tailwind-variants@1.0.0: - resolution: {integrity: sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA==} + tailwind-variants@2.0.1: + resolution: {integrity: sha512-1wt8c4PWO3jbZcKGBrjIV8cehWarREw1C2os0k8Mcq0nof/CbafNhUUjb0LRWiiRfAvDK6v1deswtHLsygKglw==} engines: {node: '>=16.x', pnpm: '>=7.x'} peerDependencies: + tailwind-merge: '>=3.0.0' tailwindcss: '*' + peerDependenciesMeta: + tailwind-merge: + optional: true tailwindcss@4.1.11: resolution: {integrity: sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==} @@ -28238,12 +28248,13 @@ snapshots: dependencies: '@pkgr/core': 0.2.7 - tailwind-merge@3.0.2: {} + tailwind-merge@3.3.1: {} - tailwind-variants@1.0.0(tailwindcss@4.1.11): + tailwind-variants@2.0.1(tailwind-merge@3.3.1)(tailwindcss@4.1.11): dependencies: - tailwind-merge: 3.0.2 tailwindcss: 4.1.11 + optionalDependencies: + tailwind-merge: 3.3.1 tailwindcss@4.1.11: {}