Skip to content

Commit 2da7edf

Browse files
authored
Merge pull request #135 from connorabbas/ssr-develop
Tailwind v4, Vite v6, Fixes
2 parents 66d2373 + 45ee1c8 commit 2da7edf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+502
-1273
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
## About
44

5-
![Static Badge](https://img.shields.io/badge/Laravel%20-%20v11%20-%20%23f9322c) ![Static Badge](https://img.shields.io/badge/Inertia.js%20-%20v2%20-%20%236b46c1) ![Static Badge](<https://img.shields.io/badge/Vue.js%20-%20v3.5%20-%20rgb(66%20184%20131)>) ![Static Badge](<https://img.shields.io/badge/PrimeVue%20-%20v4%20-%20rgb(16%20185%20129)>)
5+
![Static Badge](https://img.shields.io/badge/Laravel%20-%20v11%20-%20%23f9322c) ![Static Badge](https://img.shields.io/badge/Inertia.js%20-%20v2%20-%20%236b46c1) ![Static Badge](<https://img.shields.io/badge/Vue.js%20-%20v3.5%20-%20rgb(66%20184%20131)>) ![Static Badge](https://img.shields.io/badge/PrimeVue%20-%20v4%20-%20rgb(16%20185%20129)) ![Static Badge](https://img.shields.io/badge/Tailwind%20CSS%20-%20v4%20-%20%230284c7)
66

7-
A basic authentication starter kit using [Laravel](https://laravel.com/docs/master), [Intertia.js](https://inertiajs.com/), and [PrimeVue](https://primevue.org/). An equivalent to using [Laravel Breeze](https://laravel.com/docs/master/starter-kits#laravel-breeze), but with the added benefit of all the PrimeVue components at your disposal.
7+
8+
A basic authentication starter kit using [Laravel](https://laravel.com/docs/master), [Intertia.js](https://inertiajs.com/), [PrimeVue](https://primevue.org/) components, and [Tailwind CSS](https://tailwindcss.com/). An equivalent to using [Laravel Breeze](https://laravel.com/docs/master/starter-kits#laravel-breeze), but with the added benefit of all the PrimeVue components at your disposal.
89

910
```
1011
git clone -b feature/ssr https://github.com/connorabbas/laravel-inertia-primevue.git

package-lock.json

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

package.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
"@inertiajs/vue3": "^2.0.0",
1212
"@primevue/auto-import-resolver": "^4.2.2",
1313
"@primevue/themes": "^4.2.2",
14+
"@tailwindcss/vite": "^4.0.0",
1415
"@types/lodash-es": "^4.17.12",
1516
"@typescript-eslint/eslint-plugin": "^8.19.1",
1617
"@typescript-eslint/parser": "^8.19.1",
1718
"@vitejs/plugin-vue": "^5.0.0",
19+
"@vue/server-renderer": "^3.5.13",
1820
"@vueuse/core": "^12.4.0",
19-
"autoprefixer": "^10.4.19",
2021
"axios": "^1.6.4",
2122
"eslint": "^9.18.0",
2223
"eslint-config-prettier": "^9.1.0",
@@ -25,20 +26,15 @@
2526
"laravel-vite-plugin": "^1.0",
2627
"lodash": "^4.17.21",
2728
"lodash-es": "^4.17.21",
28-
"postcss": "^8.4.39",
29-
"postcss-import": "^16.1.0",
3029
"primeicons": "^7.0.0",
3130
"primevue": "^4.2.2",
32-
"tailwindcss": "^3.4.4",
31+
"tailwindcss": "^4.0.0",
3332
"tailwindcss-primeui": "^0.3.2",
3433
"typescript": "^5.7.3",
3534
"typescript-eslint": "^8.19.1",
3635
"unplugin-vue-components": "^0.27.4",
37-
"vite": "^5.0",
36+
"vite": "^6.0",
3837
"vue": "^3.5.0",
39-
"ziggy-js": "^2.4.2"
40-
},
41-
"dependencies": {
42-
"@vue/server-renderer": "^3.5.13"
38+
"ziggy-js": "^2.5.0"
4339
}
4440
}

postcss.config.js

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

resources/css/styles.css renamed to resources/css/app.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ body {
8686
--p-text-muted-color: var(--p-surface-400);
8787
--p-text-hover-muted-color: var(--p-surface-300);
8888
}
89-
}
89+
}

resources/css/custom-preflight.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,12 @@ object {
276276
vertical-align: middle;
277277
}
278278

279+
img,
280+
video {
281+
max-width: 100%;
282+
height: auto;
283+
}
284+
279285
*,
280286
::before,
281287
::after {

resources/css/primevue/autocomplete.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import './inputtext';
2-
@import './chip';
1+
@import './inputtext.css';
2+
@import './chip.css';
33

44
.p-autocomplete {
55
@apply inline-flex

resources/css/primevue/button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import './badge';
1+
@import './badge.css';
22

33
.p-button {
44
@apply inline-flex cursor-pointer select-none items-center justify-center overflow-hidden relative

resources/css/primevue/carousel.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import './button';
1+
@import './button.css';
22

33
.p-carousel {
44
@apply flex flex-col

resources/css/primevue/confirmdialog.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import './dialog';
2-
@import './button';
1+
@import './dialog.css';
2+
@import './button.css';
33

44
.p-confirmdialog .p-dialog-content {
55
@apply flex items-center gap-4

0 commit comments

Comments
 (0)