@commitlint/is-ignored - npm Package Compare versions

Comparing version 7.1.2 to 7.2.0

CHANGELOG.md

@@ -6,2 +6,14 @@ # Change Log
 
+<a name="7.2.0"></a>
+# [7.2.0](https://github.com/marionebl/commitlint/compare/v7.1.2...v7.2.0) (2018-10-05)
+
+
+### Bug Fixes
+
+* ignore merge messages with text after newline ([b32bc93](https://github.com/marionebl/commitlint/commit/b32bc93))
+* use grouped regex to ignore merge commits ([#439](https://github.com/marionebl/commitlint/issues/439)) ([905e9d5](https://github.com/marionebl/commitlint/commit/905e9d5))
+
+
+
+
 <a name="7.1.2"></a>
@@ -8,0 +20,0 @@ ## [7.1.2](https://github.com/marionebl/commitlint/compare/v7.1.1...v7.1.2) (2018-09-04)

lib/index.js

@@ -14,3 +14,3 @@ 'use strict';
 
-const WILDCARDS = [c => c.match(/^(Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?))(?:\r?\n)*$)/), c => c.match(/^(R|r)evert (.*)/), c => c.match(/^(fixup|squash)!/), c => _semver2.default.valid(c.split('\n').shift().replace(/^chore(\([^)]+\))?:/, '').trim()), c => c.match(/^Merged (.*?)(in|into) (.*)/), c => c.match(/^Merge remote-tracking branch (.*)/), c => c.match(/^Automatic merge from (.*)/), c => c.match(/^Auto-merged (.*?) into (.*)/)];
+const WILDCARDS = [c => c.match(/^((Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?)))(?:\r?\n)*$)/m), c => c.match(/^(R|r)evert (.*)/), c => c.match(/^(fixup|squash)!/), c => _semver2.default.valid(c.split('\n').shift().replace(/^chore(\([^)]+\))?:/, '').trim()), c => c.match(/^Merged (.*?)(in|into) (.*)/), c => c.match(/^Merge remote-tracking branch (.*)/), c => c.match(/^Automatic merge from (.*)/), c => c.match(/^Auto-merged (.*?) into (.*)/)];
 
@@ -17,0 +17,0 @@ function isIgnored(commit = '') {

lib/index.test.js

@@ -51,2 +51,7 @@ 'use strict';
 
+(0, _ava2.default)('should return true for branch merges with newline characters and more characters after it', t => {
+	t.true((0, _2.default)("Merge branch 'ctrom-YarnBuild'\n "));
+	t.true((0, _2.default)("Merge branch 'ctrom-YarnBuild'\r\n # some comment"));
+});
+
 (0, _ava2.default)('should return true for revert commits', t => {
@@ -86,2 +91,6 @@ t.true((0, _2.default)(`Revert "docs: add recipe for linting of all commits in a PR (#36)"\n\nThis reverts commit 1e69d542c16c2a32acfd139e32efa07a45f19111.`));
 });
+
+(0, _ava2.default)('should return false for commits containing, but not starting, with merge branch', t => {
+	t.false((0, _2.default)('foo bar Merge branch xxx'));
+});
 //# sourceMappingURL=index.test.js.map

package.json

 {
   "name": "@commitlint/is-ignored",
-  "version": "7.1.2",
+  "version": "7.2.0",
   "description": "Lint your commit messages",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

17794

increased by8.99%

Lines of code

82

increased by9.33%

No dependency changes