Skip to content

Commit 6e8b366

Browse files
Tailwind 4 (#1873)
* Add auto inject assets * build assets * Fix bootstrap.css * Change default: false * replace laravel-mix to vite * fix phpstan always false error * use Invokable controller & custom response * wip * wip * Add tailwin.config.js * wip * wip * wip * wip * fix cypress config --------- Co-authored-by: Dan <[email protected]>
1 parent 673b586 commit 6e8b366

22 files changed

+240
-105
lines changed

.github/workflows/test-build.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Test Build
2+
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
pull_request:
8+
types: [ ready_for_review, synchronize, opened ]
9+
10+
jobs:
11+
test-build:
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: [ubuntu-latest]
17+
steps:
18+
- name: Checkout Repository
19+
uses: actions/checkout@v4
20+
21+
- name: Setup Node.js
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: '22.x'
25+
26+
- name: Install NPM Dependencies
27+
run: npm install
28+
29+
- name: Build
30+
run: npm run build
31+
32+
- name: Build Tailwind 4
33+
run: npm run build:tailwind

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"require": {
2121
"php": "^8.2",
22-
"livewire/livewire": "^3.5.0",
22+
"livewire/livewire": "^3.6.0",
2323
"laravel/prompts": "*"
2424
},
2525
"require-dev": {

dist/.vite/manifest.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"resources/css/bootstrap5.css": {
3+
"file": "bootstrap5.css",
4+
"src": "resources/css/bootstrap5.css",
5+
"isEntry": true
6+
},
7+
"resources/css/tailwind.css": {
8+
"file": "tailwind.css",
9+
"src": "resources/css/tailwind.css",
10+
"isEntry": true
11+
},
12+
"resources/js/powergrid.js": {
13+
"file": "powergrid.js",
14+
"name": "powergrid",
15+
"src": "resources/js/powergrid.js",
16+
"isEntry": true
17+
}
18+
}

dist/bootstrap5.css

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mix-manifest.json

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

dist/powergrid.js

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/tailwind.css

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"test": "tests"
88
},
99
"scripts": {
10-
"dev": "mix watch",
11-
"build": "mix --production",
10+
"build": "vite build",
11+
"build:tailwind": "npx @tailwindcss/cli -i ./resources/css/tailwind4.css -o ./dist/tailwind4.css --minify",
12+
"dev": "vite build --watch",
1213
"blade-formatter": "blade-formatter --write resources/**/*.blade.php"
1314
},
1415
"repository": {
@@ -17,24 +18,24 @@
1718
},
1819
"author": "",
1920
"license": "ISC",
21+
"type": "module",
2022
"bugs": {
2123
"url": "https://github.com/Power-Components/livewire-powergrid/issues"
2224
},
2325
"homepage": "https://github.com/Power-Components/livewire-powergrid#readme",
24-
"dependencies": {
25-
"alpinejs": "^3.14.1",
26-
"laravel-mix": "^6.0.49",
27-
"tom-select": "^2.3.1"
28-
},
2926
"devDependencies": {
27+
"@tailwindcss/forms": "^0.5.10",
28+
"@tailwindcss/vite": "^4.0.12",
29+
"alpinejs": "^3.14.7",
3030
"autoprefixer": "^10.4.20",
3131
"blade-formatter": "^1.41.1",
32-
"cypress": "^13.13.2",
32+
"cypress": "^13.16.1",
3333
"flatpickr": "^4.6.13",
34-
"postcss": "^8.4.41",
3534
"resolve-url-loader": "^5.0.0",
36-
"sass": "^1.77.8",
37-
"sass-loader": "^14.1.1",
38-
"tailwindcss": "^3.4.7"
35+
"sass": "^1.82.0",
36+
"sass-loader": "^16.0.4",
37+
"tailwindcss": "^4.0.12",
38+
"tom-select": "^2.4.1",
39+
"vite": "^6.0.3"
3940
}
4041
}

phpstan.neon

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ parameters:
3030

3131
excludePaths:
3232
- './src/Components/Exports/OpenSpout/*'
33-
- './src/Components/Actions/Macros.php'
34-
- './src/Helpers/Actions.php'
3533
- './src/Livewire/PerformanceCard.php'
3634
- './src/Recorders/PowerGridPerformanceRecorder.php'
3735
- './src/Themes/Theme.php'

postcss.config.js

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

0 commit comments

Comments
 (0)