fix: 🐛 tasks

tomgrv · Jan 13, 2025 · c06345a · c06345a
1 parent 3cfe207
commit c06345a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 38 deletions.
diff --git a/src/larasets/_seed.sh b/src/larasets/_seed.sh
@@ -2,9 +2,9 @@
 set -e
 
 art key:generate --force
-art migrate --seed --graceful --no-interaction
 art config:cache
 art view:cache
 art route:cache
 art event:cache
-art optimize:clear
+art optimize
+art migrate --seed --graceful --no-interaction
diff --git a/src/larasets/devcontainer-feature.json b/src/larasets/devcontainer-feature.json
@@ -1,13 +1,13 @@
 {
     "name": "Laravel settings",
-    "version": "3.2.2",
+    "version": "3.2.5",
     "description": "A feature to add useful laravel settings to your shell.",
     "containerEnv": {
         "APP_DEBUG": "true",
         "APP_ENV": "local",
         "LARAVEL_SAIL": "1",
         "DB_CONNECTION": "sqlite",
-        "DB_DATABASE": "database/database.sqlite",
+        "DB_DATABASE": "storage/app/database.sqlite",
         "SAIL_XDEBUG_MODE": "develop,debug",
         "SAIL_XDEBUG_CONFIG": "client_host=host.docker.internal idekey=vscode",
         "XDEBUG_MODE": "off"
@@ -27,7 +27,9 @@
                     "art-cache-routes": [
                         "**/[Rr]outes/*.php"
                     ]
-                }
+                },
+                "LaravelExtraIntellisense.phpCommand": "docker-compose exec -w /var/www/html laravel.test php -r \"{code}\"",
+                "LaravelExtraIntellisense.basePathForCode": "/var/www/html"
             },
             "extensions": [
                 "actboy168.tasks",

diff --git a/src/larasets/stubs/.vscode/launch.json b/src/larasets/stubs/.vscode/launch.json
@@ -6,6 +6,7 @@
             "name": "Listen for XDebug",
             "type": "php",
             "request": "launch",
+            "preLaunchTask": "up",
             "port": 9003,
             "pathMappings": {
                 "/var/www/html": "${workspaceFolder}"

diff --git a/src/larasets/stubs/.vscode/tasks.json b/src/larasets/stubs/.vscode/tasks.json
@@ -8,6 +8,7 @@
             "hide": true,
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "silent",
                 "close": true
             }
@@ -19,6 +20,7 @@
             "hide": true,
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "silent",
                 "close": true
             }
@@ -30,47 +32,61 @@
             "hide": true,
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "silent",
                 "close": true
             }
         },
         {
             "label": "up",
             "dependsOn": [
-                "sail up",
-                "seed",
-                "queue",
-                "schedule",
+                "sail-restart",
+                "art-queue",
+                "art-schedule",
                 "vite"
             ],
             "dependsOrder": "sequence"
         },
         {
-            "label": "sail up",
+            "label": "sail-up",
             "type": "shell",
-            "command": "sail up --build --wait",
+            "command": "sail up --build --wait && sail composer dump-autoload",
             "presentation": {
                 "panel": "dedicated",
-                "reveal": "silent"
-            }
+                "clear": true,
+                "close": true
+            },
+            "hide": true
         },
         {
-            "label": "sail down",
+            "label": "sail-restart",
+            "type": "shell",
+            "command": "sail restart && sail composer dump-autoload",
+            "presentation": {
+                "panel": "dedicated",
+                "clear": true,
+                "close": true
+            },
+            "hide": true
+        },
+        {
+            "label": "sail-down",
             "type": "shell",
             "command": "sail down",
             "presentation": {
                 "panel": "dedicated",
-                "reveal": "silent",
+                "clear": true,
                 "close": true
             },
             "hide": true
         },
         {
             "label": "art-queue",
             "type": "shell",
-            "command": "art queue:listen sync --queue=default --sleep=3 --tries=3",
+            "command": "art queue:listen --sleep=3 --tries=3",
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "silent"
             },
             "hide": true,
@@ -82,18 +98,21 @@
                     "${workspaceFolder}"
                 ],
                 "source": "artisan",
-                "pattern": {
-                    "regexp": "^\\s*(ERROR)\\s*(.*)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "severity": 4,
-                    "message": 5
-                },
+                "pattern": [
+                    {
+                        "regexp": "Exception",
+                        "message": 1
+                    },
+                    {
+                        "regexp": "^\\s*at\\s*([/\\w]+):(\\d+)$",
+                        "file": 1,
+                        "line": 2
+                    }
+                ],
                 "background": {
                     "activeOnStart": true,
-                    "beginsPattern": "^\\s*(INFO)\\s*(.*)$",
-                    "endsPattern": "^\\s*(INFO)\\s*(.*)$"
+                    "beginsPattern": "^\\s*(INFO)",
+                    "endsPattern": "."
                 }
             }
         },
@@ -103,6 +122,7 @@
             "command": "art schedule:work",
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "silent"
             },
             "hide": true,
@@ -114,27 +134,31 @@
                     "${workspaceFolder}"
                 ],
                 "source": "artisan",
-                "pattern": {
-                    "regexp": "^\\s*(ERROR)\\s*(.*)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "severity": 4,
-                    "message": 5
-                },
+                "pattern": [
+                    {
+                        "regexp": "Exception",
+                        "message": 1
+                    },
+                    {
+                        "regexp": "^\\s*at\\s*([/\\w]+):(\\d+)$",
+                        "file": 1,
+                        "line": 2
+                    }
+                ],
                 "background": {
                     "activeOnStart": true,
-                    "beginsPattern": "^\\s*(INFO)\\s*(.*)$",
-                    "endsPattern": "^\\s*(INFO)\\s*(.*)$"
+                    "beginsPattern": "^\\s*(INFO)",
+                    "endsPattern": "."
                 }
             }
         },
         {
             "label": "vite",
             "type": "shell",
-            "command": "run dev",
+            "command": "srv dev",
             "presentation": {
                 "panel": "dedicated",
+                "clear": true,
                 "reveal": "always"
             },
             "isBackground": true,
@@ -156,7 +180,7 @@
                 "background": {
                     "activeOnStart": true,
                     "beginsPattern": "^VITE v\\d+\\.\\d+\\.\\d+\\s+ready in \\d+ ms$",
-                    "endsPattern": "^VITE v\\d+\\.\\d+\\.\\d+\\s+ready in \\d+ ms$"
+                    "endsPattern": "."
                 }
             }
         }