From a61a6361ed7028c21a4a6b2bf4ce41f5b08e4499 Mon Sep 17 00:00:00 2001 From: taylorotwell Date: Tue, 8 Oct 2024 16:08:41 +0000 Subject: [PATCH 1/5] Update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb491647562..b9f4e8a7e18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v11.2.0...11.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v11.2.1...11.x) + +## [v11.2.1](https://github.com/laravel/laravel/compare/v11.2.0...v11.2.1) - 2024-10-08 + +* [11.x] Collision Version Upgrade by [@amdad121](https://github.com/amdad121) in https://github.com/laravel/laravel/pull/6454 +* [11.x] factory-generics-in-user-model by [@MrPunyapal](https://github.com/MrPunyapal) in https://github.com/laravel/laravel/pull/6453 +* Update welcome.blade.php to add missing alt tag by [@mezotv](https://github.com/mezotv) in https://github.com/laravel/laravel/pull/6462 ## [v11.2.0](https://github.com/laravel/laravel/compare/v11.1.5...v11.2.0) - 2024-09-11 From b378ce946a05b5ab80776c3b5e40fa84751084bd Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 10 Oct 2024 14:21:56 -0500 Subject: [PATCH 2/5] Add Tailwind, "composer run dev" (#6463) This PR does two things... First, it adds a basic Tailwind configuration out of the box. This lets you start using Tailwind immediately without installing any starter kit. Useful if you just want to mess around or build things from scratch. Second, it adds a composer run dev script, which starts php artisan serve, php artisan queue:listen --tries=1, php artisan pail (now a dev dependency by default), and npm run dev all in one command, with color coded output in the terminal using concurrently. --- .env.example | 2 ++ .gitignore | 1 + composer.json | 5 +++++ package.json | 8 ++++++-- postcss.config.js | 6 ++++++ resources/css/app.css | 3 +++ resources/views/welcome.blade.php | 16 ++++++++++------ tailwind.config.js | 20 ++++++++++++++++++++ 8 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 postcss.config.js create mode 100644 tailwind.config.js diff --git a/.env.example b/.env.example index 2a4a8b781c1..a1b3de4cd1b 100644 --- a/.env.example +++ b/.env.example @@ -12,6 +12,8 @@ APP_FAKER_LOCALE=en_US APP_MAINTENANCE_DRIVER=file # APP_MAINTENANCE_STORE=database +PHP_CLI_SERVER_WORKERS=4 + BCRYPT_ROUNDS=12 LOG_CHANNEL=stack diff --git a/.gitignore b/.gitignore index afa306bdb78..c3ea31b27b8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /public/hot /public/storage /storage/*.key +/storage/pail /vendor .env .env.backup diff --git a/composer.json b/composer.json index 5605c28efdb..7e89714037d 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ }, "require-dev": { "fakerphp/faker": "^1.23", + "laravel/pail": "^1.1", "laravel/pint": "^1.13", "laravel/sail": "^1.26", "mockery/mockery": "^1.6", @@ -44,6 +45,10 @@ "@php artisan key:generate --ansi", "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"", "@php artisan migrate --graceful --ansi" + ], + "dev": [ + "Composer\\Config::disableProcessTimeout", + "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite" ] }, "extra": { diff --git a/package.json b/package.json index 5d678002fe3..c38623a9779 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,16 @@ "private": true, "type": "module", "scripts": { - "dev": "vite", - "build": "vite build" + "build": "vite build", + "dev": "vite" }, "devDependencies": { + "autoprefixer": "^10.4.20", "axios": "^1.7.4", + "concurrently": "^9.0.1", "laravel-vite-plugin": "^1.0", + "postcss": "^8.4.47", + "tailwindcss": "^3.4.13", "vite": "^5.0" } } diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 00000000000..49c0612d5c2 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; diff --git a/resources/css/app.css b/resources/css/app.css index e69de29bb2d..b5c61c95671 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 54c3c382aa0..979e82a6ce3 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -8,12 +8,16 @@ - - - - + + + + @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) + @vite(['resources/css/app.css', 'resources/js/app.js']) + @else + + @endif
diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 00000000000..ce0c57fccca --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,20 @@ +import defaultTheme from 'tailwindcss/defaultTheme'; + +/** @type {import('tailwindcss').Config} */ +export default { + content: [ + './vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php', + './storage/framework/views/*.php', + './resources/**/*.blade.php', + './resources/**/*.js', + './resources/**/*.vue', + ], + theme: { + extend: { + fontFamily: { + sans: ['Figtree', ...defaultTheme.fontFamily.sans], + }, + }, + }, + plugins: [], +}; From 0973f0a3365bb4a4611cbe1a14a0eaffc2a9dced Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 11 Oct 2024 16:57:35 -0500 Subject: [PATCH 3/5] add restart tries --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7e89714037d..5eb3e27d203 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ ], "dev": [ "Composer\\Config::disableProcessTimeout", - "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite" + "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite --restart-tries=3" ] }, "extra": { From 2f17c9764108cac1c1799c21ac7ecb3fa8a21c4e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 14 Oct 2024 09:22:52 -0500 Subject: [PATCH 4/5] remove retries --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5eb3e27d203..7e89714037d 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ ], "dev": [ "Composer\\Config::disableProcessTimeout", - "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite --restart-tries=3" + "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite" ] }, "extra": { From 6c3d2fb4a0182355abc90972315a8caaab5aa435 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 14 Oct 2024 09:25:43 -0500 Subject: [PATCH 5/5] adjust colors --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7e89714037d..f11346e3b09 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ ], "dev": [ "Composer\\Config::disableProcessTimeout", - "npx concurrently -k -c \"#93c5fd,#c4b5fd,#d4d4d8,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite" + "npx concurrently -k -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail\" \"npm run dev\" --names=server,queue,logs,vite" ] }, "extra": {