Bump Inertia version from 1.3 to 2.0

VampireAotD · Dec 17, 2024 · fa0bbc1 · fa0bbc1
1 parent 27f20f1
commit fa0bbc1
Show file tree

Hide file tree

Showing 28 changed files with 883 additions and 839 deletions.
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         node-version: [ 22.x ]
-        pnpm-version: [ 9.14 ]
+        pnpm-version: [ 9.15 ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         node-version: [ 22.x ]
-        pnpm-version: [ 9.14 ]
+        pnpm-version: [ 9.15 ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -3,7 +3,7 @@
 ARG PHP_VERSION=8.3.13
 ARG COMPOSER_VERSION=2.8.3
 ARG NODE_VERSION=22.11
-ARG PNPM_VERSION=9.14.4
+ARG PNPM_VERSION=9.15.0
 
 FROM node:${NODE_VERSION}-alpine AS node
 

diff --git a/src/app/Http/Controllers/Anime/AnimeController.php b/src/app/Http/Controllers/Anime/AnimeController.php
@@ -43,24 +43,23 @@ public function __construct(
      */
     public function index(IndexRequest $request): Response
     {
-        $items = $this->animeIndexService->paginate(
-            new AnimePaginationDTO(
-                page   : $request->integer('page', 1),
-                perPage: $request->integer('perPage', 20),
-                filters: $request->get('filters', []),
-                sort   : $request->get('sort', [])
-            )
-        );
-
-        $filters = $this->animeIndexService->getFacets();
-
-        return Inertia::render('Anime/Index', compact('items', 'filters'));
+        return Inertia::render('Anime/Index', [
+            'items' => Inertia::defer(fn() => $this->animeIndexService->paginate(
+                new AnimePaginationDTO(
+                    page   : $request->integer('page', 1),
+                    perPage: $request->integer('perPage', 20),
+                    filters: $request->get('filters', []),
+                    sort   : $request->get('sort', [])
+                )
+            )),
+            'filters' => Inertia::defer(fn() => $this->animeIndexService->getFacets()),
+        ]);
     }
 
     /**
      * Show the form for creating a new resource.
      */
-    public function create()
+    public function create(): Response
     {
         $statuses    = StatusEnum::values();
         $genres      = $this->genreService->all([new ColumnFilter(['name'])])->pluck('name')->toArray();
@@ -85,22 +84,20 @@ public function store(CreateRequest $request): RedirectResponse
      */
     public function show(Request $request, Anime $anime): Response
     {
-        $anime->load([
-            'image:id,path',
-            'urls:anime_id,url',
-            'synonyms:anime_id,name',
-            'voiceActing:name',
-            'genres:name',
+        return Inertia::render('Anime/Show', [
+            'anime' => $anime->load([
+                'image:id,path',
+                'urls:anime_id,url',
+                'synonyms:anime_id,name',
+                'voiceActing:name',
+                'genres:name',
+            ]),
+            'animeListStatuses' => AnimeListStatusEnum::cases(),
+            'animeListEntry'    => Inertia::defer(
+                fn() => $this->userAnimeListService->findById($request->user(), $anime->id)
+            ),
+            'animeListStatistic' => Inertia::defer(fn() => $this->userAnimeListService->animeStatistics($anime->id)),
         ]);
-
-        $animeListEntry     = $this->userAnimeListService->findById($request->user(), $anime->id);
-        $animeListStatuses  = AnimeListStatusEnum::cases();
-        $animeListStatistic = $this->userAnimeListService->animeStatistics($anime->id);
-
-        return Inertia::render(
-            'Anime/Show',
-            compact('anime', 'animeListEntry', 'animeListStatuses', 'animeListStatistic')
-        );
     }
 
     /**

diff --git a/src/app/Http/Controllers/Auth/LoginController.php b/src/app/Http/Controllers/Auth/LoginController.php
@@ -52,6 +52,8 @@ public function destroy(Request $request): RedirectResponse
 
         $request->session()->regenerateToken();
 
+        Inertia::clearHistory();
+
         return redirect('/');
     }
 }
diff --git a/src/app/Http/Controllers/Dashboard/DashboardController.php b/src/app/Http/Controllers/Dashboard/DashboardController.php
@@ -9,18 +9,18 @@
 use Inertia\Inertia;
 use Inertia\Response;
 
-class DashboardController extends Controller
+final class DashboardController extends Controller
 {
     public function __construct(private readonly AnimeService $animeService)
     {
     }
 
-    public function index(): Response
+    public function __invoke(): Response
     {
-        $latestAnime      = $this->animeService->getTenLatestAnime();
-        $completedAnime   = $this->animeService->getTenLatestReleasedAnime();
-        $mostPopularAnime = $this->animeService->getTenMostPopularAnime();
-
-        return Inertia::render('Dashboard/Index', compact('latestAnime', 'completedAnime', 'mostPopularAnime'));
+        return Inertia::render('Dashboard/Index', [
+            'latestAnime'      => $this->animeService->getTenLatestAnime(),
+            'completedAnime'   => Inertia::defer(fn() => $this->animeService->getTenLatestReleasedAnime(), 'lists'),
+            'mostPopularAnime' => Inertia::defer(fn() => $this->animeService->getTenMostPopularAnime(), 'lists'),
+        ]);
     }
 }
diff --git a/src/app/Http/Controllers/Profile/ProfileController.php b/src/app/Http/Controllers/Profile/ProfileController.php
@@ -14,13 +14,15 @@
 use Inertia\Inertia;
 use Inertia\Response;
 
-class ProfileController extends Controller
+final class ProfileController extends Controller
 {
     /**
      * Display the user's profile form.
      */
     public function edit(Request $request): Response
     {
+        $request->user()->load('telegramUser:user_id,username');
+
         return Inertia::render('Profile/Edit', [
             'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
             'status'          => session('status'),

diff --git a/src/app/Http/Middleware/HandleInertiaRequests.php b/src/app/Http/Middleware/HandleInertiaRequests.php
@@ -35,7 +35,7 @@ public function share(Request $request): array
         return [
             ...parent::share($request),
             'auth' => [
-                'user' => $request->user()?->load(['roles:name', 'telegramUser:user_id,username']),
+                'user' => $request->user()?->load(['roles:name']),
             ],
             'flash' => [
                 'message' => fn() => $request->session()->get('message'),

diff --git a/src/composer.json b/src/composer.json
@@ -11,17 +11,17 @@
     "license": "BSL-1.0",
     "require": {
         "php": "^8.3",
-        "aws/aws-sdk-php": "^3.333.0",
+        "aws/aws-sdk-php": "^3.334.6",
         "cloudinary-labs/cloudinary-laravel": "^2.2.2",
         "elasticsearch/elasticsearch": "^8.16.0",
         "firebase/php-jwt": "^6.10.2",
         "guzzlehttp/guzzle": "^7.9.2",
-        "inertiajs/inertia-laravel": "^1.3.1",
+        "inertiajs/inertia-laravel": "^2.0.0",
         "laravel/framework": "v11.34.2",
-        "laravel/horizon": "^5.29.4",
+        "laravel/horizon": "^5.30.0",
         "laravel/octane": "^2.6.0",
-        "laravel/reverb": "^1.4.3",
-        "laravel/sanctum": "^4.0.5",
+        "laravel/reverb": "^1.4.4",
+        "laravel/sanctum": "^4.0.6",
         "laravel/tinker": "^2.10.0",
         "nutgram/laravel": "^1.4.3",
         "opcodesio/log-viewer": "^3.12.0",