[pull] main from laravel:main

eslint.config.js

@@ -43,7 +43,6 @@ export default [
                 'error',
                 {
                     groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
-                    'newlines-between': 'always',
                     alphabetize: {
                         order: 'asc',
                         caseInsensitive: true,
@@ -55,9 +54,18 @@ export default [
     {
         ...importPlugin.flatConfigs.typescript,
         files: ['**/*.{ts,tsx}'],
+        rules: {
+            '@typescript-eslint/consistent-type-imports': [
+                'error',
+                {
+                    prefer: 'type-imports',
+                    fixStyle: 'separate-type-imports',
+                },
+            ],
+        },
     },
     {
-        ignores: ['vendor', 'node_modules', 'public', 'bootstrap/ssr', 'tailwind.config.js'],
+        ignores: ['vendor', 'node_modules', 'public', 'bootstrap/ssr', 'tailwind.config.js', 'vite.config.ts'],
     },
     prettier, // Turn off all rules that might conflict with Prettier
 ];

resources/js/app.tsx

@@ -1,10 +1,8 @@
-import '../css/app.css';
-
 import { createInertiaApp } from '@inertiajs/react';
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
-
+import '../css/app.css';
 import { initializeTheme } from './hooks/use-appearance';
 
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';

resources/js/components/alert-error.tsx

@@ -1,6 +1,5 @@
-import { AlertCircleIcon } from 'lucide-react';
-
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
+import { AlertCircleIcon } from 'lucide-react';
 
 export default function AlertError({
     errors,

resources/js/components/app-content.tsx

@@ -1,16 +1,11 @@
-import * as React from 'react';
-
 import { SidebarInset } from '@/components/ui/sidebar';
+import * as React from 'react';
 
-interface AppContentProps extends React.ComponentProps<'main'> {
+type Props = React.ComponentProps<'main'> & {
     variant?: 'header' | 'sidebar';
-}
+};
 
-export function AppContent({
-    variant = 'header',
-    children,
-    ...props
-}: AppContentProps) {
+export function AppContent({ variant = 'header', children, ...props }: Props) {
     if (variant === 'sidebar') {
         return <SidebarInset {...props}>{children}</SidebarInset>;
     }

resources/js/components/app-header.tsx

@@ -1,6 +1,3 @@
-import { Link, usePage } from '@inertiajs/react';
-import { BookOpen, Folder, LayoutGrid, Menu, Search } from 'lucide-react';
-
 import { Breadcrumbs } from '@/components/breadcrumbs';
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { Button } from '@/components/ui/button';
@@ -33,11 +30,16 @@ import { useCurrentUrl } from '@/hooks/use-current-url';
 import { useInitials } from '@/hooks/use-initials';
 import { cn, toUrl } from '@/lib/utils';
 import { dashboard } from '@/routes';
-import { type BreadcrumbItem, type NavItem, type SharedData } from '@/types';
-
+import type { BreadcrumbItem, NavItem, SharedData } from '@/types';
+import { Link, usePage } from '@inertiajs/react';
+import { BookOpen, Folder, LayoutGrid, Menu, Search } from 'lucide-react';
 import AppLogo from './app-logo';
 import AppLogoIcon from './app-logo-icon';
 
+type Props = {
+    breadcrumbs?: BreadcrumbItem[];
+};
+
 const mainNavItems: NavItem[] = [
     {
         title: 'Dashboard',
@@ -62,11 +64,7 @@ const rightNavItems: NavItem[] = [
 const activeItemStyles =
     'text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100';
 
-interface AppHeaderProps {
-    breadcrumbs?: BreadcrumbItem[];
-}
-
-export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
+export function AppHeader({ breadcrumbs = [] }: Props) {
     const page = usePage<SharedData>();
     const { auth } = page.props;
     const getInitials = useInitials();

resources/js/components/app-logo-icon.tsx

@@ -1,4 +1,4 @@
-import { SVGAttributes } from 'react';
+import type { SVGAttributes } from 'react';
 
 export default function AppLogoIcon(props: SVGAttributes<SVGElement>) {
     return (

resources/js/components/app-shell.tsx

@@ -1,14 +1,14 @@
-import { usePage } from '@inertiajs/react';
-
 import { SidebarProvider } from '@/components/ui/sidebar';
-import { SharedData } from '@/types';
+import type { SharedData } from '@/types';
+import { usePage } from '@inertiajs/react';
+import type { ReactNode } from 'react';
 
-interface AppShellProps {
-    children: React.ReactNode;
+type Props = {
+    children: ReactNode;
     variant?: 'header' | 'sidebar';
-}
+};
 
-export function AppShell({ children, variant = 'header' }: AppShellProps) {
+export function AppShell({ children, variant = 'header' }: Props) {
     const isOpen = usePage<SharedData>().props.sidebarOpen;
 
     if (variant === 'header') {

resources/js/components/app-sidebar-header.tsx

@@ -1,6 +1,6 @@
 import { Breadcrumbs } from '@/components/breadcrumbs';
 import { SidebarTrigger } from '@/components/ui/sidebar';
-import { type BreadcrumbItem as BreadcrumbItemType } from '@/types';
+import type { BreadcrumbItem as BreadcrumbItemType } from '@/types';
 
 export function AppSidebarHeader({
     breadcrumbs = [],

resources/js/components/app-sidebar.tsx

@@ -1,6 +1,3 @@
-import { Link } from '@inertiajs/react';
-import { BookOpen, Folder, LayoutGrid } from 'lucide-react';
-
 import { NavFooter } from '@/components/nav-footer';
 import { NavMain } from '@/components/nav-main';
 import { NavUser } from '@/components/nav-user';
@@ -14,8 +11,9 @@ import {
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
 import { dashboard } from '@/routes';
-import { type NavItem } from '@/types';
-
+import type { NavItem } from '@/types';
+import { Link } from '@inertiajs/react';
+import { BookOpen, Folder, LayoutGrid } from 'lucide-react';
 import AppLogo from './app-logo';
 
 const mainNavItems: NavItem[] = [

resources/js/components/appearance-tabs.tsx

@@ -1,8 +1,9 @@
-import { LucideIcon, Monitor, Moon, Sun } from 'lucide-react';
-import { HTMLAttributes } from 'react';
-
-import { Appearance, useAppearance } from '@/hooks/use-appearance';
+import type { Appearance } from '@/hooks/use-appearance';
+import { useAppearance } from '@/hooks/use-appearance';
 import { cn } from '@/lib/utils';
+import type { LucideIcon } from 'lucide-react';
+import { Monitor, Moon, Sun } from 'lucide-react';
+import type { HTMLAttributes } from 'react';
 
 export default function AppearanceToggleTab({
     className = '',

resources/js/components/breadcrumbs.tsx

@@ -1,6 +1,3 @@
-import { Link } from '@inertiajs/react';
-import { Fragment } from 'react';
-
 import {
     Breadcrumb,
     BreadcrumbItem,
@@ -9,7 +6,9 @@ import {
     BreadcrumbPage,
     BreadcrumbSeparator,
 } from '@/components/ui/breadcrumb';
-import { type BreadcrumbItem as BreadcrumbItemType } from '@/types';
+import type { BreadcrumbItem as BreadcrumbItemType } from '@/types';
+import { Link } from '@inertiajs/react';
+import { Fragment } from 'react';
 
 export function Breadcrumbs({
     breadcrumbs,

resources/js/components/delete-user.tsx

@@ -1,6 +1,3 @@
-import { Form } from '@inertiajs/react';
-import { useRef } from 'react';
-
 import ProfileController from '@/actions/App/Http/Controllers/Settings/ProfileController';
 import Heading from '@/components/heading';
 import InputError from '@/components/input-error';
@@ -16,6 +13,8 @@ import {
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Form } from '@inertiajs/react';
+import { useRef } from 'react';
 
 export default function DeleteUser() {
     const passwordInput = useRef<HTMLInputElement>(null);

resources/js/components/input-error.tsx

@@ -1,6 +1,5 @@
-import { type HTMLAttributes } from 'react';
-
 import { cn } from '@/lib/utils';
+import type { HTMLAttributes } from 'react';
 
 export default function InputError({
     message,

resources/js/components/nav-footer.tsx

@@ -1,5 +1,3 @@
-import { type ComponentPropsWithoutRef } from 'react';
-
 import {
     SidebarGroup,
     SidebarGroupContent,
@@ -8,7 +6,8 @@ import {
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
 import { toUrl } from '@/lib/utils';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
+import type { ComponentPropsWithoutRef } from 'react';
 
 export function NavFooter({
     items,

resources/js/components/nav-main.tsx

@@ -1,5 +1,3 @@
-import { Link } from '@inertiajs/react';
-
 import {
     SidebarGroup,
     SidebarGroupLabel,
@@ -8,7 +6,8 @@ import {
     SidebarMenuItem,
 } from '@/components/ui/sidebar';
 import { useCurrentUrl } from '@/hooks/use-current-url';
-import { type NavItem } from '@/types';
+import type { NavItem } from '@/types';
+import { Link } from '@inertiajs/react';
 
 export function NavMain({ items = [] }: { items: NavItem[] }) {
     const { isCurrentUrl } = useCurrentUrl();

resources/js/components/nav-user.tsx

@@ -1,6 +1,3 @@
-import { usePage } from '@inertiajs/react';
-import { ChevronsUpDown } from 'lucide-react';
-
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -15,7 +12,9 @@ import {
 import { UserInfo } from '@/components/user-info';
 import { UserMenuContent } from '@/components/user-menu-content';
 import { useIsMobile } from '@/hooks/use-mobile';
-import { type SharedData } from '@/types';
+import type { SharedData } from '@/types';
+import { usePage } from '@inertiajs/react';
+import { ChevronsUpDown } from 'lucide-react';
 
 export function NavUser() {
     const { auth } = usePage<SharedData>().props;

resources/js/components/text-link.tsx

@@ -1,15 +1,14 @@
-import { Link } from '@inertiajs/react';
-import { ComponentProps } from 'react';
-
 import { cn } from '@/lib/utils';
+import { Link } from '@inertiajs/react';
+import type { ComponentProps } from 'react';
 
-type LinkProps = ComponentProps<typeof Link>;
+type Props = ComponentProps<typeof Link>;
 
 export default function TextLink({
     className = '',
     children,
     ...props
-}: LinkProps) {
+}: Props) {
     return (
         <Link
             className={cn(

resources/js/components/two-factor-recovery-codes.tsx

@@ -1,7 +1,3 @@
-import { Form } from '@inertiajs/react';
-import { Eye, EyeOff, LockKeyhole, RefreshCw } from 'lucide-react';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
 import { Button } from '@/components/ui/button';
 import {
     Card,
@@ -11,20 +7,22 @@ import {
     CardTitle,
 } from '@/components/ui/card';
 import { regenerateRecoveryCodes } from '@/routes/two-factor';
-
+import { Form } from '@inertiajs/react';
+import { Eye, EyeOff, LockKeyhole, RefreshCw } from 'lucide-react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import AlertError from './alert-error';
 
-interface TwoFactorRecoveryCodesProps {
+type Props = {
     recoveryCodesList: string[];
     fetchRecoveryCodes: () => Promise<void>;
     errors: string[];
-}
+};
 
 export default function TwoFactorRecoveryCodes({
     recoveryCodesList,
     fetchRecoveryCodes,
     errors,
-}: TwoFactorRecoveryCodesProps) {
+}: Props) {
     const [codesAreVisible, setCodesAreVisible] = useState<boolean>(false);
     const codesSectionRef = useRef<HTMLDivElement | null>(null);
     const canRegenerateCodes = recoveryCodesList.length > 0 && codesAreVisible;

resources/js/components/two-factor-setup-modal.tsx

@@ -1,8 +1,3 @@
-import { Form } from '@inertiajs/react';
-import { REGEXP_ONLY_DIGITS } from 'input-otp';
-import { Check, Copy, ScanLine } from 'lucide-react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-
 import InputError from '@/components/input-error';
 import { Button } from '@/components/ui/button';
 import {
@@ -21,7 +16,10 @@ import { useAppearance } from '@/hooks/use-appearance';
 import { useClipboard } from '@/hooks/use-clipboard';
 import { OTP_MAX_LENGTH } from '@/hooks/use-two-factor-auth';
 import { confirm } from '@/routes/two-factor';
-
+import { Form } from '@inertiajs/react';
+import { REGEXP_ONLY_DIGITS } from 'input-otp';
+import { Check, Copy, ScanLine } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import AlertError from './alert-error';
 import { Spinner } from './ui/spinner';
 
@@ -230,7 +228,7 @@ function TwoFactorVerificationStep({
     );
 }
 
-interface TwoFactorSetupModalProps {
+type Props = {
     isOpen: boolean;
     onClose: () => void;
     requiresConfirmation: boolean;
@@ -240,7 +238,7 @@ interface TwoFactorSetupModalProps {
     clearSetupData: () => void;
     fetchSetupData: () => Promise<void>;
     errors: string[];
-}
+};
 
 export default function TwoFactorSetupModal({
     isOpen,
@@ -252,7 +250,7 @@ export default function TwoFactorSetupModal({
     clearSetupData,
     fetchSetupData,
     errors,
-}: TwoFactorSetupModalProps) {
+}: Props) {
     const [showVerificationStep, setShowVerificationStep] =
         useState<boolean>(false);
 

resources/js/components/ui/icon.tsx

@@ -1,4 +1,4 @@
-import { LucideIcon } from 'lucide-react';
+import type { LucideIcon } from 'lucide-react';
 
 interface IconProps {
     iconNode?: LucideIcon | null;

resources/js/components/ui/sidebar.tsx

@@ -1,5 +1,6 @@
 import { Slot } from "@radix-ui/react-slot"
-import { VariantProps, cva } from "class-variance-authority"
+import type { VariantProps} from "class-variance-authority";
+import { cva } from "class-variance-authority"
 import { PanelLeftCloseIcon, PanelLeftOpenIcon } from "lucide-react"
 import * as React from "react"
 

resources/js/components/user-info.tsx

@@ -1,6 +1,6 @@
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { useInitials } from '@/hooks/use-initials';
-import { type User } from '@/types';
+import type { User } from '@/types';
 
 export function UserInfo({
     user,