Update workflow to fix issues with the concurrency check (#302)

joetannenbaum · WendellAdriel · web-flow · commit a82975b9cf7e · 2026-02-25T15:51:12.000Z
Co-authored-by: WendellAdriel &lt;11641518+WendellAdriel@users.noreply.github.com&gt;
Co-authored-by: WendellAdriel &lt;me@wendelladriel.com&gt;
diff --git a/app/Concerns/PasswordValidationRules.php b/app/Concerns/PasswordValidationRules.php
@@ -2,14 +2,15 @@
 
 namespace App\Concerns;
 
+use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Validation\Rules\Password;
 
 trait PasswordValidationRules
 {
     /**
      * Get the validation rules used to validate passwords.
      *
-     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
+     * @return array<int, Rule|array<mixed>|string>
      */
     protected function passwordRules(): array
     {
@@ -19,7 +20,7 @@ protected function passwordRules(): array
     /**
      * Get the validation rules used to validate the current password.
      *
-     * @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
+     * @return array<int, Rule|array<mixed>|string>
      */
     protected function currentPasswordRules(): array
     {
diff --git a/app/Http/Middleware/HandleAppearance.php b/app/Http/Middleware/HandleAppearance.php
@@ -12,7 +12,7 @@ class HandleAppearance
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {
diff --git a/app/Http/Requests/Settings/TwoFactorAuthenticationRequest.php b/app/Http/Requests/Settings/TwoFactorAuthenticationRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\Settings;
 
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Laravel\Fortify\Features;
 use Laravel\Fortify\InteractsWithTwoFactorState;
@@ -21,7 +22,7 @@ public function authorize(): bool
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     * @return array<string, ValidationRule|array<mixed>|string>
      */
     public function rules(): array
     {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -44,7 +44,7 @@ protected function configureDefaults(): void
                 ->numbers()
                 ->symbols()
                 ->uncompromised()
-            : null
+            : null,
         );
     }
 }
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
@@ -1,6 +1,9 @@
 <?php
 
+use App\Providers\AppServiceProvider;
+use App\Providers\FortifyServiceProvider;
+
 return [
-    App\Providers\AppServiceProvider::class,
-    App\Providers\FortifyServiceProvider::class,
+    AppServiceProvider::class,
+    FortifyServiceProvider::class,
 ];
diff --git a/config/app.php b/config/app.php
@@ -101,7 +101,7 @@
 
     'previous_keys' => [
         ...array_filter(
-            explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
+            explode(',', (string) env('APP_PREVIOUS_KEYS', '')),
         ),
     ],
 
diff --git a/config/auth.php b/config/auth.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\User;
+
 return [
 
     /*
@@ -62,7 +64,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+            'model' => env('AUTH_MODEL', User::class),
         ],
 
         // 'users' => [
diff --git a/config/database.php b/config/database.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Str;
+use Pdo\Mysql;
 
 return [
 
@@ -59,7 +60,7 @@
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([
-                (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
+                (PHP_VERSION_ID >= 80500 ? Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
@@ -79,7 +80,7 @@
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([
-                (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
+                (PHP_VERSION_ID >= 80500 ? Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
diff --git a/config/session.php b/config/session.php
@@ -129,7 +129,7 @@
 
     'cookie' => env(
         'SESSION_COOKIE',
-        Str::slug((string) env('APP_NAME', 'laravel')).'-session'
+        Str::slug((string) env('APP_NAME', 'laravel')).'-session',
     ),
 
     /*
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,14 +1,11 @@
 import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript';
-import prettier from 'eslint-config-prettier';
+import prettier from 'eslint-config-prettier/flat';
 import importPlugin from 'eslint-plugin-import';
 import vue from 'eslint-plugin-vue';
 
 export default defineConfigWithVueTs(
     vue.configs['flat/essential'],
     vueTsConfigs.recommended,
-    {
-        ignores: ['vendor', 'node_modules', 'public', 'bootstrap/ssr', 'tailwind.config.js', 'vite.config.ts', 'resources/js/components/ui/*'],
-    },
     {
         plugins: {
             import: importPlugin,
@@ -19,6 +16,7 @@ export default defineConfigWithVueTs(
                     alwaysTryTypes: true,
                     project: './tsconfig.json',
                 },
+                node: true,
             },
         },
         rules: {
@@ -41,7 +39,22 @@ export default defineConfigWithVueTs(
                     },
                 },
             ],
+            'import/consistent-type-specifier-style': [
+                'error',
+                'prefer-top-level',
+            ],
         },
     },
-    prettier,
+    {
+        ignores: [
+            'vendor',
+            'node_modules',
+            'public',
+            'bootstrap/ssr',
+            'tailwind.config.js',
+            'vite.config.ts',
+            'resources/js/components/ui/*',
+        ],
+    },
+    prettier, // Turn off all rules that might conflict with Prettier
 );
diff --git a/resources/js/components/AppSidebar.vue b/resources/js/components/AppSidebar.vue
@@ -13,7 +13,7 @@ import {
     SidebarMenuButton,
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
 import AppLogo from './AppLogo.vue';
 import { dashboard } from '@/routes';
 
diff --git a/resources/js/components/NavFooter.vue b/resources/js/components/NavFooter.vue
@@ -7,7 +7,7 @@ import {
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
 import { toUrl } from '@/lib/utils';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
 
 type Props = {
     items: NavItem[];
diff --git a/resources/js/components/NavMain.vue b/resources/js/components/NavMain.vue
@@ -8,7 +8,7 @@ import {
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
 import { useCurrentUrl } from '@/composables/useCurrentUrl';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
 
 defineProps<{
     items: NavItem[];
diff --git a/resources/js/components/NavUser.vue b/resources/js/components/NavUser.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { usePage } from '@inertiajs/vue3';
 import { ChevronsUpDown } from 'lucide-vue-next';
+import { computed } from 'vue';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -16,7 +17,7 @@ import UserInfo from '@/components/UserInfo.vue';
 import UserMenuContent from './UserMenuContent.vue';
 
 const page = usePage();
-const user = page.props.auth.user;
+const user = computed(() => page.props.auth.user);
 const { isMobile, state } = useSidebar();
 </script>
 
diff --git a/resources/js/layouts/settings/Layout.vue b/resources/js/layouts/settings/Layout.vue
@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
 import { useCurrentUrl } from '@/composables/useCurrentUrl';
 import { toUrl } from '@/lib/utils';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
 import { edit as editAppearance } from '@/routes/appearance';
 import { edit as editProfile } from '@/routes/profile';
 import { show } from '@/routes/two-factor';
diff --git a/resources/js/lib/utils.ts b/resources/js/lib/utils.ts
@@ -1,5 +1,6 @@
 import type { InertiaLinkProps } from '@inertiajs/vue3';
-import { clsx, type ClassValue } from 'clsx';
+import { clsx } from 'clsx';
+import type { ClassValue } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 
 export function cn(...inputs: ClassValue[]) {
diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3';
 import AppLayout from '@/layouts/AppLayout.vue';
-import { type BreadcrumbItem } from '@/types';
+import type { BreadcrumbItem } from '@/types';
 import PlaceholderPattern from '../components/PlaceholderPattern.vue';
 import { dashboard } from '@/routes';
 
diff --git a/resources/js/pages/settings/Appearance.vue b/resources/js/pages/settings/Appearance.vue
@@ -4,7 +4,7 @@ import AppearanceTabs from '@/components/AppearanceTabs.vue';
 import Heading from '@/components/Heading.vue';
 import AppLayout from '@/layouts/AppLayout.vue';
 import SettingsLayout from '@/layouts/settings/Layout.vue';
-import { type BreadcrumbItem } from '@/types';
+import type { BreadcrumbItem } from '@/types';
 import { edit } from '@/routes/appearance';
 
 const breadcrumbItems: BreadcrumbItem[] = [
diff --git a/resources/js/pages/settings/Password.vue b/resources/js/pages/settings/Password.vue
@@ -7,7 +7,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import AppLayout from '@/layouts/AppLayout.vue';
 import SettingsLayout from '@/layouts/settings/Layout.vue';
-import { type BreadcrumbItem } from '@/types';
+import type { BreadcrumbItem } from '@/types';
 import PasswordController from '@/actions/App/Http/Controllers/Settings/PasswordController';
 import { edit } from '@/routes/user-password';
 
diff --git a/resources/js/pages/settings/Profile.vue b/resources/js/pages/settings/Profile.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { Form, Head, Link, usePage } from '@inertiajs/vue3';
+import { computed } from 'vue';
 import DeleteUser from '@/components/DeleteUser.vue';
 import Heading from '@/components/Heading.vue';
 import InputError from '@/components/InputError.vue';
@@ -8,7 +9,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import AppLayout from '@/layouts/AppLayout.vue';
 import SettingsLayout from '@/layouts/settings/Layout.vue';
-import { type BreadcrumbItem } from '@/types';
+import type { BreadcrumbItem } from '@/types';
 import ProfileController from '@/actions/App/Http/Controllers/Settings/ProfileController';
 import { edit } from '@/routes/profile';
 import { send } from '@/routes/verification';
@@ -28,7 +29,7 @@ const breadcrumbItems: BreadcrumbItem[] = [
 ];
 
 const page = usePage();
-const user = page.props.auth.user;
+const user = computed(() => page.props.auth.user);
 </script>
 
 <template>
diff --git a/routes/settings.php b/routes/settings.php
@@ -4,7 +4,6 @@
 use App\Http\Controllers\Settings\ProfileController;
 use App\Http\Controllers\Settings\TwoFactorAuthenticationController;
 use Illuminate\Support\Facades\Route;
-use Inertia\Inertia;
 
 Route::middleware(['auth'])->group(function () {
     Route::redirect('settings', '/settings/profile');
@@ -22,9 +21,7 @@
         ->middleware('throttle:6,1')
         ->name('user-password.update');
 
-    Route::get('settings/appearance', function () {
-        return Inertia::render('settings/Appearance');
-    })->name('appearance.edit');
+    Route::inertia('settings/appearance', 'settings/Appearance')->name('appearance.edit');
 
     Route::get('settings/two-factor', [TwoFactorAuthenticationController::class, 'show'])
         ->name('two-factor.show');
diff --git a/routes/web.php b/routes/web.php
@@ -1,17 +1,14 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Inertia\Inertia;
 use Laravel\Fortify\Features;
 
-Route::get('/', function () {
-    return Inertia::render('Welcome', [
-        'canRegister' => Features::enabled(Features::registration()),
-    ]);
-})->name('home');
+Route::inertia('/', 'Welcome', [
+    'canRegister' => Features::enabled(Features::registration()),
+])->name('home');
 
-Route::get('dashboard', function () {
-    return Inertia::render('Dashboard');
-})->middleware(['auth', 'verified'])->name('dashboard');
+Route::middleware(['auth', 'verified'])->group(function () {
+    Route::inertia('dashboard', 'Dashboard')->name('dashboard');
+});
 
 require __DIR__.'/settings.php';
diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php
@@ -31,7 +31,7 @@ public function test_email_can_be_verified()
         $verificationUrl = URL::temporarySignedRoute(
             'verification.verify',
             now()->addMinutes(60),
-            ['id' => $user->id, 'hash' => sha1($user->email)]
+            ['id' => $user->id, 'hash' => sha1($user->email)],
         );
 
         $response = $this->actingAs($user)->get($verificationUrl);
@@ -50,7 +50,7 @@ public function test_email_is_not_verified_with_invalid_hash()
         $verificationUrl = URL::temporarySignedRoute(
             'verification.verify',
             now()->addMinutes(60),
-            ['id' => $user->id, 'hash' => sha1('wrong-email')]
+            ['id' => $user->id, 'hash' => sha1('wrong-email')],
         );
 
         $this->actingAs($user)->get($verificationUrl);
@@ -68,7 +68,7 @@ public function test_email_is_not_verified_with_invalid_user_id(): void
         $verificationUrl = URL::temporarySignedRoute(
             'verification.verify',
             now()->addMinutes(60),
-            ['id' => 123, 'hash' => sha1($user->email)]
+            ['id' => 123, 'hash' => sha1($user->email)],
         );
 
         $this->actingAs($user)->get($verificationUrl);
@@ -98,7 +98,7 @@ public function test_already_verified_user_visiting_verification_link_is_redirec
         $verificationUrl = URL::temporarySignedRoute(
             'verification.verify',
             now()->addMinutes(60),
-            ['id' => $user->id, 'hash' => sha1($user->email)]
+            ['id' => $user->id, 'hash' => sha1($user->email)],
         );
 
         $this->actingAs($user)->get($verificationUrl)
diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php
@@ -20,7 +20,7 @@ public function test_confirm_password_screen_can_be_rendered()
         $response->assertOk();
 
         $response->assertInertia(fn (Assert $page) => $page
-            ->component('auth/ConfirmPassword')
+            ->component('auth/ConfirmPassword'),
         );
     }
 
diff --git a/tests/Feature/Auth/TwoFactorChallengeTest.php b/tests/Feature/Auth/TwoFactorChallengeTest.php
@@ -50,7 +50,7 @@ public function test_two_factor_challenge_can_be_rendered(): void
         $this->get(route('two-factor.login'))
             ->assertOk()
             ->assertInertia(fn (Assert $page) => $page
-                ->component('auth/TwoFactorChallenge')
+                ->component('auth/TwoFactorChallenge'),
             );
     }
 }
diff --git a/tests/Feature/Settings/TwoFactorAuthenticationTest.php b/tests/Feature/Settings/TwoFactorAuthenticationTest.php
diff --git a/vite.config.ts b/vite.config.ts

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace App\Concerns;`
`4`	`4`
	`5`	`+use Illuminate\Contracts\Validation\Rule;`
`5`	`6`	`use Illuminate\Validation\Rules\Password;`
`6`	`7`
`7`	`8`	`trait PasswordValidationRules`
`8`	`9`	`{`
`9`	`10`	`/**`
`10`	`11`	`* Get the validation rules used to validate passwords.`
`11`	`12`	`*`
`12`		`- * @return array<int, \Illuminate\Contracts\Validation\Rule\|array<mixed>\|string>`
	`13`	`+ * @return array<int, Rule\|array<mixed>\|string>`
`13`	`14`	`*/`
`14`	`15`	`protected function passwordRules(): array`
`15`	`16`	`{`
`@@ -19,7 +20,7 @@ protected function passwordRules(): array`
`19`	`20`	`/**`
`20`	`21`	`* Get the validation rules used to validate the current password.`
`21`	`22`	`*`
`22`		`- * @return array<int, \Illuminate\Contracts\Validation\Rule\|array<mixed>\|string>`
	`23`	`+ * @return array<int, Rule\|array<mixed>\|string>`
`23`	`24`	`*/`
`24`	`25`	`protected function currentPasswordRules(): array`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class HandleAppearance`
`12`	`12`	`/**`
`13`	`13`	`* Handle an incoming request.`
`14`	`14`	`*`
`15`		`- * @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next`
	`15`	`+ * @param Closure(Request): (Response) $next`
`16`	`16`	`*/`
`17`	`17`	`public function handle(Request $request, Closure $next): Response`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\Http\Requests\Settings;`
`4`	`4`
	`5`	`+use Illuminate\Contracts\Validation\ValidationRule;`
`5`	`6`	`use Illuminate\Foundation\Http\FormRequest;`
`6`	`7`	`use Laravel\Fortify\Features;`
`7`	`8`	`use Laravel\Fortify\InteractsWithTwoFactorState;`
`@@ -21,7 +22,7 @@ public function authorize(): bool`
`21`	`22`	`/**`
`22`	`23`	`* Get the validation rules that apply to the request.`
`23`	`24`	`*`
`24`		`- * @return array<string, \Illuminate\Contracts\Validation\ValidationRule\|array<mixed>\|string>`
	`25`	`+ * @return array<string, ValidationRule\|array<mixed>\|string>`
`25`	`26`	`*/`
`26`	`27`	`public function rules(): array`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function configureDefaults(): void`
`44`	`44`	`->numbers()`
`45`	`45`	`->symbols()`
`46`	`46`	`->uncompromised()`
`47`		`- : null`
	`47`	`+ : null,`
`48`	`48`	`);`
`49`	`49`	`}`
`50`	`50`	`}`