diff --git a/resources/js/Pages/asset-versioning.jsx b/resources/js/Pages/asset-versioning.jsx index d2d8a656..20f6d717 100644 --- a/resources/js/Pages/asset-versioning.jsx +++ b/resources/js/Pages/asset-versioning.jsx @@ -96,11 +96,12 @@ export default function () { return null; } - public function share(Request $request) + public function share(Request $request): array { - return array_merge(parent::share($request), [ + return [ + ...parent::share($request), 'version' => parent::version($request), - ]); + ]; } } `} diff --git a/resources/js/Pages/shared-data.jsx b/resources/js/Pages/shared-data.jsx index c236e870..a12b6ba8 100644 --- a/resources/js/Pages/shared-data.jsx +++ b/resources/js/Pages/shared-data.jsx @@ -38,9 +38,11 @@ export default function () { code: dedent` class HandleInertiaRequests extends Middleware { - public function share(Request $request) + public function share(Request $request): array { - return array_merge(parent::share($request), [ + return [ + ...parent::share($request), + // Synchronously... 'appName' => config('app.name'), @@ -48,7 +50,7 @@ export default function () { 'auth.user' => fn () => $request->user() ? $request->user()->only('id', 'name', 'email') : null, - ]); + ]; } } `, @@ -177,13 +179,14 @@ export default function () { code: dedent` class HandleInertiaRequests extends Middleware { - public function share(Request $request) + public function share(Request $request): array { - return array_merge(parent::share($request), [ + return [ + ...parent::share($request), 'flash' => [ 'message' => fn () => $request->session()->get('message') ], - ]); + ]; } } `,