Skip to content

Commit 0c0ef9d

Browse files
committed
fix: update tailwind-variants to latest and update cn helper
1 parent e9d67b7 commit 0c0ef9d

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"react-native-svg": "^15.12.0",
101101
"react-native-worklets": "^0.5.1",
102102
"tailwind-merge": "^3.3.1",
103-
"tailwind-variants": "^3.1.0",
103+
"tailwind-variants": "^3.2.2",
104104
"tailwindcss": "^4.1.14",
105105
"typescript": "^5.8.3",
106106
"uniwind": "1.0.0"
@@ -115,7 +115,7 @@
115115
"react-native-svg": "^15.12.1",
116116
"react-native-worklets": "^0.5.1",
117117
"tailwind-merge": "^3.3.1",
118-
"tailwind-variants": "^3.1.0"
118+
"tailwind-variants": "^3.2.2"
119119
},
120120
"workspaces": [
121121
"example"

src/helpers/theme/utils/cn.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { cn as twcn, type CnOptions } from 'tailwind-variants';
1+
import { cnMerge, type CnOptions } from 'tailwind-variants';
22

33
export function cn(...args: CnOptions) {
4-
return twcn(args)({
4+
return cnMerge(args)({
55
twMerge: true,
66
twMergeConfig: {
77
classGroups: {

yarn.lock

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8917,7 +8917,7 @@ __metadata:
89178917
react-native-svg: ^15.12.0
89188918
react-native-worklets: ^0.5.1
89198919
tailwind-merge: ^3.3.1
8920-
tailwind-variants: ^3.1.0
8920+
tailwind-variants: ^3.2.2
89218921
tailwindcss: ^4.1.14
89228922
typescript: ^5.8.3
89238923
uniwind: 1.0.0
@@ -8931,7 +8931,7 @@ __metadata:
89318931
react-native-svg: ^15.12.1
89328932
react-native-worklets: ^0.5.1
89338933
tailwind-merge: ^3.3.1
8934-
tailwind-variants: ^3.1.0
8934+
tailwind-variants: ^3.2.2
89358935
languageName: unknown
89368936
linkType: soft
89378937

@@ -15029,6 +15029,19 @@ __metadata:
1502915029
languageName: node
1503015030
linkType: hard
1503115031

15032+
"tailwind-variants@npm:^3.2.2":
15033+
version: 3.2.2
15034+
resolution: "tailwind-variants@npm:3.2.2"
15035+
peerDependencies:
15036+
tailwind-merge: ">=3.0.0"
15037+
tailwindcss: "*"
15038+
peerDependenciesMeta:
15039+
tailwind-merge:
15040+
optional: true
15041+
checksum: 6e694427c1bf9c6143936d959b60e8518d42c7ae36eb495024df411c0abc588f644f190a6e5af3e46a160b03a7dbd7cedb270a268adff339dabbffc0e5c30941
15042+
languageName: node
15043+
linkType: hard
15044+
1503215045
"tailwindcss@npm:4.1.16":
1503315046
version: 4.1.16
1503415047
resolution: "tailwindcss@npm:4.1.16"

0 commit comments

Comments
 (0)