Merge branch 'release/5.35.0'

tomgrv · tomgrv · commit 2a02c8947d62 · 2026-02-24T20:32:18.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 # Changelog
 
+## 5.35.0 (2026-02-24)
+
+_Commits from: v5.34.2..HEAD_
+
+### 📂 Unscoped changes
+
+#### Bug Fixes
+
+- 🐛 ensure rebase continues even on conflicts ([b2752a9](https://github.com/tomgrv/devcontainer-features/commit/b2752a9c159ae6b697f666e1a0c9a72bf8ca295e))
+- 🐛 remove redundant XDEBUG_MODE settings for clarity ([e5b9e6d](https://github.com/tomgrv/devcontainer-features/commit/e5b9e6d52f09ccf3ec31df875217855f8614b6c1))
+
+#### Features
+
+- ✨ add laravel/boost ([85a4eef](https://github.com/tomgrv/devcontainer-features/commit/85a4eef9e1c0f5c6c851dd4ed3c8a49229d786a7))
+- ✨ add minikube utility scripts ([4407721](https://github.com/tomgrv/devcontainer-features/commit/44077218293b0fae47401ca5f1a12c1d7614065e))
+- ✨ improve server script usage instructions and variable consistency ([bedacbd](https://github.com/tomgrv/devcontainer-features/commit/bedacbd58a8115598908f11dacb47778711f7396))
+
+#### Other changes
+
+- Merge tag 'v5.34.0' into develop ([c56339f](https://github.com/tomgrv/devcontainer-features/commit/c56339f56076f83e1a25e5751554eb98ef69f2cd))
+- Merge tag 'v5.34.1' into develop ([84122d4](https://github.com/tomgrv/devcontainer-features/commit/84122d45bf769a04478d34059c85add3d2262fda))
+- Merge tag 'v5.34.2' into develop ([d51c7e3](https://github.com/tomgrv/devcontainer-features/commit/d51c7e303a0315d06511567c734bfbc5396b5276))
+
 ## 5.34.2 (2026-02-02)
 
 _Commits from: v5.34.1..HEAD_
@@ -391,4 +414,4 @@ _Commits from: v5.25.0..HEAD_
 
 ---
 
-_Generated on 2026-02-02 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
+_Generated on 2026-02-24 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/devcontainer-features",
-  "version": "5.34.2",
+  "version": "5.35.0",
   "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
   "keywords": [
     "dev",
diff --git a/src/gitutils/_git-fix-up.sh b/src/gitutils/_git-fix-up.sh
@@ -79,7 +79,7 @@ while [ $? -eq 0 ]; do
 	fi
 
 	# Continue the rebase process
-	git rebase --continue 
+	git rebase --continue || true
 done
 
 # if rebase successful and push option is set, push force the changes
diff --git a/src/gitutils/devcontainer-feature.json b/src/gitutils/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "gitutils",
   "name": "Git Aliases",
   "description": "A feature to add useful Git aliases to your shell.",
-  "version": "5.33.0",
+  "version": "5.35.0",
   "dependsOn": {
     "ghcr.io/devcontainers/features/node:1": "lts",
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {
diff --git a/src/gitutils/package.json b/src/gitutils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/gitutils",
-  "version": "5.33.0",
+  "version": "5.35.0",
   "description": "Git utilities and aliases for development workflow",
   "files": [
     "_*.sh",
diff --git a/src/larasets/_require.json b/src/larasets/_require.json
@@ -3,9 +3,11 @@
     "devDependencies": [
         "laravel/pint",
         "pestphp/pest",
+        "laravel/boost",
         "pestphp/pest-plugin-laravel",
         "nunomaduro/collision",
         "nunomaduro/phpinsights",
         "pestphp/pest-plugin-arch"
+        
     ]
 }
diff --git a/src/larasets/_scripts.composer.json b/src/larasets/_scripts.composer.json
@@ -36,7 +36,8 @@
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-update-cmd": [
-            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force",
+            "@php artisan boost:update --ansi"
         ],
         "req": [
             "@base require",
diff --git a/src/larasets/_srv.sh b/src/larasets/_srv.sh
@@ -4,12 +4,18 @@ set -e
 #### Goto repository root
 cd "$(git rev-parse --show-toplevel)" >/dev/null
 
+#### If no arguments are provided, show usage
+eval $(zz_args "Start or restart the server" $0 "$@" <<-help
+    - name    name        Server name
+help
+)
+
 #### Execute command
 if [ -n "$LARAVEL_SAIL" ] && [ "$LARAVEL_SAIL" -eq 1 ] && sail ps --status running | grep --after-context=1 -q -; then
     server='sail npx --yes pm2'
 else
     server='npx --yes pm2'
 fi
 
-$server restart --update-env server_$1 || $server --name server_$1 start "FORCE_COLOR=1 npm -- run \"$@\""
-$server log --raw --out server_$1
+$server restart --update-env server_$name || $server --name server_$name start "FORCE_COLOR=1 npm -- run \"$@\""
+$server log --raw --out server_$name
diff --git a/src/larasets/devcontainer-feature.json b/src/larasets/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "larasets",
   "name": "Laravel settings",
   "description": "A feature to add useful laravel settings to your shell.",
-  "version": "5.32.0",
+  "version": "5.35.0",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker": "",
     "ghcr.io/devcontainers/features/node:1": "lts",
@@ -19,8 +19,7 @@
     "DB_CONNECTION": "sqlite",
     "DOPPLER_CONFIG": "devpmt_personal",
     "SAIL_XDEBUG_CONFIG": "client_host=host.docker.internal idekey=vscode",
-    "SAIL_XDEBUG_MODE": "develop,debug",
-    "XDEBUG_MODE": "off"
+    "XDEBUG_CONFIG": "client_host=localhost idekey=vscode"
   },
   "customizations": {
     "vscode": {
diff --git a/src/larasets/package.json b/src/larasets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/larasets",
-  "version": "5.32.0",
+  "version": "5.35.0",
   "description": "Laravel development settings and utilities",
   "files": [
     "_*.sh",
diff --git a/src/larasets/stubs/.vscode/mcp.json b/src/larasets/stubs/.vscode/mcp.json
@@ -0,0 +1,10 @@
+{
+    "servers": {
+        "laravel-boost": {
+            "command": "art",
+            "args": [
+                "boost:mcp"
+            ]
+        }
+    }
+}
diff --git a/src/larasets/stubs/boost.json b/src/larasets/stubs/boost.json
@@ -0,0 +1,16 @@
+{
+    "agents": [
+        "copilot"
+    ],
+    "guidelines": true,
+    "herd_mcp": false,
+    "mcp": true,
+    "nightwatch_mcp": false,
+    "sail": true,
+    "skills": [
+        "livewire-development",
+        "volt-development",
+        "pest-testing",
+        "tailwindcss-development"
+    ]
+}
diff --git a/src/minikube/_mkb-pds.sh b/src/minikube/_mkb-pds.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+minikube kubectl -- get pods -A
diff --git a/src/minikube/_mkb-preload.sh b/src/minikube/_mkb-preload.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Navigate to the repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+# Function to print help and manage arguments
+eval $(
+    zz_args "Preload images from specified helm chart" $0 "$@" <<-help
+			- chart     chart      helm chart (default is 'src')
+	help
+)
+
+# Preload helm chart images into minikube
+for image in $(helm template ${chart:-src} | grep -oP 'image:\s*\K[^"]+' | sort -u); do
+  zz_log i "Preloading image $image into minikube"
+  minikube image pull "$image"
+done
diff --git a/src/minikube/_mkb-up.sh b/src/minikube/_mkb-up.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Navigate to the repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+# Start minikube with embedded certs
+minikube start --embed-certs
+
+# Add certificates in .devcontainer/certs/*.pem to minikube's trusted certs as *.crt
+for cert in /usr/local/share/ca-certificates/*.crt; do
+    zz_log i "Adding local certificate $cert to minikube trusted certificates"
+    docker cp "$cert" minikube:"$(minikube ssh -- "mktemp -u /usr/local/share/ca-certificates/XXXXXX.crt")"
+done
+minikube ssh "sudo update-ca-certificates"  
+
+# Enable ingress addon
+zz_log i "Enabling minikube ingress addon"
+minikube addons enable ingress  
diff --git a/src/minikube/_mkb.sh b/src/minikube/_mkb.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# This script is a utility to dispatch calls to various utilities with the same prefix.
+zz_dispatch $0 "$@"
diff --git a/src/minikube/devcontainer-feature.json b/src/minikube/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "minikube",
   "name": "Minikube feature",
   "description": "Add minikube to your devcontainer",
-  "version": "5.33.0",
+  "version": "5.35.0",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker: 2": {},
     "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
diff --git a/src/minikube/package.json b/src/minikube/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/minikube",
-    "version": "5.33.0",
+    "version": "5.35.0",
     "description": "Minikube scripts",
     "files": [
         "_*.sh",
diff --git a/src/minikube/stubs/.vscode/tasks.json b/src/minikube/stubs/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "🐳 Start Minikube",
             "type": "shell",
-            "command": "minikube start & minikube addons enable ingress",
+            "command": "mkb-up",
             "problemMatcher": []
         }
     ]
diff --git a/stubs/.devcontainer/certs/.gitkeep b/stubs/.devcontainer/certs/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/devcontainer-features",`
`3`		`- "version": "5.34.2",`
	`3`	`+ "version": "5.35.0",`
`4`	`4`	`"description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/gitutils",`
`3`		`- "version": "5.33.0",`
	`3`	`+ "version": "5.35.0",`
`4`	`4`	`"description": "Git utilities and aliases for development workflow",`
`5`	`5`	`"files": [`
`6`	`6`	`"_*.sh",`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,11 @@`
`3`	`3`	`"devDependencies": [`
`4`	`4`	`"laravel/pint",`
`5`	`5`	`"pestphp/pest",`
	`6`	`+ "laravel/boost",`
`6`	`7`	`"pestphp/pest-plugin-laravel",`
`7`	`8`	`"nunomaduro/collision",`
`8`	`9`	`"nunomaduro/phpinsights",`
`9`	`10`	`"pestphp/pest-plugin-arch"`
	`11`	`+`
`10`	`12`	`]`
`11`	`13`	`}`