diff --git a/README.md b/README.md index 96b9ec7..455bfed 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ $ conventional-recommended-bump --help Type: `boolean` Default: `true` -If true, reverted commits will be ignored. +If `true`, reverted commits will be ignored. ##### preset diff --git a/index.js b/index.js index d490958..4f9fa76 100644 --- a/index.js +++ b/index.js @@ -1,55 +1,13 @@ 'use strict'; var concat = require('concat-stream'); +var conventionalCommitsFilter = require('conventional-commits-filter'); var conventionalCommitsParser = require('conventional-commits-parser'); var gitLatestSemverTag = require('git-latest-semver-tag'); var gitRawCommits = require('git-raw-commits'); -var modifyValues = require('modify-values'); -var isSubset = require('is-subset'); var objectAssign = require('object-assign'); var VERSIONS = ['major', 'minor', 'patch']; -function filterCommits(commits) { - var ret = []; - var ignores = []; - commits.forEach(function(commit) { - if (commit.revert) { - ignores.push(commit.revert); - } else { - ret.push(commit); - } - }); - - ret = ret.filter(function(commit) { - var ignoreThis = false; - - commit = modifyValues(commit, function(val) { - if (typeof val === 'string') { - return val.trim(); - } - - return val; - }); - - ignores.some(function(ignore) { - ignore = modifyValues(ignore, function(val) { - if (typeof val === 'string') { - return val.trim(); - } - - return val.trim(); - }); - - ignoreThis = isSubset(commit, ignore); - return ignoreThis; - }); - - return !ignoreThis; - }); - - return ret; -} - function conventionalRecommendedBump(options, parserOpts, cb) { var preset; var noop = function() {}; @@ -99,7 +57,7 @@ function conventionalRecommendedBump(options, parserOpts, cb) { var commits; if (options.ignoreReverted) { - commits = filterCommits(data); + commits = conventionalCommitsFilter(data); } else { commits = data; } diff --git a/package.json b/package.json index 9f925df..27ebada 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,11 @@ ], "dependencies": { "concat-stream": "^1.4.10", + "conventional-commits-filter": "0.0.1", "conventional-commits-parser": "0.0.18", "git-latest-semver-tag": "0.0.0", "git-raw-commits": "0.0.8", - "is-subset": "^0.1.1", "meow": "^3.3.0", - "modify-values": "^1.0.0", "object-assign": "^3.0.0" }, "devDependencies": {