From 200b8f3a507b2169a9344806ef851a33d596a5ad Mon Sep 17 00:00:00 2001
From: Mo Gorhom <gorhom@me.com>
Date: Tue, 22 Dec 2020 16:57:08 +0100
Subject: [PATCH] chore: updated auto-changelog configs

---
 .auto-changelog                               |  6 +++---
 .release-it.json                              |  6 +++---
 .../changelog-template.hbs                    |  0
 templates/release-template.hbs                | 19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)
 rename release-template.hbs => templates/changelog-template.hbs (100%)
 create mode 100644 templates/release-template.hbs

diff --git a/.auto-changelog b/.auto-changelog
index 751d0584..5276c56e 100644
--- a/.auto-changelog
+++ b/.auto-changelog
@@ -1,7 +1,7 @@
 {
-  "template": "./release-template.hbs",
   "handlebarsSetup": "./scripts/auto-changelog.js",
   "ignoreCommitPattern": "^chore: release v",
-  "unreleased": true,
-  "startingVersion": "v3.0.0-alpha.0"
+  "startingVersion": "v3.0.0-alpha.0",
+  "unreleased": false,
+  "commitLimit": false
 }
\ No newline at end of file
diff --git a/.release-it.json b/.release-it.json
index 179a49b4..92e3dcde 100644
--- a/.release-it.json
+++ b/.release-it.json
@@ -3,11 +3,11 @@
     "push": true,
     "tagName": "v${version}",
     "commitMessage": "chore: release v${version}",
-    "changelog": "auto-changelog --stdout"
+    "changelog": "auto-changelog --stdout --unreleased --template ./templates/changelog-template.hbs"
   },
   "github": {
     "release": true,
-    "releaseNotes": "auto-changelog --stdout -p"
+    "releaseNotes": "auto-changelog --stdout --unreleased --template ./templates/release-template.hbs"
   },
   "npm": {
     "publish": false
@@ -18,6 +18,6 @@
     }
   },
   "hooks": {
-    "after:bump": "auto-changelog -p"
+    "after:bump": "auto-changelog -p --template ./templates/changelog-template.hbs"
   }
 }
diff --git a/release-template.hbs b/templates/changelog-template.hbs
similarity index 100%
rename from release-template.hbs
rename to templates/changelog-template.hbs
diff --git a/templates/release-template.hbs b/templates/release-template.hbs
new file mode 100644
index 00000000..f2a66561
--- /dev/null
+++ b/templates/release-template.hbs
@@ -0,0 +1,19 @@
+{{#each releases}}
+  {{#if @first}}
+    {{#custom merges commits heading="#### Features" subject="feat: "}}
+      - {{message}} ({{#if id}}[`#{{id}}`]{{else}}[{{shorthash}}]{{/if}}({{href}})).
+    {{/custom}}
+
+    {{#custom merges commits heading="#### Improvements" subject="(chore|refactor|style): "}}
+      - {{message}} ({{#if id}}[`#{{id}}`]{{else}}[{{shorthash}}]{{/if}}({{href}})).
+    {{/custom}}
+
+    {{#custom merges commits heading="#### Fixes" subject="fix: "}}
+      - {{message}} ({{#if id}}[`#{{id}}`]{{else}}[{{shorthash}}]{{/if}}({{href}})).
+    {{/custom}}
+
+    {{#custom merges commits heading="#### Documentations" subject="docs: "}}
+      - {{message}} ({{#if id}}[`#{{id}}`]{{else}}[{{shorthash}}]{{/if}}({{href}})).
+    {{/custom}}
+  {{/if}}
+{{/each}}
\ No newline at end of file