Merge branch 'release/5.32.0'

Author: tomgrv

.github/copilot.yaml

@@ -0,0 +1,16 @@
+# @format
+
+instructions:
+    pull_request:
+        title:
+            description: >
+                Titles for pull requests must follow Conventional Commit rules. Start with a type (e.g., feat, fix, docs, style, refactor, perf, test, chore) followed by a colon and a brief summary. Optionally, add a scope in parentheses. Example: "feat(parser): add support for new syntax".
+            examples:
+                - 'feat(login): add OAuth2 support'
+                - 'fix(api): correct null pointer error in user endpoint'
+                - 'docs(readme): update installation instructions'
+                - 'refactor(auth): streamline token validation logic'
+                - 'chore(deps): bump version of express to 4.18.2'
+            must_match_regex: '^(feat|fix|docs|style|refactor|perf|test|chore)(\([a-z0-9\-]+\))?:\s.+'
+            error_message: >
+                Pull request titles must follow Conventional Commit rules (e.g., "feat(login): add OAuth2 support"). Please update your PR title.

.github/workflow/rebase-pr.yml

@@ -0,0 +1,28 @@
+# @format
+
+name: Automatic Rebase
+on:
+  issue_comment:
+    types: [created]
+jobs:
+  rebase:
+    name: Rebase
+    runs-on: ubuntu-latest
+    if: >-
+      github.event.issue.pull_request != '' && 
+      (
+        contains(github.event.comment.body, '/rebase') || 
+        contains(github.event.comment.body, '/autosquash')
+      )
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.8
+        with:
+          autosquash: ${{ contains(github.event.comment.body, '/autosquash') || contains(github.event.comment.body, '/rebase-autosquash') }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 # Changelog
 
+## 5.32.0 (2025-12-18)
+
+_Commits from: v5.31.2..HEAD_
+
+### 📂 Unscoped changes
+
+#### Bug Fixes
+
+- 🐛 improve repository name extraction and refactor commit selection logic ([23878f6](https://github.com/tomgrv/devcontainer-features/commit/23878f609db5b6698de983b66f3c04345aacd105))
+- 🐛 update lint-staged configuration to exclude templates directory from formatting ([09cc5f6](https://github.com/tomgrv/devcontainer-features/commit/09cc5f66566eaef5fc593a43cb7246e48439104d))
+
+#### Features
+
+- ✨ add credential configuration to gitutils ([bf15932](https://github.com/tomgrv/devcontainer-features/commit/bf159329e4bbb00e4764406dce66f2826ab19b6e))
+- ✨ add stubs for package.json and composer.json files ([f9a0ded](https://github.com/tomgrv/devcontainer-features/commit/f9a0ded61831c7758aa71fa7981c6111835eb46f))
+
+#### Other changes
+
+- 👷 add GitHub Actions workflows ([5ddaa96](https://github.com/tomgrv/devcontainer-features/commit/5ddaa96bc8988e4a0aeff189437d7114296e69e0))
+- Merge branch 'main' into develop ([64567b0](https://github.com/tomgrv/devcontainer-features/commit/64567b0fa68c20e45c670aa00e61bf2429a555c4))
+- Merge tag 'v5.31.1' into develop ([4f0aabf](https://github.com/tomgrv/devcontainer-features/commit/4f0aabf21847feb605e45e0a3b8db52315086821))
+
 ## 5.31.2 (2025-10-09)
 
 _Commits from: v5.31.1..HEAD_
@@ -316,4 +338,4 @@ _Commits from: v5.25.0..HEAD_
 
 ---
 
-_Generated on 2025-10-09 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
+_Generated on 2025-12-18 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/devcontainer-features",
-  "version": "5.31.2",
+  "version": "5.32.0",
   "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
   "keywords": [
     "dev",

package.json

@@ -2,7 +2,7 @@
   "id": "act",
   "name": "Nektos Act",
   "description": "A tool for running GitHub Actions locally",
-  "version": "5.31.1",
+  "version": "5.32.0",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker": {},
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {}

src/act/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/act",
-  "version": "5.31.1",
+  "version": "5.32.0",
   "description": "Nektos Act - GitHub Actions local runner integration",
   "files": [
     "_*.sh",

src/act/package.json

@@ -81,16 +81,17 @@ zz_log i "Merge all package folder json files into top level xxx.json"
 
 for type in package composer; do
 
-    # find all package folder json files in the current directory
-    for package in $(git ls-files "$type.json"); do
+    # find all package folder json files in the current directory.
+    # Ensure top-level package.json is included
+    for package in $(git ls-files -o "$type.json"); do
 
         # Merge all package folder json files into the top-level package.json
         for tmpl in $(find $source -maxdepth 1 -name _*.$type.json | sort); do
 
             # Create package.json if it does not exist or is empty
             if [ ! -f $package -o ! -s $package ]; then
                 # Create an empty package.json
-                echo "{}" >$package
+                echo '{"private": true}' >$package
             fi
 
             # Merge the tmpl & add keys if not already there. make sure source json does not contain any comments

src/common-utils/_configure-feature.sh

@@ -2,7 +2,7 @@
   "id": "common-utils",
   "name": "Common Utils",
   "description": "Common utils for tomgrv/devcontainer-features",
-  "version": "5.31.1",
+  "version": "5.32.0",
   "dependsOn": {
     "ghcr.io/devcontainers/features/common-utils": {}
   },

src/common-utils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/common-utils",
-  "version": "5.31.1",
+  "version": "5.32.0",
   "description": "Common utilities and helper scripts for devcontainer features",
   "files": [
     "_*.sh",