Skip to content

Commit 307bbd5

Browse files
authored
Merge pull request #7274 from sreeisalso/tailwindv4
tailwind v4
2 parents bc92aab + 45ec1a1 commit 307bbd5

File tree

8 files changed

+25
-44
lines changed

8 files changed

+25
-44
lines changed

.changeset/bright-experts-sip.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
tailwindcss v4 integration

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
packages/eslint-plugin-qwik/dist
158158
packages/create-qwik/dist
159159
# note that all inputs need to be listed here, including qwik, for correct cache invalidation
160-
key: ${{ hashfiles('qwik-key.txt', 'rust-key.txt', 'packages/qwik-city/**/*', 'packages/qwik-labs/**/*', 'packages/qwik-react/**/*', 'packages/eslint-plugin-qwik/**/*', 'packages/create-qwik/**/*', '!**/*.unit.*') }}
160+
key: ${{ hashfiles('qwik-key.txt', 'rust-key.txt', 'packages/qwik-city/**/*', 'packages/qwik-labs/**/*', 'packages/qwik-react/**/*', 'packages/eslint-plugin-qwik/**/*', 'packages/create-qwik/**/*', 'starters/apps/**/*', 'starters/features/**/*', 'starters/adapters/**/*', '!**/*.unit.*') }}
161161
- run: 'echo ${{ steps.cache-others.outputs.cache-primary-key }} > others-key.txt'
162162
- name: 'check cache: docs'
163163
id: cache-docs

packages/docs/src/routes/docs/integrations/tailwind/index.mdx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ contributors:
1212
- mrhoodz
1313
- NickClark
1414
- adamdbradley
15-
updated_at: '2023-10-03T18:53:23Z'
15+
- sreeisalso
16+
updated_at: '2025-01-24T18:53:23Z'
1617
created_at: '2023-04-06T21:28:28Z'
1718
---
1819

@@ -53,21 +54,13 @@ bun run qwik add tailwind
5354

5455
The previous command updates your app with the necessary dependencies.
5556

56-
It also adds new files to your project folder:
57-
58-
- `postcss.config.js`
59-
- `tailwind.config.js`
60-
- `.vscode/settings.json`
61-
6257
and modifies your `src/global.css` to include
6358

6459
```css title="src/global.css"
6560

6661
# global.css file
6762

68-
@tailwind base;
69-
@tailwind components;
70-
@tailwind utilities;
63+
@import "tailwindcss";
7164

7265
...stuff...
7366

starters/features/tailwind/.vscode/settings.json

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

starters/features/tailwind/package.json

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,25 @@
33
"__qwik__": {
44
"displayName": "Integration: Tailwind (styling)",
55
"priority": -10,
6-
"viteConfig": {},
6+
"viteConfig": {
7+
"imports": [
8+
{
9+
"defaultImport": "tailwindcss",
10+
"importPath": "@tailwindcss/vite"
11+
}
12+
],
13+
"vitePlugins": [
14+
"tailwindcss()"
15+
]
16+
},
717
"docs": [
8-
"https://qwik.dev/integrations/integration/tailwind/",
18+
"https://qwik.dev/integrations/tailwind/",
919
"https://tailwindcss.com/docs/utility-first"
10-
],
11-
"alwaysInRoot": [
12-
".vscode"
1320
]
1421
},
1522
"devDependencies": {
16-
"autoprefixer": "^10.4.19",
17-
"postcss": "^8.4.39",
18-
"prettier-plugin-tailwindcss": "^0.5.4",
19-
"tailwindcss": "^3.4.6"
23+
"prettier-plugin-tailwindcss": "^0.6.11",
24+
"tailwindcss": "^4.0.0",
25+
"@tailwindcss/vite":"^4.0.0"
2026
}
2127
}

starters/features/tailwind/postcss.config.cjs

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
/**
2-
* Tailwind CSS imports
3-
* View the full documentation at https://tailwindcss.com
4-
*/
5-
@tailwind base;
6-
@tailwind components;
7-
@tailwind utilities;
1+
@import "tailwindcss";

starters/features/tailwind/tailwind.config.js

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

0 commit comments

Comments
 (0)