chore: 🔧 use zz_log in githooks

Author: Thomas G.

src/githooks/_commit-msg.sh

@@ -7,6 +7,6 @@ if [ -t 1 ]; then
 fi
 
 # Apply commitlint rules to the latest commit message
-npx --yes chalk-cli --no-stdin -t "{blue →} Applying commitlint rules to the latest commit..."
+zz_log i "Applying commitlint rules to the latest commit..."
 PLUGINS=$(cat package.json | npx --yes jqn '.commitlint.extends' | tr -d "'[]:")
 npm list $PLUGINS 2>/dev/null 1>&2 || npm install --no-save $PLUGINS 2>/dev/null 1>&2 && npx --yes commitlint --edit "$1" && npx --yes devmoji -e

src/githooks/_lint-staged.package.json

@@ -3,10 +3,14 @@
         "lint": "npx --yes lint-staged"
     },
     "lint-staged": {
-        "*.php": ["composer lint"],
+        "*.php": [
+            "composer lint"
+        ],
         "*.{js,jsx,ts,tsx,md,html,css,json,vue, yaml, yml, sh}": [
             "npx --yes prettier --write"
         ],
-        "*.json": ["normalize-json -s -a -i -t 4"]
+        "*.json": [
+            "normalize-json -s -a -i -t 4 -l true"
+        ]
     }
 }

src/githooks/_post-checkout.sh

@@ -18,6 +18,6 @@ isRebase() {
 
 # Check if the current Git command is a rebase
 if test "$GIT_COMMAND" = "rebase"; then
-  npx --yes chalk-cli --no-stdin -t "{green ✔} Skip post-checkout hook during rebase."
+  zz_log s "Skip post-checkout hook during rebase."
   exit 0
 fi

src/githooks/_post-merge.sh

@@ -14,6 +14,6 @@ isChanged() {
 # Checkout composer.lock or package-lock.json if changed
 if isChanged 'composer.lock' || isChanged 'package-lock.json'; then
   git checkout --theirs composer.lock package-lock.json && git add composer.lock package-lock.json
-  npx --yes chalk-cli --no-stdin -t "{green.bold Files <package-lock.json> or <composer.lock> changed.}"
-  npx --yes chalk-cli --no-stdin -t "{green.bold Run composer/npm install to bring your dependencies up to date.}"
+  zz_log s "Files <package-lock.json> or <composer.lock> changed."
+  zz_log s "Run composer/npm install to bring your dependencies up to date."
 fi

src/githooks/_pre-commit.sh

@@ -9,7 +9,7 @@ fi
 
 # Check if the current Git command is a rebase
 if test "$GIT_COMMAND" = "rebase"; then
-    npx --yes chalk-cli --no-stdin -t "{green ✔}  Skip pre-commit hook during rebase"
+    zz_log s "Skip pre-commit hook during rebase"
     exit 0
 fi
 
@@ -19,7 +19,7 @@ echo $GIT_COMMAND
 if git diff ${@:---cached --name-only} | grep -q "package.json"; then
 
     # ensure that the package.json is valid and package-lock.json is up-to-date
-    npx --yes chalk-cli --no-stdin -t "{blue →}  Ensure that the package.json is valid and package-lock.json is up-to-date..."
+    zz_log i "Ensure that the package.json is valid and package-lock.json is up-to-date..."
 
     ws=$(npm pkg get workspaces)
     if test "$ws" = "undefined" || test "$ws" = "{}"; then
@@ -30,17 +30,17 @@ if git diff ${@:---cached --name-only} | grep -q "package.json"; then
 
     # commit the updated package-lock.json if file changed
     if git diff --quiet package-lock.json; then
-        npx --yes chalk-cli --no-stdin -t "{green ✔}  package-lock.json update not required"
+        zz_log s "package-lock.json update not required"
     else
-        git add package-lock.json && npx --yes chalk-cli --no-stdin -t "{yellow ⚠}  Updated package-lock.json"
+        git add package-lock.json && zz_log w "Updated package-lock.json"
     fi
 fi
 
 # Check if the current commit contains composer.json changes
 if git diff ${@:---cached --name-only} | grep -q "composer.json"; then
 
     # ensure that the composer.json is valid and composer.lock is up-to-date
-    npx --yes chalk-cli --no-stdin -t "{blue →}  Ensure that the composer.json is valid and composer.lock is up-to-date..."
+    zz_log i "Ensure that the composer.json is valid and composer.lock is up-to-date..."
     composer validate --no-check-all --strict 2>&1 | grep -oP 'Required package "\K[^"]+' | while read -r package; do
         composer require --ignore-platform-reqs --with-all-dependencies --no-scripts --no-interaction --no-progress --no-install "$package"
     done
@@ -50,9 +50,9 @@ if git diff ${@:---cached --name-only} | grep -q "composer.json"; then
 
     # commit the updated composer.lock if file changed
     if git diff --quiet composer.lock; then
-        npx --yes chalk-cli --no-stdin -t "{green ✔}  composer.lock update not required"
+        zz_log s "composer.lock update not required"
     else
-        git add composer.lock && npx --yes chalk-cli --no-stdin -t "{yellow ⚠}  Updated composer.lock"
+        git add composer.lock && zz_log w "Updated composer.lock"
     fi
 fi
 

src/githooks/_prepare-commit-msg.sh

@@ -12,7 +12,7 @@ npm install --no-save $(cat package.json | npx --yes jqn '.config.commitizen.pat
 
 # Edit commit message
 if [ $(grep -cv -e '^#' -e '^$' .git/COMMIT_EDITMSG) -eq 0 ]; then
-  (exec </dev/tty && npx --yes git-cz --hook || npx --yes chalk-cli --no-stdin -t "{red !}  Unable to start commitizen.") || npx --yes chalk-cli --no-stdin -t "{red !}  Commitizen failed."
+  (exec </dev/tty && npx --yes git-cz --hook || zz_log e "Unable to start commitizen.") || zz_log e "Commitizen failed."
 else
-  npx --yes chalk-cli --no-stdin -t "{blue →}  Commitizen not relevant. Skipping..."
+  zz_log i "Commitizen not relevant. Skipping..."
 fi

src/githooks/_prettier.package.json

@@ -1,9 +1,7 @@
 {
     "prettier": {
         "insertPragma": true,
-        "plugins": [
-            "prettier-plugin-sh"
-        ],
+        "plugins": ["prettier-plugin-sh"],
         "semi": false,
         "singleQuote": true,
         "tabWidth": 4,

src/githooks/configure-hooks.sh

@@ -6,6 +6,6 @@ git config core.hooksPath .git/hooks
 ### Make a symbolic link to the hook directory for each hook starting with '_'  and ending with '.sh'
 find $source -name '_*.sh' | sort | while read file; do
     hook=$(basename $file | sed 's/^_//;s/\.sh$//')
-    echo "Link $file to .git/hooks/$hook"
+    zz_log - "Link $file to .git/hooks/$hook"
     ln -sf $file .git/hooks/$hook
 done

src/githooks/devcontainer-feature.json

@@ -2,7 +2,7 @@
     "id": "githooks",
     "name": "Git Hooks",
     "description": "A feature to add useful Git hooks to your project",
-    "version": "5.5.0",
+    "version": "5.6.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node": {},
         "ghcr.io/tomgrv/devcontainer-features/common-utils:3": {},