fix: 🐛 hack for gitflow branch to be feature

refactor: ♻️ ensure branch name is lowercase refactor: ♻️ alter branchType to go off of `gitflow` Instead of attempting to mutate these objects and re-use value, just use the key/value pairs for what they are.
JeromeFitz · Apr 21, 2021 · 0fa817e · 0fa817e
1 parent 7a4fbe0
commit 0fa817e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 28 deletions.
diff --git a/data/gitmoji/index.json b/data/gitmoji/index.json
diff --git a/data/gitmoji/init.json b/data/gitmoji/init.json
@@ -33,7 +33,7 @@
       "semver": "patch"
     },
     {
-      "emoji": "🚑",
+      "emoji": "🚑️",
       "entity": "&#128657;",
       "code": ":ambulance:",
       "description": "Critical hotfix.",
@@ -89,7 +89,7 @@
       "semver": null
     },
     {
-      "emoji": "🔒",
+      "emoji": "🔒️",
       "entity": "&#x1f512;",
       "code": ":lock:",
       "description": "Fix security issues.",
@@ -233,7 +233,7 @@
       "semver": null
     },
     {
-      "emoji": "⏪",
+      "emoji": "⏪️",
       "entity": "&#9194;",
       "code": ":rewind:",
       "description": "Revert changes.",
@@ -249,15 +249,15 @@
       "semver": null
     },
     {
-      "emoji": "📦",
+      "emoji": "📦️",
       "entity": "&#1F4E6;",
       "code": ":package:",
       "description": "Add or update compiled files or packages.",
       "name": "package",
       "semver": "patch"
     },
     {
-      "emoji": "👽",
+      "emoji": "👽️",
       "entity": "&#1F47D;",
       "code": ":alien:",
       "description": "Update code due to external API changes.",
@@ -329,7 +329,7 @@
       "semver": "patch"
     },
     {
-      "emoji": "🗃",
+      "emoji": "🗃️",
       "entity": "&#128451;",
       "code": ":card_file_box:",
       "description": "Perform database related changes.",
@@ -369,7 +369,7 @@
       "semver": "patch"
     },
     {
-      "emoji": "🏗",
+      "emoji": "🏗️",
       "entity": "&#1f3d7;",
       "code": ":building_construction:",
       "description": "Make architectural changes.",
@@ -417,15 +417,15 @@
       "semver": null
     },
     {
-      "emoji": "⚗",
+      "emoji": "⚗️",
       "entity": "&#128248;",
       "code": ":alembic:",
       "description": "Perform experiments.",
       "name": "alembic",
       "semver": "patch"
     },
     {
-      "emoji": "🔍",
+      "emoji": "🔍️",
       "entity": "&#128269;",
       "code": ":mag:",
       "description": "Improve SEO.",
@@ -473,7 +473,7 @@
       "semver": "patch"
     },
     {
-      "emoji": "🗑",
+      "emoji": "🗑️",
       "entity": "&#x1F5D1;",
       "code": ":wastebasket:",
       "description": "Deprecate code that needs to be cleaned up.",

diff --git a/lib/createBranch.js b/lib/createBranch.js
@@ -123,7 +123,8 @@ const formatBranchName = (state) => {
     .replace(
       /\{branchType\}/g,
       Boolean(branchPrefix) ? branchType + (formatLength > 1 ? '/' : '') : '',
-    );
+    )
+    .toLowerCase();
 
   // const branchName = getBranchName().split('/').slice(-1)[0];
   // const scope = answers.scope ? '(' + answers.scope.trim() + ')' : '';

diff --git a/lib/questions/branchType.js b/lib/questions/branchType.js
@@ -1,12 +1,12 @@
 const fuzzy = require('fuzzy');
 
 const typeToListItem = ({branchTypes, disableEmoji}, type) => {
-  const {description, emoji, value} = branchTypes[type];
+  const {description, emoji, gitflow} = branchTypes[type];
   const prefix = emoji && !disableEmoji ? emoji + '  ' : '';
 
   return {
-    name: prefix + (value + ':').padEnd(12, ' ') + description,
-    value,
+    name: prefix + (gitflow + ':').padEnd(12, ' ') + description,
+    value: gitflow,
   };
 };
 

diff --git a/lib/themes/gitmoji.js b/lib/themes/gitmoji.js
@@ -46,10 +46,23 @@ module.exports = {
       semver: 'minor',
       value: 'feat',
     },
+    fix: {
+      code: ':bug:',
+      description: 'Fix a bug.',
+      emoji: '🐛',
+      entity: '&#x1f41b;',
+      gitflow: 'fix',
+      hidden: false,
+      name: 'bug',
+      release: 'patch',
+      section: 'Fix a bug.',
+      semver: 'patch',
+      value: 'fix',
+    },
     hotfix: {
       code: ':ambulance:',
       description: 'Critical hotfix.',
-      emoji: '🚑',
+      emoji: '🚑️',
       entity: '&#128657;',
       gitflow: 'hotfix',
       hidden: false,
@@ -152,7 +165,7 @@ module.exports = {
     arch: {
       code: ':building_construction:',
       description: 'Make architectural changes.',
-      emoji: '🏗',
+      emoji: '🏗️',
       entity: '&#1f3d7;',
       gitflow: false,
       hidden: false,
@@ -256,7 +269,7 @@ module.exports = {
     clean: {
       code: ':wastebasket:',
       description: 'Deprecate code that needs to be cleaned up.',
-      emoji: '🗑',
+      emoji: '🗑️',
       entity: '&#x1F5D1;',
       gitflow: false,
       hidden: false,
@@ -269,7 +282,7 @@ module.exports = {
     compat: {
       code: ':alien:',
       description: 'Update code due to external API changes.',
-      emoji: '👽',
+      emoji: '👽️',
       entity: '&#1F47D;',
       gitflow: false,
       hidden: false,
@@ -321,7 +334,7 @@ module.exports = {
     db: {
       code: ':card_file_box:',
       description: 'Perform database related changes.',
-      emoji: '🗃',
+      emoji: '🗃️',
       entity: '&#128451;',
       gitflow: false,
       hidden: false,
@@ -360,7 +373,7 @@ module.exports = {
     'dep-up': {
       code: ':package:',
       description: 'Add or update compiled files or packages.',
-      emoji: '📦',
+      emoji: '📦️',
       entity: '&#1F4E6;',
       gitflow: false,
       hidden: false,
@@ -438,7 +451,7 @@ module.exports = {
     experiment: {
       code: ':alembic:',
       description: 'Perform experiments.',
-      emoji: '⚗',
+      emoji: '⚗️',
       entity: '&#128248;',
       gitflow: false,
       hidden: false,
@@ -466,7 +479,7 @@ module.exports = {
       description: 'Fix a bug.',
       emoji: '🐛',
       entity: '&#x1f41b;',
-      gitflow: false,
+      gitflow: 'fix',
       hidden: false,
       name: 'bug',
       release: 'patch',
@@ -503,7 +516,7 @@ module.exports = {
     hotfix: {
       code: ':ambulance:',
       description: 'Critical hotfix.',
-      emoji: '🚑',
+      emoji: '🚑️',
       entity: '&#128657;',
       gitflow: 'hotfix',
       hidden: false,
@@ -750,7 +763,7 @@ module.exports = {
     revert: {
       code: ':rewind:',
       description: 'Revert changes.',
-      emoji: '⏪',
+      emoji: '⏪️',
       entity: '&#9194;',
       gitflow: false,
       hidden: false,
@@ -789,7 +802,7 @@ module.exports = {
     security: {
       code: ':lock:',
       description: 'Fix security issues.',
-      emoji: '🔒',
+      emoji: '🔒️',
       entity: '&#x1f512;',
       gitflow: false,
       hidden: false,
@@ -815,7 +828,7 @@ module.exports = {
     seo: {
       code: ':mag:',
       description: 'Improve SEO.',
-      emoji: '🔍',
+      emoji: '🔍️',
       entity: '&#128269;',
       gitflow: false,
       hidden: false,

diff --git a/scripts/gitmoji/gitmojiRewrite.js b/scripts/gitmoji/gitmojiRewrite.js
@@ -9,7 +9,7 @@ const rewrites = [
   {from: 'art', to: 'style'},
   {from: 'zap', to: 'perf'},
   {from: 'fire', to: 'prune'},
-  {from: 'bug', to: 'fix'},
+  {from: 'bug', to: 'fix', gitflow: 'fix'},
   {from: 'ambulance', to: 'hotfix', gitflow: 'hotfix'},
   {from: 'sparkles', to: 'feat', gitflow: 'feature'},
   {from: 'memo', to: 'docs'},