Skip to content

Commit 1e04a9d

Browse files
committed
chore(eslint,tailwind): enforce conflicting classes as error; disable default text utilities\n\n- Set better-tailwindcss/no-conflicting-classes to error to match previous behavior and CI expectations\n- Clear Tailwind v4 default font-size and font-weight tokens via @theme to prevent text-*/font-* utilities
1 parent 0a19292 commit 1e04a9d

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ const config = createConfig([
235235
},
236236
rules: {
237237
'better-tailwindcss/sort-classes': 'error',
238-
'better-tailwindcss/no-conflicting-classes': 'warn',
238+
'better-tailwindcss/no-conflicting-classes': 'error',
239239
'better-tailwindcss/no-unregistered-classes': 'error',
240240
},
241241
},

packages/design-tokens/src/tailwind/theme.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
@import '../css/shadow.css';
44

55
@theme {
6+
/* Disable default Tailwind font sizes and weights */
7+
--font-size-*: initial;
8+
--font-weight-*: initial;
69
/* Essential Tailwind colors required for basic utilities */
710
--color-inherit: inherit;
811
--color-current: currentColor;

0 commit comments

Comments
 (0)