From 5b095c4ea2c9c44d0d78638142d669d32987b4c3 Mon Sep 17 00:00:00 2001 From: amaury-tobias Date: Fri, 20 Dec 2019 12:21:11 -0600 Subject: [PATCH 1/3] feat(types): add suport for custom types Suport custom types declared on package.json > config > commitizen > types fix #93 --- README.md | 20 ++++++++++++++------ index.js | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ffc9691b..b59d9c90 100644 --- a/README.md +++ b/README.md @@ -17,25 +17,33 @@ Like commitizen, you specify the configuration of cz-conventional-changelog thro { // ... default values "config": { - "commitizen": { + "commitizen": { "path": "./node_modules/cz-conventional-changelog", "maxHeaderWidth": 100, "maxLineWidth": 100, "defaultType": "", - "defaultScope": "", + "defaultScope": "", "defaultSubject": "", "defaultBody": "", - "defaultIssues": "" + "defaultIssues": "", + "types": { + ... + "feat": { + "description": "A new feature", + "title": "Features" + }, + ... + } } } -// ... +// ... } -``` +``` ### Environment variables The following environment varibles can be used to override any default configuration or package.json based configuration. -* CZ_TYPE = defaultType +* CZ_TYPE = defaultType * CZ_SCOPE = defaultScope * CZ_SUBJECT = defaultSubject * CZ_BODY = defaultBody diff --git a/index.js b/index.js index bbc44f59..15b94b18 100644 --- a/index.js +++ b/index.js @@ -6,7 +6,7 @@ var configLoader = require('commitizen').configLoader; var config = configLoader.load(); var options = { - types: conventionalCommitTypes.types, + types: config.types || conventionalCommitTypes.types, defaultType: process.env.CZ_TYPE || config.defaultType, defaultScope: process.env.CZ_SCOPE || config.defaultScope, defaultSubject: process.env.CZ_SUBJECT || config.defaultSubject, From 76a92466a30256018ad4cbd8fd04dc8d619bbfea Mon Sep 17 00:00:00 2001 From: amaury-tobias Date: Fri, 20 Dec 2019 16:05:36 -0600 Subject: [PATCH 2/3] feat(emoji): add support to emojis on commit head - Add support to use emojis on commit head before subject --- README.md | 3 ++- engine.js | 3 ++- index.js | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b59d9c90..ad9ff598 100644 --- a/README.md +++ b/README.md @@ -26,11 +26,12 @@ Like commitizen, you specify the configuration of cz-conventional-changelog thro "defaultSubject": "", "defaultBody": "", "defaultIssues": "", + "emojis": false, "types": { ... "feat": { "description": "A new feature", - "title": "Features" + "emoji": "🚀" }, ... } diff --git a/engine.js b/engine.js index 098ea67e..14d1430e 100644 --- a/engine.js +++ b/engine.js @@ -197,9 +197,10 @@ module.exports = function(options) { // parentheses are only needed when a scope is present var scope = answers.scope ? '(' + answers.scope + ')' : ''; + var emoji = options.emojis ? options.types[answers.type].emoji : ''; // Hard limit this line in the validate - var head = answers.type + scope + ': ' + answers.subject; + var head = answers.type + scope + ': '+ emoji + ' ' + answers.subject; // Wrap these lines at options.maxLineWidth characters var body = answers.body ? wrap(answers.body, wrapOptions) : false; diff --git a/index.js b/index.js index 15b94b18..81db047f 100644 --- a/index.js +++ b/index.js @@ -6,6 +6,7 @@ var configLoader = require('commitizen').configLoader; var config = configLoader.load(); var options = { + emojis: config.emojis || false, types: config.types || conventionalCommitTypes.types, defaultType: process.env.CZ_TYPE || config.defaultType, defaultScope: process.env.CZ_SCOPE || config.defaultScope, From e26458c736eb8bde2007c26f48306a15035066e1 Mon Sep 17 00:00:00 2001 From: amaury-tobias Date: Fri, 20 Dec 2019 16:21:51 -0600 Subject: [PATCH 3/3] revert: "feat(emoji): add support to emojis on commit head" Wrong repo sorry This reverts commit 76a92466a30256018ad4cbd8fd04dc8d619bbfea. --- README.md | 3 +-- engine.js | 3 +-- index.js | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ad9ff598..b59d9c90 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,11 @@ Like commitizen, you specify the configuration of cz-conventional-changelog thro "defaultSubject": "", "defaultBody": "", "defaultIssues": "", - "emojis": false, "types": { ... "feat": { "description": "A new feature", - "emoji": "🚀" + "title": "Features" }, ... } diff --git a/engine.js b/engine.js index 14d1430e..098ea67e 100644 --- a/engine.js +++ b/engine.js @@ -197,10 +197,9 @@ module.exports = function(options) { // parentheses are only needed when a scope is present var scope = answers.scope ? '(' + answers.scope + ')' : ''; - var emoji = options.emojis ? options.types[answers.type].emoji : ''; // Hard limit this line in the validate - var head = answers.type + scope + ': '+ emoji + ' ' + answers.subject; + var head = answers.type + scope + ': ' + answers.subject; // Wrap these lines at options.maxLineWidth characters var body = answers.body ? wrap(answers.body, wrapOptions) : false; diff --git a/index.js b/index.js index 81db047f..15b94b18 100644 --- a/index.js +++ b/index.js @@ -6,7 +6,6 @@ var configLoader = require('commitizen').configLoader; var config = configLoader.load(); var options = { - emojis: config.emojis || false, types: config.types || conventionalCommitTypes.types, defaultType: process.env.CZ_TYPE || config.defaultType, defaultScope: process.env.CZ_SCOPE || config.defaultScope,