frontpage.fyi / frontpage
AT-based link agregator. Mirror of https://github.com/likeandscribe/frontpage
fork atom

Upgrade tailwind-merge to support tailwind 4

Timothy fc7a6ab4 bcf62350

+8 -3
unified split
+1 -1
packages/frontpage/package.json
··· 50 50 "slugify": "^1.6.6", 51 51 "sonner": "^2.0.7", 52 52 "swr": "^2.3.4", 53 - "tailwind-merge": "^2.6.0", 53 + "tailwind-merge": "^3.4.0", 54 54 "weasel": "^1.2.0", 55 55 "zod": "^3.25.76" 56 56 },
+7 -2
pnpm-lock.yaml
··· 331 331 specifier: ^2.3.4 332 332 version: 2.3.6(react@19.2.3) 333 333 tailwind-merge: 334 - specifier: ^2.6.0 335 - version: 2.6.0 334 + specifier: ^3.4.0 335 + version: 3.4.0 336 336 weasel: 337 337 specifier: ^1.2.0 338 338 version: 1.2.0(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) ··· 4891 4891 4892 4892 tailwind-merge@2.6.0: 4893 4893 resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} 4894 + 4895 + tailwind-merge@3.4.0: 4896 + resolution: {integrity: sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==} 4894 4897 4895 4898 tailwindcss-animate@1.0.7: 4896 4899 resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} ··· 9775 9778 symbol-tree@3.2.4: {} 9776 9779 9777 9780 tailwind-merge@2.6.0: {} 9781 + 9782 + tailwind-merge@3.4.0: {} 9778 9783 9779 9784 tailwindcss-animate@1.0.7(tailwindcss@3.4.18(yaml@2.8.0)): 9780 9785 dependencies: