Skip to content

Commit 0bd83b2

Browse files
authored
Merge pull request #158 from objectstack-ai/copilot/upgrade-packages-to-tailwind-4
2 parents 196500b + 7ecc532 commit 0bd83b2

File tree

17 files changed

+231
-678
lines changed

17 files changed

+231
-678
lines changed

examples/designer-modes/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
},
2121
"devDependencies": {
2222
"@eslint/js": "^9.39.1",
23+
"@tailwindcss/postcss": "^4.1.18",
2324
"@types/node": "^25.0.9",
2425
"@types/react": "^18.3.12",
2526
"@types/react-dom": "^18.3.1",
@@ -30,7 +31,7 @@
3031
"eslint-plugin-react-refresh": "^0.4.24",
3132
"globals": "^16.5.0",
3233
"postcss": "^8.5.6",
33-
"tailwindcss": "^3.4.19",
34+
"tailwindcss": "^4.1.18",
3435
"typescript": "~5.9.3",
3536
"typescript-eslint": "^8.46.4",
3637
"vite": "^7.3.1"

examples/designer-modes/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
export default {
1010
plugins: {
11-
tailwindcss: {},
11+
'@tailwindcss/postcss': {},
1212
autoprefixer: {},
1313
},
1414
}

examples/designer-modes/src/index.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
2+
3+
/* Scan sources for Tailwind classes */
4+
@source './src/**/*.{js,ts,jsx,tsx}';
5+
@source '../../packages/designer/src/**/*.{js,ts,jsx,tsx}';
6+
@source '../../packages/components/src/**/*.{js,ts,jsx,tsx}';
47

58
:root {
69
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;

examples/designer-modes/tailwind.config.js

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

examples/object-view-demo/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"devDependencies": {
2525
"@eslint/js": "^9.39.1",
26+
"@tailwindcss/postcss": "^4.1.18",
2627
"@types/node": "^25.0.9",
2728
"@types/react": "^18.3.12",
2829
"@types/react-dom": "^18.3.1",
@@ -33,7 +34,7 @@
3334
"eslint-plugin-react-refresh": "^0.4.24",
3435
"globals": "^16.5.0",
3536
"postcss": "^8.5.6",
36-
"tailwindcss": "^3.4.19",
37+
"tailwindcss": "^4.1.18",
3738
"typescript": "~5.9.3",
3839
"typescript-eslint": "^8.46.4",
3940
"vite": "^7.3.1"

examples/object-view-demo/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
export default {
1010
plugins: {
11-
tailwindcss: {},
11+
'@tailwindcss/postcss': {},
1212
autoprefixer: {},
1313
},
1414
}

examples/object-view-demo/src/index.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
2+
3+
/* Scan sources for Tailwind classes */
4+
@source './src/**/*.{js,ts,jsx,tsx}';
5+
@source '../../packages/designer/src/**/*.{js,ts,jsx,tsx}';
6+
@source '../../packages/components/src/**/*.{js,ts,jsx,tsx}';
47

58
body {
69
margin: 0;

examples/object-view-demo/tailwind.config.js

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

packages/components/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,16 @@
8282
"peerDependencies": {
8383
"react": "^18.0.0 || ^19.0.0",
8484
"react-dom": "^18.0.0 || ^19.0.0",
85-
"tailwindcss": "^3.0.0"
85+
"tailwindcss": "^4.1.18"
8686
},
8787
"devDependencies": {
88+
"@tailwindcss/postcss": "^4.1.18",
8889
"@types/react": "^18.3.12",
8990
"@types/react-dom": "^18.3.1",
9091
"@vitejs/plugin-react": "^4.2.1",
9192
"autoprefixer": "^10.4.16",
9293
"postcss": "^8.4.31",
93-
"tailwindcss": "^3.3.5",
94+
"tailwindcss": "^4.1.18",
9495
"typescript": "^5.9.3",
9596
"vite": "^7.3.1",
9697
"vite-plugin-dts": "^4.5.4"

packages/components/postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
export default {
1010
plugins: {
11-
tailwindcss: {},
11+
'@tailwindcss/postcss': {},
1212
autoprefixer: {},
1313
},
1414
}

0 commit comments

Comments
 (0)