lechnerio-git-hooks 1.1.6 → 1.1.8

package/README.md

@@ -0,0 +1,82 @@
+# lechnerio-git-hooks
+
+Shared git hooks for all lechnerio projects. Install once, get commit linting, lint-staged, version bumping, and changelog generation.
+
+## Install
+
+```bash
+pnpm add -D lechnerio-git-hooks
+pnpm approve-builds
+pnpm install
+```
+
+For pnpm workspaces, add the `-w` flag:
+
+```bash
+pnpm add -wD lechnerio-git-hooks
+```
+
+## What it does
+
+On install, the package automatically:
+
+- Copies `pre-commit`, `commit-msg`, and `post-commit` hooks into `.husky/`
+- Copies `generate-changelog.mjs` into `scripts/`
+- Copies `commitlint.config.js` and `.lintstagedrc.js` into the project root
+- Adds a `lint-staged` script to `package.json`
+- Configures git to use `.husky/` as the hooks path
+
+## Hooks
+
+| Hook          | What it does                                                                                 |
+| ------------- | -------------------------------------------------------------------------------------------- |
+| `pre-commit`  | Runs lint-staged (eslint --fix + prettier)                                                   |
+| `commit-msg`  | Enforces conventional commits via commitlint                                                 |
+| `post-commit` | Interactive version bump (subtle/patch/minor/major), changelog generation, push/merge prompt |
+
+## Peer dependencies (auto-installed)
+
+- `@commitlint/cli`
+- `@commitlint/config-conventional`
+- `lint-staged`
+
+## Project requirements
+
+These are **not** included and must be installed by the project:
+
+- `eslint`
+- `prettier`
+
+## Environment variables
+
+For non-interactive usage (CI, scripts):
+
+| Variable       | Values                                                          |
+| -------------- | --------------------------------------------------------------- |
+| `VERSION_BUMP` | `1` = subtle, `2` = patch, `3` = minor, `4` = major, `0` = skip |
+| `POST_ACTION`  | `1` = push, `2` = merge to main, `0` = skip                     |
+
+## Update
+
+```bash
+pnpm update lechnerio-git-hooks
+```
+
+## Removing old setup
+
+If migrating from a manual setup, remove these before installing:
+
+```powershell
+Remove-Item .husky\post-commit
+Remove-Item .husky\pre-commit
+Remove-Item .husky\commit-msg
+Remove-Item commitlint.config.js
+Remove-Item .lintstagedrc.js
+Remove-Item scripts\generate-changelog.mjs
+```
+
+Also remove these from `devDependencies` if present:
+
+```bash
+pnpm remove @commitlint/cli @commitlint/config-conventional husky lint-staged
+```

package/hooks/post-commit

@@ -99,9 +99,10 @@ if [ "$files_changed" -eq 0 ] || [ -z "$lines_changed" ]; then
         echo
         echo "1) Push to GitHub"
         echo "2) Merge to Main"
+        echo "3) Merge to Main + Push"
         echo -e "${GRAY}0) None${NC}"
         echo
-        echo -n "Select option (1-2, Enter for Default or 0 to skip): "
+        echo -n "Select option (1-3, Enter for Default or 0 to skip): "
         read -r choice
         choice=${choice:-1}
     else
@@ -140,6 +141,56 @@ if [ "$files_changed" -eq 0 ] || [ -z "$lines_changed" ]; then
                 fi
             fi
             ;;
+        3)
+            echo -e "${YELLOW}🔄 Merging to main + pushing...${NC}"
+            if [ "$DRY_RUN" = "true" ]; then
+                echo -e "${YELLOW}[DRY RUN] Would execute: git push --follow-tags && git push --tags${NC}"
+                echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git pull && git merge $(git branch --show-current) && git push${NC}"
+                echo -e "${YELLOW}[DRY RUN] Would execute: git checkout $(git branch --show-current)${NC}"
+            else
+                current_branch=$(git branch --show-current)
+                _merge_push_ok=true
+                echo -e "${YELLOW}✈️  Pushing ${current_branch}...${NC}"
+                if ! git push --follow-tags || ! git push --tags; then
+                    echo -e "${RED}❌ Failed to push ${current_branch}${NC}"
+                    _merge_push_ok=false
+                fi
+                if [ "$_merge_push_ok" = true ]; then
+                    echo -e "${GREEN}✅ Pushed ${current_branch}${NC}"
+                    if ! git checkout main; then
+                        echo -e "${RED}❌ Failed to checkout main${NC}"
+                        _merge_push_ok=false
+                    fi
+                fi
+                if [ "$_merge_push_ok" = true ]; then
+                    if ! git pull; then
+                        echo -e "${RED}❌ Failed to pull main${NC}"
+                        git checkout "$current_branch"
+                        _merge_push_ok=false
+                    fi
+                fi
+                if [ "$_merge_push_ok" = true ]; then
+                    if ! git merge "$current_branch"; then
+                        echo -e "${RED}❌ Failed to merge ${current_branch} into main${NC}"
+                        git checkout "$current_branch"
+                        _merge_push_ok=false
+                    fi
+                fi
+                if [ "$_merge_push_ok" = true ]; then
+                    echo -e "${GREEN}✅ Merged ${current_branch} into main${NC}"
+                    if ! git push; then
+                        echo -e "${RED}❌ Failed to push main${NC}"
+                        git checkout "$current_branch"
+                        _merge_push_ok=false
+                    fi
+                fi
+                if [ "$_merge_push_ok" = true ]; then
+                    echo -e "${GREEN}✅ Pushed main${NC}"
+                    git checkout "$current_branch"
+                    echo -e "${GREEN}✅ Back on ${current_branch}${NC}"
+                fi
+            fi
+            ;;
         0)
             echo -e "${YELLOW}⏭️  Skipping additional actions${NC}"
             ;;
@@ -239,9 +290,10 @@ elif exec < /dev/tty 2>/dev/null; then
     echo
     echo -e "1) Push to GitHub ${YELLOW}(default)${NC}"
     echo "2) Merge to Main"
+    echo "3) Merge to Main + Push"
     echo -e "${GRAY}0) None${NC}"
     echo
-    echo -n "Select option (1-2, Enter for Default or 0 to skip): "
+    echo -n "Select option (1-3, Enter for Default or 0 to skip): "
     read -r choice
     choice=${choice:-1}
 else
@@ -281,6 +333,56 @@ case $choice in
             fi
         fi
         ;;
+    3)
+        echo -e "${YELLOW}🔄 Merging to main + pushing...${NC}"
+        if [ "$DRY_RUN" = "true" ]; then
+            echo -e "${YELLOW}[DRY RUN] Would execute: git push --follow-tags && git push --tags${NC}"
+            echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git pull && git merge $(git branch --show-current) && git push${NC}"
+            echo -e "${YELLOW}[DRY RUN] Would execute: git checkout $(git branch --show-current)${NC}"
+        else
+            current_branch=$(git branch --show-current)
+            _merge_push_ok=true
+            echo -e "${YELLOW}✈️  Pushing ${current_branch}...${NC}"
+            if ! git push --follow-tags || ! git push --tags; then
+                echo -e "${RED}❌ Failed to push ${current_branch}${NC}"
+                _merge_push_ok=false
+            fi
+            if [ "$_merge_push_ok" = true ]; then
+                echo -e "${GREEN}✅ Pushed ${current_branch}${NC}"
+                if ! git checkout main; then
+                    echo -e "${RED}❌ Failed to checkout main${NC}"
+                    _merge_push_ok=false
+                fi
+            fi
+            if [ "$_merge_push_ok" = true ]; then
+                if ! git pull; then
+                    echo -e "${RED}❌ Failed to pull main${NC}"
+                    git checkout "$current_branch"
+                    _merge_push_ok=false
+                fi
+            fi
+            if [ "$_merge_push_ok" = true ]; then
+                if ! git merge "$current_branch"; then
+                    echo -e "${RED}❌ Failed to merge ${current_branch} into main${NC}"
+                    git checkout "$current_branch"
+                    _merge_push_ok=false
+                fi
+            fi
+            if [ "$_merge_push_ok" = true ]; then
+                echo -e "${GREEN}✅ Merged ${current_branch} into main${NC}"
+                if ! git push; then
+                    echo -e "${RED}❌ Failed to push main${NC}"
+                    git checkout "$current_branch"
+                    _merge_push_ok=false
+                fi
+            fi
+            if [ "$_merge_push_ok" = true ]; then
+                echo -e "${GREEN}✅ Pushed main${NC}"
+                git checkout "$current_branch"
+                echo -e "${GREEN}✅ Back on ${current_branch}${NC}"
+            fi
+        fi
+        ;;
     0)
         echo -e "${YELLOW}⏭️  Skipping additional actions${NC}"
         ;;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lechnerio-git-hooks",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Shared git hooks for lechnerio projects",
   "type": "module",
   "scripts": {