fix conflicts

Author: taylorotwell

.github/workflows/tests.yml

@@ -37,9 +37,6 @@ jobs:
       - name: Build Assets
         run: npm run build
 
-      - name: Create SQLite Database
-        run: touch database/database.sqlite
-
       - name: Install Dependencies
         run: composer install --no-interaction --prefer-dist --optimize-autoloader
 

.gitignore

@@ -1,4 +1,5 @@
 /.phpunit.cache
+/bootstrap/ssr
 /node_modules
 /public/build
 /public/hot

package.json

@@ -7,7 +7,8 @@
         "dev": "vite",
         "format": "prettier --write resources/",
         "format:check": "prettier --check resources/",
-        "lint": "eslint . --fix"
+        "lint": "eslint . --fix",
+        "types": "tsc --noEmit"
     },
     "devDependencies": {
         "@eslint/js": "^9.19.0",

resources/css/app.css

@@ -2,6 +2,7 @@
 
 @plugin 'tailwindcss-animate';
 
+@source "../views";
 @source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php';
 
 @custom-variant dark (&:is(.dark *));

resources/js/components/app-content.tsx

@@ -1,7 +1,7 @@
 import { SidebarInset } from '@/components/ui/sidebar';
 import * as React from 'react';
 
-interface AppContentProps extends React.ComponentProps<'div'> {
+interface AppContentProps extends React.ComponentProps<'main'> {
     variant?: 'header' | 'sidebar';
 }
 

resources/js/components/app-header.tsx

@@ -63,7 +63,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
                                 <SheetHeader className="flex justify-start text-left">
                                     <AppLogoIcon className="h-6 w-6 fill-current text-black dark:text-white" />
                                 </SheetHeader>
-                                <div className="mt-6 flex h-full flex-1 flex-col space-y-4">
+                                <div className="p-4 flex h-full flex-1 flex-col space-y-4">
                                     <div className="flex h-full flex-col justify-between text-sm">
                                         <div className="flex flex-col space-y-4">
                                             {mainNavItems.map((item) => (

resources/js/components/heading.tsx

@@ -1,10 +1,8 @@
 export default function Heading({ title, description }: { title: string; description?: string }) {
     return (
-        <>
-            <div className="mb-8 space-y-0.5">
-                <h2 className="text-xl font-semibold tracking-tight">{title}</h2>
-                {description && <p className="text-muted-foreground text-sm">{description}</p>}
-            </div>
-        </>
+        <div className="mb-8 space-y-0.5">
+            <h2 className="text-xl font-semibold tracking-tight">{title}</h2>
+            {description && <p className="text-muted-foreground text-sm">{description}</p>}
+        </div>
     );
 }

resources/js/components/icon.tsx

@@ -1,8 +1,9 @@
 import { cn } from '@/lib/utils';
 import { type LucideProps } from 'lucide-react';
+import { type ComponentType } from 'react';
 
 interface IconProps extends Omit<LucideProps, 'ref'> {
-    iconNode: React.ComponentType<LucideProps>;
+    iconNode: ComponentType<LucideProps>;
 }
 
 export function Icon({ iconNode: IconComponent, className, ...props }: IconProps) {

resources/js/components/input-error.tsx

@@ -1,5 +1,5 @@
 import { cn } from '@/lib/utils';
-import { HTMLAttributes } from 'react';
+import { type HTMLAttributes } from 'react';
 
 export default function InputError({ message, className = '', ...props }: HTMLAttributes<HTMLParagraphElement> & { message?: string }) {
     return message ? (

resources/js/components/nav-footer.tsx

@@ -1,12 +1,13 @@
 import { Icon } from '@/components/icon';
 import { SidebarGroup, SidebarGroupContent, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
 import { type NavItem } from '@/types';
+import { type ComponentPropsWithoutRef } from 'react';
 
 export function NavFooter({
     items,
     className,
     ...props
-}: React.ComponentPropsWithoutRef<typeof SidebarGroup> & {
+}: ComponentPropsWithoutRef<typeof SidebarGroup> & {
     items: NavItem[];
 }) {
     return (