Skip to content

Commit

Permalink
Merge branch 'release/2.0.0' into master
Browse files Browse the repository at this point in the history
Bumps the version to 2.0.0 - See release notes
  • Loading branch information
marijnyoast committed Dec 16, 2020
2 parents fdd12b4 + 28239cc commit a374626
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,12 @@ grunt.initConfig( {

## Release History

### 2.0.0
- Removes watch configuration for JS & CSS. From now on plugins need to have their own `watch.js` file.
- Adds Grunt config file watching.
- Fixes Config/Shell PHPCS command
- Excludes Artifact and WordPress SVN checkout from POT file generation to prevent duplicates.

### 1.6.2
- Bump version of `grunt-contrib-compress` to add node 12 support.

Expand Down
5 changes: 4 additions & 1 deletion config/makepot.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ module.exports = {
'last-translator': '<%= pkg.pot.lasttranslator %>'
},
type: 'wp-plugin',
exclude: []
exclude: [
"<%= files.artifact %>",
".wordpress-svn",
]
}
}
};
4 changes: 2 additions & 2 deletions config/shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ module.exports = function() {

phpcs: {
command: "if [[ -f \"./vendor/squizlabs/php_codesniffer/bin/phpcs\"]]; " +
"then php ./vendor/squizlabs/php_codesniffer/bin/phpcs " +
"else php ./vendor/squizlabs/php_codesniffer/scripts/phpcs " +
"then php ./vendor/squizlabs/php_codesniffer/bin/phpcs; " +
"else php ./vendor/squizlabs/php_codesniffer/scripts/phpcs; " +
"fi",
},
};
Expand Down
18 changes: 7 additions & 11 deletions config/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,16 @@ module.exports = {
options: {
livereload: true,
},
js: {
grunt: {
options: {
reload: true,
},
files: [
"<%= files.js %>",
"<%= files.grunt %>",
"<%= files.config %>",
],
tasks: [
"build:js",
],
},
css: {
files: [
"<%= files.sass %>",
],
tasks: [
"build:css",
"eslint:grunt",
],
},
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@yoast/grunt-plugin-tasks",
"description": "Custom Yoast grunt tasks",
"version": "1.7.2",
"version": "2.0.0",
"homepage": "https://github.com/Yoast/",
"repository": {
"type": "git",
Expand Down

0 comments on commit a374626

Please sign in to comment.