Merge branch 'release/2.1'

README.md

@@ -8,7 +8,7 @@ This plugin requires Grunt `^1.0.4`
 If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
 
 ```shell
-npm install grunt-yoast-tasks --save-dev
+npm i @yoast/grunt-plugin-tasks --save-dev
 ```
 
 Once the plugin has been installed, it may be enabled inside your Gruntfile with this bit of JavaScript:
@@ -2175,6 +2175,10 @@ get-latest-pr-texts: {
 
 ## Release History
 
+### 2.1.1
+- Fixes a issue with Z cutting of changelog lines
+- Fixes a issue with the install command. Props to [chrisschwartze](ttps://github.com/chrisschwartze).
+
 ### 2.1.1
 - fix issue with finding correct yoast-cli option
 

lib/logbuilder.js

@@ -191,7 +191,7 @@ class ChangelogBuilder {
 	addLinesPerHeader( value ) {
 		const key = `${value.match( new RegExp(  "[ a-zA-Z]+:" ) )}`;
 		// eslint-disable-next-line no-control-regex
-		const lines = value.match( new RegExp( "(?<=\n)\\*([\n]|.)+?(?=\Z|\n\n|\n\\*|\n$)", "gm" ) );
+		const lines = value.match( new RegExp( "(?<=\n)\\*([\n]|.)+?(?=\n\n|\n\\*|\n$)", "gm" ) );
 		if ( this.ChangelogMap.has( key ) ) {
 			this.ChangelogMap.get( key ).append( lines );
 		} else {
@@ -215,7 +215,7 @@ class ChangelogBuilder {
 	 substractLinesPerHeader( value ) {
 		const key = `${value.match( new RegExp(  "[ a-zA-Z]+:" ) )}`;
 		// eslint-disable-next-line no-control-regex
-		const lines = value.match( new RegExp( "(?<=\n)\\*([\n]|.)+?(?=\Z|\n\n|\n\\*|\n$)", "gm" ) );
+		const lines = value.match( new RegExp( "(?<=\n)\\*([\n]|.)+?(?=\n\n|\n\\*|\n$)", "gm" ) );
 		if ( this.ChangelogMap.has( key ) ) {
 			this.ChangelogMap.get( key ).disengage( lines );
 		}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@yoast/grunt-plugin-tasks",
 	"description": "Custom Yoast grunt tasks",
-	"version": "2.1.1",
+	"version": "2.1.2",
 	"homepage": "https://github.com/Yoast/",
 	"repository": {
 		"type": "git",
@@ -57,4 +57,4 @@
 	"browserslist": [
 		"extends @yoast/browserslist-config"
 	]
-}
+}