From 070e7615a63a09f20e9b894e5f0f1b6cec5a998b Mon Sep 17 00:00:00 2001 From: "Thomas G." Date: Thu, 9 Jan 2025 23:15:46 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20tasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/larasets/_seed.sh | 4 +- src/larasets/devcontainer-feature.json | 7 ++- src/larasets/stubs/.vscode/tasks.json | 79 +++++++++++++++----------- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/src/larasets/_seed.sh b/src/larasets/_seed.sh index 1fff405..d7cc078 100644 --- 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 index 3b77475..884f42c 100755 --- a/src/larasets/devcontainer-feature.json +++ b/src/larasets/devcontainer-feature.json @@ -1,13 +1,12 @@ { "name": "Laravel settings", - "version": "3.2.2", + "version": "3.2.6", "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", "SAIL_XDEBUG_MODE": "develop,debug", "SAIL_XDEBUG_CONFIG": "client_host=host.docker.internal idekey=vscode", "XDEBUG_MODE": "off" @@ -27,7 +26,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/tasks.json b/src/larasets/stubs/.vscode/tasks.json index 9f5c36a..ba8b1ee 100644 --- 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,6 +32,7 @@ "hide": true, "presentation": { "panel": "dedicated", + "clear": true, "reveal": "silent", "close": true } @@ -37,30 +40,31 @@ { "label": "up", "dependsOn": [ - "sail up", - "seed", - "queue", - "schedule", + "sail-up", + "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-down", "type": "shell", "command": "sail down", "presentation": { "panel": "dedicated", - "reveal": "silent", + "clear": true, "close": true }, "hide": true @@ -68,9 +72,10 @@ { "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 +87,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 +111,7 @@ "command": "art schedule:work", "presentation": { "panel": "dedicated", + "clear": true, "reveal": "silent" }, "hide": true, @@ -114,27 +123,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 +169,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": "." } } }