Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from Windi to Tailwind #4614

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ vscode:
- 'EditorConfig.EditorConfig'
- 'dbaeumer.vscode-eslint'
- 'esbenp.prettier-vscode'
- 'voorjaar.windicss-intellisense'
- 'bradlc.vscode-tailwindcss'
- 'Vue.volar'
- 'redhat.vscode-yaml'
- 'davidanson.vscode-markdownlint'
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"voorjaar.windicss-intellisense",
"bradlc.vscode-tailwindcss",
"Vue.volar",
"redhat.vscode-yaml",
"davidanson.vscode-markdownlint"
Expand Down
8 changes: 2 additions & 6 deletions .yamllint.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
extends: default

ignore-from-file:
- docs/.gitignore
- docs/plugins/woodpecker-plugins/.gitignore
- .gitignore
- server/store/datastore/migration/test-files/.gitignore
- web/.gitignore
ignore: |
*pnpm-lock.yaml
rules:
line-length: disable
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/92-development/03-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ The following list contains some tools and frameworks used by the Woodpecker UI.
- use `setup` and composition api
- place (re-usable) components in `web/src/components/`
- views should have a route in `web/src/router.ts` and are located in `web/src/views/`
- [Windicss](https://windicss.org/) (similar to Tailwind)
- use Windicss classes where possible
- if needed extend the Windicss config to use new classes
- [Tailwind CSS](https://tailwindcss.com/)
- use Tailwind classes where possible
- if needed extend the Tailwind config to use new classes
- [Vite](https://vitejs.dev/) (similar to Webpack)
- [Typescript](https://www.typescriptlang.org/)
- avoid using `any` and `unknown` (the linter will prevent you from doing so anyways :wink:)
Expand Down
11 changes: 9 additions & 2 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,25 @@
"dependencies": {
"@kyvg/vue3-notification": "^3.4.1",
"@mdi/js": "^7.4.47",
"@tailwindcss/postcss": "4.0.0-beta.8",
"@tailwindcss/typography": "^0.5.15",
"@tailwindcss/vite": "4.0.0-beta.8",
"@vueuse/core": "^12.2.0",
"ansi_up": "^6.0.2",
"autoprefixer": "^10.4.20",
"dompurify": "^3.2.3",
"fuse.js": "^7.0.0",
"js-base64": "^3.7.7",
"lodash": "^4.17.21",
"marked": "^15.0.4",
"node-emoji": "^2.2.0",
"pinia": "^2.3.0",
"postcss": "^8.4.49",
"prismjs": "^1.29.0",
"semver": "^7.6.3",
"simple-icons": "^13.21.0",
"tailwindcss": "^3.4.17",
"textlint": "^14.4.0",
"vue": "^3.5.13",
"vue-i18n": "^10.0.5",
"vue-router": "^4.5.0"
Expand All @@ -57,14 +64,14 @@
"jsdom": "^25.0.1",
"prettier": "^3.4.2",
"tinycolor2": "^1.6.0",
"ts-node": "^10.9.2",
"typescript": "5.7.2",
"vite": "^6.0.5",
"vite-plugin-prismjs": "^0.0.11",
"vite-plugin-windicss": "^1.9.4",
"vite-svg-loader": "^5.1.0",
"vitest": "^2.1.8",
"vue-tsc": "^2.2.0",
"windicss": "^3.5.6"
"vue-tsc": "^2.2.0"
},
"pnpm": {
"overrides": {
Expand Down
Loading