fix conflicts

Author: taylorotwell

.github/workflows/tests.yml

@@ -34,9 +34,6 @@ jobs:
       - name: Install Node Dependencies
         run: npm ci
 
-      - 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

components.json

@@ -1,21 +1,20 @@
 {
-    "$schema": "https://shadcn-vue.com/schema.json",
-    "style": "default",
-    "typescript": true,
-    "tsConfigPath": "./tsconfig.json",
-    "tailwind": {
-        "config": "tailwind.config.js",
-        "css": "resources/css/app.css",
-        "baseColor": "neutral",
-        "cssVariables": true,
-        "prefix": ""
-    },
-    "framework": "laravel",
-    "aliases": {
-        "components": "resources/js/Components",
-        "utils": "@/lib/utils",
-        "ui": "resources/js/Components/ui",
-        "lib": "@/lib",
-        "hooks": "@/hooks"
-    }
+  "$schema": "https://shadcn-vue.com/schema.json",
+  "style": "default",
+  "typescript": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "resources/css/app.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/components",
+    "composables": "@/composables",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib"
+  },
+  "iconLibrary": "lucide"
 }