| @@ -1,6 +1,12 @@ | ||
| 1 | 1 | import { clsx } from 'clsx'; |
| 2 | -import { twMerge } from 'tailwind-merge'; | |
| 2 | +import { extendTailwindMerge } from 'tailwind-merge'; | |
| 3 | + | |
| 4 | +// Declared without a trailing separator: Tailwind v4 prefixes are variant-style | |
| 5 | +// (`disco:flex`). This was previously a bare `twMerge` with no prefix at all. | |
| 6 | +const twMerge = extendTailwindMerge({ | |
| 7 | + prefix: 'disco', | |
| 8 | +}); | |
| 3 | 9 | |
| 4 | 10 | export function cn(...inputs) { |
| 5 | 11 | return twMerge(clsx(inputs)); |
| 6 | 12 | } |