🔧 more defaults to the new default 🤪️

JeromeFitz · May 1, 2021 · 6ef6672 · 6ef6672
1 parent f2f4b5d
commit 6ef6672
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/changelog.config.js b/changelog.config.js
@@ -1,13 +1,3 @@
-const branch = {
-  format: '{branchType}{branchName}',
-  projectCode: '',
-  questions: ['branchName', 'branchPrefix', 'branchType'],
-  ticketUrl: '',
-}
-const format = '{emoji}{scope} {branchName}{subject}'
-const scopes = ['', 'release']
-const questions = ['branchPrefix', 'type', 'scope', 'subject', 'body', 'breaking']
-const theme = 'default'
+const config = require('./lib/themes/default')
 
-// eslint-disable-next-line object-property-newline
-module.exports = { branch, format, questions, scopes, theme }
+module.exports = { ...config }
diff --git a/lib/themes/default.js b/lib/themes/default.js
@@ -1,9 +1,9 @@
 /* eslint-disable max-len, sort-keys */
 module.exports = {
   branch: {
-    format: '{branchName}',
+    format: '{branchType}{branchName}',
     projectCode: '',
-    questions: ['branchName'],
+    questions: ['branchName', 'branchPrefix', 'branchType'],
     ticketUrl: '',
   },
   branchTypes: {
@@ -116,10 +116,10 @@ module.exports = {
   closedIssueMessage: 'Closes: ',
   closedIssuePrefix: '✅ ',
   disableEmoji: false,
-  format: '{type}{scope}: {emoji}{subject}',
+  format: '{emoji}{scope} {branchName}{subject}',
   maxMessageLength: 64,
   minMessageLength: 3,
-  questions: ['type', 'scope', 'subject', 'body', 'breaking', 'issues', 'lerna'],
+  questions: ['branchPrefix', 'type', 'scope', 'subject', 'body', 'breaking'],
   scopes: [],
   theme: 'default',
   types: {

diff --git a/scripts/gitmoji/gitmojiTheme.js b/scripts/gitmoji/gitmojiTheme.js
@@ -1,12 +1,24 @@
 const fs = require('fs')
 const path = require('path')
 const { branchTypes, types } = require('../../data/gitmoji/index.json')
-const defaultTheme = require('../../lib/themes/default')
+const originalTheme = require('../../lib/themes/original')
+
+const branch = {
+  format: '{branchType}{branchName}',
+  projectCode: '',
+  questions: ['branchName', 'branchPrefix', 'branchType'],
+  ticketUrl: '',
+}
+const format = '{emoji}{scope} {branchName}{subject}'
+const questions = ['branchPrefix', 'type', 'scope', 'subject', 'body', 'breaking']
 
 const theme = {
-  ...defaultTheme,
+  ...originalTheme,
+  branch,
   branchTypes,
   breakingChangePrefix: '💥️ ',
+  format,
+  questions,
   types,
 }