Merge pull request #502 from getblocklab/version-bump-to-1.5.3

Version bump to 1.5.3

.gitignore

@@ -105,7 +105,6 @@ node_modules
 
 # Composer
 vendor
-cghooks.lock
 
 # Tests
 tests/data/

CHANGELOG.md

@@ -1,6 +1,15 @@
 ## Changelog #
 
-### 1.5.2 – 2019-12-02 ###
+### 1.5.3 – 2020-01-20 ###
+
+Some UI improvements, bugfixes, and improved stability.
+
+* Fix: Improved import error feedback, and cleaner methods
+* Fix: Editor bug from `@wordpress/nux` package being deprecated
+* New: Improved stability, including JS tests and query limit
+* New: Pre-commit hook to lint only staged files
+
+### 1.5.2 – 2020-02-04 ###
 
 Some small tweaks to the Block Importer and onboarding dialogs.
 

README.md

@@ -1,7 +1,7 @@
 # Block Lab #
 
 Contributors: lukecarbis, ryankienstra, Stino11, rheinardkorf
-Tags: Gutenberg, Blocks
+Tags: gutenberg, blocks, block editor, fields, template
 Requires at least: 5.0
 Tested up to: 5.3
 Requires PHP: 5.6
@@ -51,7 +51,7 @@ Block Lab Pro is here, with powerful features to take your block building to the
 
 ### Manually ###
 * Clone Block Lab into a working directory with `https://github.com/getblocklab/block-lab.git`
-* `cd` into the `block-lab` directory, and run `npm install`
+* `cd` into the `block-lab` directory, and run `npm install && composer install`
 * Next, build the scripts and styles with `npm build`
 * Move the `block-lab` folder to your `/wp-content/plugins/` directory
 * Activate the Block Lab plugin through the Plugins menu in WordPress

bin/pre-commit.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Lint staged PHP files
 php_files=$( git diff --diff-filter=d --staged --name-only | grep -E '/*\.php$' )
 if [ ! -z "$php_files" ]; then
@@ -15,3 +17,6 @@ if [ ! -z "$js_files" ]; then
         exit 1
     fi
 fi
+
+# Lint package.json
+npm run lint:pkg-json

block-lab.php

@@ -9,7 +9,7 @@
  * Plugin Name: Block Lab
  * Plugin URI: https://getblocklab.com
  * Description: The easy way to build custom blocks for Gutenberg.
- * Version: 1.5.2
+ * Version: 1.5.3
  * Author: Block Lab
  * Author URI: https://getblocklab.com
  * License: GPL2

composer.json

@@ -9,20 +9,10 @@
     },
     "require-dev": {
         "brain/monkey": "^2",
-        "brainmaestro/composer-git-hooks": "^2.8",
         "dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
         "mockery/mockery": "^1.2.4",
         "phpcompatibility/phpcompatibility-wp": "2.1.0",
         "squizlabs/php_codesniffer": "^3.4",
         "wp-coding-standards/wpcs": "2.2.0"
-    },
-    "extra": {
-        "hooks": {
-            "pre-commit": "bash bin/pre-commit.sh"
-        }
-    },
-    "scripts": {
-        "post-install-cmd": "cghooks add --ignore-lock",
-        "post-update-cmd": "cghooks update"
     }
 }

gulpfile.js

@@ -88,11 +88,13 @@ gulp.task( 'clean:bundle', function () {
 		'package/trunk/Makefile',
 		'package/trunk/package*.json',
 		'package/trunk/phpunit.xml',
+		'package/trunk/phpcs.xml',
 		'package/trunk/README.md',
 		'package/trunk/CHANGELOG.md',
+		'package/trunk/CODE_OF_CONDUCT.md',
+		'package/trunk/CONTRIBUTING.md',
 		'package/trunk/webpack.config.js',
 		'package/trunk/.github',
-		'package/trunk/cghooks.lock',
 		'package/prepare',
 	] );
 } );

js/blocks/helpers/test/registerBlocks.js

@@ -1,4 +1,3 @@
-
 /**
  * Internal dependencies
  */

package.json

@@ -1,7 +1,7 @@
 {
   "name": "block-lab",
   "title": "Block Lab",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "WordPress plugin with a simple templating system for building custom blocks.",
   "author": "Block Lab",
   "license": "GPL-2.0-or-later",
@@ -51,10 +51,11 @@
     "gulp": "^4.0.2",
     "gulp-run": "^1.7.1",
     "gulp-string-replace": "^1.1.2",
+    "husky": "^4.0.10",
     "jest-silent-reporter": "0.1.2",
     "merge-stream": "^2.0.0",
     "mini-css-extract-plugin": "0.8.2",
-    "node-sass": "^4.13.0",
+    "node-sass": "^4.13.1",
     "npm-run-all": "4.1.5",
     "postcss-loader": "^3.0.0",
     "raw-loader": "^4.0.0",
@@ -77,6 +78,7 @@
     "lint:pkg-json": "wp-scripts lint-pkg-json",
     "lint:php": "vendor/bin/phpcs",
     "lint:php:fix": "vendor/bin/phpcbf",
+    "precommit": "./bin/pre-commit.sh",
     "test:js": "wp-scripts test-unit-js --config=tests/js/jest.config.js"
   }
 }