Merge pull request #6 from laravel/github-actions

Use the latest version of `actions/checkout`

Author: tnylea

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: Code Quality
+name: linter
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
   quality:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
       - name: Run Pint
         run: vendor/bin/pint
 
-      - name: Frontend Format
+      - name: Frontend Format Check
         run: npm run format
 
       - name: Frontend Lint
@@ -39,7 +39,8 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: fix code style
-          commit_options: "--no-verify"
+          commit_options: '--no-verify'
 
+      # We need to run PHPStan after commiting changes as it does not auto-fix errors.
       - name: PHPStan
         run: ./vendor/bin/phpstan

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -26,7 +26,7 @@ jobs:
           coverage: xdebug
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'npm'

README.md

@@ -1,7 +1,8 @@
 <p align="center"><a href="https://laravel.com" target="_blank"><img src="https://cdn.devdojo.com/assets/svg/laravel-react-logo.svg" width="300" alt="Laravel Logo"></a></p>
 
 <p align="center">
-<a href="https://github.com/laravel/react-starter-kit/actions"><img src="https://github.com/laravel/react-starter-kit/workflows/tests/badge.svg" alt="Build Status"></a>
+<a href="https://github.com/laravel/react-starter-kit/actions"><img src="https://github.com/laravel/react-starter-kit/workflows/tests/badge.svg" alt="Test Status"></a>
+<a href="https://github.com/laravel/react-starter-kit/actions"><img src="https://github.com/laravel/react-starter-kit/workflows/lint/badge.svg" alt="Lint Status"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
 </p>
 

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -6,7 +6,6 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
 use Inertia\Response;
 

app/Http/Controllers/Auth/VerifyEmailController.php

@@ -4,7 +4,6 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Verified;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Http\RedirectResponse;
 
@@ -20,10 +19,9 @@ public function __invoke(EmailVerificationRequest $request): RedirectResponse
         }
 
         if ($request->user()->markEmailAsVerified()) {
+            /** @var \Illuminate\Contracts\Auth\MustVerifyEmail $user */
             $user = $request->user();
-            if ($user instanceof MustVerifyEmail) {
-                event(new Verified($user));
-            }
+            event(new Verified($user));
         }
 
         return redirect()->intended(route('dashboard', absolute: false).'?verified=1');

resources/js/components/appearance-dropdown.tsx

@@ -27,7 +27,7 @@ export default function AppearanceToggleDropdown({ className = '', ...props }: H
                         <span className="sr-only">Toggle theme</span>
                     </Button>
                 </DropdownMenuTrigger>
-                <DropdownMenuContent align="end" rounded="xl">
+                <DropdownMenuContent align="end">
                     <DropdownMenuItem onClick={() => updateAppearance('light')}>
                         <span className="flex items-center gap-2">
                             <Sun className="h-5 w-5" />

resources/js/components/appearance-tabs.tsx

@@ -1,4 +1,5 @@
 import { Appearance, useAppearance } from '@/hooks/use-appearance';
+import { cn } from '@/lib/utils';
 import { LucideIcon, Monitor, Moon, Sun } from 'lucide-react';
 import { HTMLAttributes } from 'react';
 
@@ -12,16 +13,17 @@ export default function AppearanceToggleTab({ className = '', ...props }: HTMLAt
     ];
 
     return (
-        <div className={`inline-flex gap-1 rounded-lg bg-neutral-100 p-1 dark:bg-neutral-800 ${className}`} {...props}>
+        <div className={cn('inline-flex gap-1 rounded-lg bg-neutral-100 p-1 dark:bg-neutral-800', className)} {...props}>
             {tabs.map(({ value, icon: Icon, label }) => (
                 <button
                     key={value}
                     onClick={() => updateAppearance(value)}
-                    className={`flex items-center rounded-md px-3.5 py-1.5 transition-colors ${
+                    className={cn(
+                        'flex items-center rounded-md px-3.5 py-1.5 transition-colors',
                         appearance === value
                             ? 'bg-white shadow-sm dark:bg-neutral-700 dark:text-neutral-100'
-                            : 'text-neutral-500 hover:bg-neutral-200/60 hover:text-black dark:text-neutral-400 dark:hover:bg-neutral-700/60'
-                    } `}
+                            : 'text-neutral-500 hover:bg-neutral-200/60 hover:text-black dark:text-neutral-400 dark:hover:bg-neutral-700/60',
+                    )}
                 >
                     <Icon className="-ml-1 h-4 w-4" />
                     <span className="ml-1.5 text-sm">{label}</span>

resources/js/components/input-error.tsx

@@ -1,8 +1,9 @@
+import { cn } from '@/lib/utils';
 import { HTMLAttributes } from 'react';
 
 export default function InputError({ message, className = '', ...props }: HTMLAttributes<HTMLParagraphElement> & { message?: string }) {
     return message ? (
-        <p {...props} className={'text-sm text-red-600 dark:text-red-400 ' + className}>
+        <p {...props} className={cn('text-sm text-red-600 dark:text-red-400', className)}>
             {message}
         </p>
     ) : null;

resources/js/components/nav-main.tsx

@@ -12,7 +12,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) {
                     <SidebarMenuItem key={item.title}>
                         <SidebarMenuButton asChild isActive={item.url === page.url}>
                             <Link href={item.url} prefetch>
-                                <item.icon />
+                                {item.icon && <item.icon />}
                                 <span>{item.title}</span>
                             </Link>
                         </SidebarMenuButton>

resources/js/components/text-link.tsx

@@ -1,3 +1,4 @@
+import { cn } from '@/lib/utils';
 import { Link } from '@inertiajs/react';
 import { ComponentProps } from 'react';
 
@@ -6,7 +7,7 @@ type LinkProps = ComponentProps<typeof Link>;
 export default function TextLink({ className = '', children, ...props }: LinkProps) {
     return (
         <Link
-            className={`underline decoration-neutral-400 underline-offset-2 duration-300 ease-out hover:decoration-neutral-700 ${className}`}
+            className={cn('underline decoration-neutral-400 underline-offset-2 duration-300 ease-out hover:decoration-neutral-700', className)}
             {...props}
         >
             {children}