Merge branch 'clock-week' of https://github.com/bughaver/MagicMirror into clock-week

Author: bughaver

.husky/pre-commit

@@ -1,5 +1,19 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-if command -v npx &> /dev/null; then
-  npx lint-staged
+# Get the path to the project root
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+
+# Add node_modules/.bin to PATH
+PATH="$PROJECT_ROOT/node_modules/.bin:$PATH"
+
+# Source NVM if available
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+# Run lint-staged
+if [ -f "$PROJECT_ROOT/node_modules/.bin/lint-staged" ]; then
+    "$PROJECT_ROOT/node_modules/.bin/lint-staged"
+else
+    npx lint-staged
 fi

package.json

@@ -34,7 +34,7 @@
 		"lint:markdown": "markdownlint-cli2 . --fix",
 		"lint:prettier": "prettier . --write",
 		"postinstall": "node --run install-vendor && node --run install-fonts && echo \"MagicMirror² installation finished successfully! \n\"",
-		"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed.",
+		"prepare": "husky install",
 		"server": "node ./serveronly",
 		"start": "node --run start:x11",
 		"start:dev": "node --run start:x11 -- dev",