| @@ -1,7 +1,13 @@ | ||
| 1 | 1 | import { clsx } from 'clsx'; |
| 2 | -import { twMerge } from 'tailwind-merge'; | |
| 2 | +import { extendTailwindMerge } from 'tailwind-merge'; | |
| 3 | 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 | +}); | |
| 9 | + | |
| 4 | 10 | export function cn(...inputs) { |
| 5 | 11 | return twMerge(clsx(inputs)); |
| 6 | 12 | } |
| 7 | 13 | |
| @@ -25,9 +31,9 @@ | ||
| 25 | 31 | * |
| 26 | 32 | * @param {string} d |
| 27 | 33 | * @returns {String} Local date string |
| 28 | 34 | */ |
| 29 | -export function fmtDate(d) { | |
| 35 | +export function formatDate(d) { | |
| 30 | 36 | if (!d) return '—'; |
| 31 | 37 | return new Date(d).toLocaleDateString('en-US', { |
| 32 | 38 | month: 'short', |
| 33 | 39 | day: 'numeric', |
