Skip to content

Commit 3cdb3d1

Browse files
committed
feat: remove aria in favor of tw-aria
1 parent d536a4f commit 3cdb3d1

File tree

12 files changed

+21
-120
lines changed

12 files changed

+21
-120
lines changed

apps/finance/tailwind.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { Config } from 'tailwindcss';
22

3-
import { aria, scrollbars } from '@stack/tailwind';
3+
import { scrollbars } from '@stack/tailwind';
44

55
export default {
66
content: ['./src/**/*.{html,js,svelte,ts}'],
77
darkMode: 'class',
8-
plugins: [scrollbars(), aria()]
8+
plugins: [scrollbars()]
99
} satisfies Config;

apps/i18n/tailwind.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { Config } from 'tailwindcss';
22

3-
import { aria, scrollbars } from '@stack/tailwind';
3+
import { scrollbars } from '@stack/tailwind';
44

55
export default {
66
darkMode: 'class',
7-
plugins: [aria(), scrollbars()]
7+
plugins: [scrollbars()]
88
} satisfies Config;
99

bun.lockb

376 Bytes
Binary file not shown.

packages/layouts/tailwind.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Config } from 'tailwindcss';
22

3-
import { aria, scrollbars } from '@stack/tailwind';
3+
import { scrollbars } from '@stack/tailwind';
44

55
export default {
6-
plugins: [scrollbars(), aria()]
6+
plugins: [scrollbars()]
77
} satisfies Config;

packages/tailwind/aria.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

packages/tailwind/base.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@import 'tailwindcss';
22

3+
@plugin "tw-aria";
4+
35
/*
46
The default border color has changed to `currentColor` in Tailwind CSS v4,
57
so we've added these compatibility styles to make sure everything still

packages/tailwind/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"@stack/typescript-config": "workspace:*",
17-
"tailwind-scrollbar": "4.0.2"
17+
"tailwind-scrollbar": "4.0.2",
18+
"tw-aria": "1.1.1"
1819
}
1920
}

packages/tailwind/tailwind.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
export * from './aria';
21
// eslint-disable-next-line ts/no-require-imports
32
export const scrollbars = () => require('tailwind-scrollbar');

packages/ui/tailwind.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Config } from 'tailwindcss';
22

3-
import { aria, scrollbars } from '@stack/tailwind';
3+
import { scrollbars } from '@stack/tailwind';
44

55
export default {
6-
plugins: [aria(), scrollbars()]
6+
plugins: [scrollbars()]
77
} satisfies Config;

turbo/generators/templates/app/src/global.css

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,12 @@
1-
@import url('@stack/ui/styles') layer(base);
1+
@import '@stack/tailwind/base';
2+
@import '@stack/tailwind/colors';
3+
@import '@stack/tailwind/typography';
24

3-
@import 'tailwindcss';
5+
@import '@stack/ui/styles';
6+
@import '@stack/layouts/styles';
47

58
@config '../tailwind.config.ts';
69

7-
/*
8-
The default border color has changed to `currentColor` in Tailwind CSS v4,
9-
so we've added these compatibility styles to make sure everything still
10-
looks the same as it did with Tailwind CSS v3.
11-
12-
If we ever want to remove these styles, we need to add an explicit border
13-
color utility to any element that depends on these defaults.
14-
*/
15-
@layer base {
16-
*,
17-
::after,
18-
::before,
19-
::backdrop,
20-
::file-selector-button {
21-
border-color: #dee3e7;
22-
}
23-
}
24-
25-
@layer base {
26-
:root {
27-
--font-sans: Geist;
28-
--font-mono: 'Geist Mono';
29-
--background: #ffffff;
30-
--foreground: #333333;
31-
}
32-
33-
.dark {
34-
--background: #000000;
35-
--foreground: #ffffff;
36-
}
37-
}
3810
html {
3911
@apply font-sans;
4012

0 commit comments

Comments
 (0)