Skip to content

Commit

Permalink
Merge pull request #7274 from sreeisalso/tailwindv4
Browse files Browse the repository at this point in the history
tailwind v4
  • Loading branch information
wmertens authored Jan 25, 2025
2 parents bc92aab + 45ec1a1 commit 307bbd5
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 44 deletions.
5 changes: 5 additions & 0 deletions .changeset/bright-experts-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@builder.io/qwik': patch
---

tailwindcss v4 integration
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
packages/eslint-plugin-qwik/dist
packages/create-qwik/dist
# note that all inputs need to be listed here, including qwik, for correct cache invalidation
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.*') }}
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.*') }}
- run: 'echo ${{ steps.cache-others.outputs.cache-primary-key }} > others-key.txt'
- name: 'check cache: docs'
id: cache-docs
Expand Down
13 changes: 3 additions & 10 deletions packages/docs/src/routes/docs/integrations/tailwind/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ contributors:
- mrhoodz
- NickClark
- adamdbradley
updated_at: '2023-10-03T18:53:23Z'
- sreeisalso
updated_at: '2025-01-24T18:53:23Z'
created_at: '2023-04-06T21:28:28Z'
---

Expand Down Expand Up @@ -53,21 +54,13 @@ bun run qwik add tailwind

The previous command updates your app with the necessary dependencies.

It also adds new files to your project folder:

- `postcss.config.js`
- `tailwind.config.js`
- `.vscode/settings.json`

and modifies your `src/global.css` to include

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

# global.css file

@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

...stuff...

Expand Down
3 changes: 0 additions & 3 deletions starters/features/tailwind/.vscode/settings.json

This file was deleted.

24 changes: 15 additions & 9 deletions starters/features/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,25 @@
"__qwik__": {
"displayName": "Integration: Tailwind (styling)",
"priority": -10,
"viteConfig": {},
"viteConfig": {
"imports": [
{
"defaultImport": "tailwindcss",
"importPath": "@tailwindcss/vite"
}
],
"vitePlugins": [
"tailwindcss()"
]
},
"docs": [
"https://qwik.dev/integrations/integration/tailwind/",
"https://qwik.dev/integrations/tailwind/",
"https://tailwindcss.com/docs/utility-first"
],
"alwaysInRoot": [
".vscode"
]
},
"devDependencies": {
"autoprefixer": "^10.4.19",
"postcss": "^8.4.39",
"prettier-plugin-tailwindcss": "^0.5.4",
"tailwindcss": "^3.4.6"
"prettier-plugin-tailwindcss": "^0.6.11",
"tailwindcss": "^4.0.0",
"@tailwindcss/vite":"^4.0.0"
}
}
6 changes: 0 additions & 6 deletions starters/features/tailwind/postcss.config.cjs

This file was deleted.

8 changes: 1 addition & 7 deletions starters/features/tailwind/src/global.css
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/**
* Tailwind CSS imports
* View the full documentation at https://tailwindcss.com
*/
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";
8 changes: 0 additions & 8 deletions starters/features/tailwind/tailwind.config.js

This file was deleted.

0 comments on commit 307bbd5

Please sign in to comment.