Skip to content

Commit 9efdd3b

Browse files
authored
feat: Update to Tailwind v4 (#7669)
* initial upgrade * Update plugin, homepage, and examples * fix jest resolver * Update tailwind starter * Update rac-tailwind example app * Update rac-spectrum-tailwind example * enable verdaccio build * update tailwind-variants * patch * update lockfile * missing dependency * copy patches when building website * dedupe lightningcss * Update styling page * Fix TextField focus state * revert verdaccio * fix typo
1 parent e228ed8 commit 9efdd3b

File tree

90 files changed

+1622
-1214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1622
-1214
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/dist/transformer.d.ts b/dist/transformer.d.ts
2+
index 508be4d8176486bfbbccd0b8cf297465c8efd15a..afbd775c60f09c8a9c35e30c79f286fddc7c7018 100644
3+
--- a/dist/transformer.d.ts
4+
+++ b/dist/transformer.d.ts
5+
@@ -1,10 +1,10 @@
6+
-import type {Config} from "tailwindcss/types/config";
7+
-import type {DefaultTheme} from "tailwindcss/types/generated/default-theme";
8+
+// import type {Config} from "tailwindcss/types/config";
9+
+// import type {DefaultTheme} from "tailwindcss/types/generated/default-theme";
10+
11+
-export type DefaultScreens = keyof DefaultTheme["screens"];
12+
+export type DefaultScreens = any;
13+
14+
export type WithTV = {
15+
- <C extends Config>(tvConfig: C, config?: TVTransformerConfig): C;
16+
+ <C>(tvConfig: C, config?: TVTransformerConfig): C;
17+
};
18+
19+
export declare const withTV: WithTV;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"plugins": {
3-
"tailwindcss": {}
3+
"@tailwindcss/postcss": {}
44
}
55
}

examples/rac-spectrum-tailwind/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
"@react-spectrum/provider": "^3.9.7",
1313
"@spectrum-icons/illustrations": "^3.6.3",
1414
"@spectrum-icons/workflow": "^4.2.12",
15+
"@tailwindcss/postcss": "^4.0.0",
1516
"parcel": "^2.13.0",
1617
"postcss": "^8.2.1",
1718
"react": "^18.2.0",
18-
"react-aria-components": "^1.0.0-alpha.4",
19+
"react-aria-components": "^1.6.0",
1920
"react-dom": "^18.2.0",
2021
"react-stately": "^3.23.0",
21-
"tailwindcss": "^3.3.0",
22+
"tailwindcss": "^4.0.0",
2223
"tailwindcss-animate": "^1.0.5"
2324
},
2425
"devDependencies": {

examples/rac-spectrum-tailwind/src/components/GenInputField.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ export function GenInputField() {
1616
value={value}
1717
onChange={setValue}
1818
aria-label="Prompt"
19-
className="flex-grow h-full p-150"
19+
className="grow h-full p-150"
2020
>
21-
<Input className="w-full h-full text-xl font-semibold text-black dark:bg-black dark:text-white p-50 focus:outline-none" />
21+
<Input className="w-full h-full text-xl font-semibold text-black dark:bg-black dark:text-white p-50 focus:outline-hidden" />
2222
</TextField>
2323
<Button
2424
isDisabled={value === ""}
25-
className="self-end my-auto font-semibold text-white rounded-full disabled:bg-gray-300 disabled:text-gray-500 mx-200 bg-accent-800 p-150 focus-visible:ring focus:outline-none"
25+
className="self-end my-auto font-semibold text-white rounded-full disabled:bg-gray-300 disabled:text-gray-500 mx-200 bg-accent-800 p-150 focus-visible:ring focus:outline-hidden"
2626
>
2727
Generate
2828
</Button>

examples/rac-spectrum-tailwind/src/components/NavigationBox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function NavigationBox({ children, src, ...other }: NavigationBoxProps) {
99
return (
1010
<Link
1111
style={{ backgroundImage: `url("${src}")` }}
12-
className="flex text-center text-white bg-cover m-175 rounded-medium h-2000 w-2000 p-60 focus-visible:ring focus:outline-none"
12+
className="flex text-center text-white bg-cover m-175 rounded-medium h-2000 w-2000 p-60 focus-visible:ring focus:outline-hidden"
1313
{...other}
1414
>
1515
<div

examples/rac-spectrum-tailwind/src/components/SelectBoxGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function SelectBox({ name, icon, description }: SelectBoxProps) {
2929
return (
3030
<Radio
3131
value={name}
32-
className="flex justify-center bg-white border rounded dark:bg-black p-160 m-160 h-2000 w-2000 focus:outline-none focus-visible:ring-half focus-visible:ring-offset-0 selected:bg-accent-100 selected:border-accent-700"
32+
className="flex justify-center bg-white border rounded dark:bg-black p-160 m-160 h-2000 w-2000 focus:outline-hidden focus-visible:ring-half focus-visible:ring-offset-0 selected:bg-accent-100 selected:border-accent-700"
3333
>
3434
{({ isSelected }) => (
3535
<div className="relative flex flex-col items-center justify-center w-full h-full gap-150">

examples/rac-spectrum-tailwind/src/components/SentimentRatingGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function SentimentRating({ rating }: { rating: string }) {
4040
return (
4141
<Radio
4242
value={rating}
43-
className="flex items-center justify-center bg-white border rounded-full disabled:bg-gray-200 disabled:text-gray-400 p-160 m-75 h-200 w-200 focus:outline-none focus-visible:ring dark:bg-black selected:bg-accent-800 dark:selected:bg-accent-800 selected:border-accent-800 selected:text-white pressed:bg-gray-200 dark:pressed:bg-gray-200 hover:border-gray-300"
43+
className="flex items-center justify-center bg-white border rounded-full disabled:bg-gray-200 disabled:text-gray-400 p-160 m-75 h-200 w-200 focus:outline-hidden focus-visible:ring dark:bg-black selected:bg-accent-800 dark:selected:bg-accent-800 selected:border-accent-800 selected:text-white pressed:bg-gray-200 dark:pressed:bg-gray-200 hover:border-gray-300"
4444
>
4545
{rating}
4646
</Radio>

examples/rac-spectrum-tailwind/src/style.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss' source("./");
2+
3+
@config '../tailwind.config.js';
44

55
* {
66
-webkit-tap-highlight-color: transparent;

examples/rac-tailwind/.postcssrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"plugins": {
3-
"tailwindcss": {}
3+
"@tailwindcss/postcss": {}
44
}
55
}

examples/rac-tailwind/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
"dependencies": {
1111
"@heroicons/react": "^2.0.16",
1212
"@react-aria/parcel-resolver-optimize-locales": "^1.0.0",
13+
"@tailwindcss/postcss": "^4.0.0",
1314
"framer-motion": "^10.12.16",
1415
"parcel": "^2.13.0",
1516
"postcss": "^8.4.21",
1617
"react": "^18.2.0",
17-
"react-aria-components": "^1.0.0-alpha.4",
18+
"react-aria-components": "^1.6.0",
1819
"react-dom": "^18.2.0",
1920
"react-stately": "^3.23.0",
20-
"tailwindcss": "^3.3.0",
21+
"tailwindcss": "^4.0.0",
2122
"tailwindcss-animate": "^1.0.5"
2223
},
2324
"devDependencies": {

0 commit comments

Comments
 (0)