diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f6d2e40..5063d2adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes -## [Unreleased](https://github.com/laravel/jetstream/compare/v3.3.3...3.x) +## [Unreleased](https://github.com/laravel/jetstream/compare/v4.0.0...4.x) + +## [v4.0.0](https://github.com/laravel/jetstream/compare/v3.3.3...v4.0.0) - 2023-08-24 + +- Livewire `v3.x` support in https://github.com/laravel/jetstream/pull/1360 ## [v3.3.3](https://github.com/laravel/jetstream/compare/v3.3.2...v3.3.3) - 2023-08-23 diff --git a/README.md b/README.md index d8e605ee9..4b6df3116 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Laravel Jetstream is a beautifully designed application scaffolding for Laravel. Jetstream provides the perfect starting point for your next Laravel application and includes login, registration, email verification, two-factor authentication, session management, API support via [Laravel Sanctum](https://github.com/laravel/sanctum), and optional team management. -Jetstream is designed using [Tailwind CSS](https://tailwindcss.com) and offers your choice of [Livewire](https://jetstream.laravel.com/2.x/stacks/livewire.html) or [Inertia](https://jetstream.laravel.com/2.x/stacks/inertia.html) scaffolding. +Jetstream is designed using [Tailwind CSS](https://tailwindcss.com) and offers your choice of [Livewire](https://jetstream.laravel.com/stacks/livewire.html) or [Inertia](https://jetstream.laravel.com/stacks/inertia.html) scaffolding. ## Official Documentation diff --git a/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php b/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php index 939065fa8..dc9b4f577 100644 --- a/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php +++ b/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php @@ -30,12 +30,12 @@ public function version(Request $request): ?string */ public function share(Request $request): array { - return array_merge(parent::share($request), [ - 'ziggy' => function () use ($request) { - return array_merge((new Ziggy)->toArray(), [ - 'location' => $request->url(), - ]); - }, - ]); + return [ + ...parent::share($request), + 'ziggy' => fn () => [ + ...(new Ziggy)->toArray(), + 'location' => $request->url(), + ], + ]; } }