From 8d83241673c53b5bf77a7edcca856ce2df178135 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 22 Apr 2020 16:27:44 -0500
Subject: [PATCH 1/2] Bump the version of BL to 1.5.5

The main change is removing the upgrade screen,
though there are some minor package.json updates.
---
 CHANGELOG.md  | 7 +++++++
 block-lab.php | 2 +-
 package.json  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45eb76e1..f09cafbdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Changelog #
 
+### 1.5.5 – 2020-04-23 ###
+
+Removed upgrade screen, dependency updates
+
+* Tweak: By default, the upgrade screen is hidden
+* Tweak: Minor package.json dependency updates for security and reliability
+
 ### 1.5.4 – 2020-03-26 ###
 
 Improved stability, small bugfixes.
diff --git a/block-lab.php b/block-lab.php
index 32d44759b..ce4eb8d8f 100644
--- a/block-lab.php
+++ b/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.4
+ * Version: 1.5.5
  * Author: Block Lab
  * Author URI: https://getblocklab.com
  * License: GPL2
diff --git a/package.json b/package.json
index 7d620ae7e..50af5dfdc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "block-lab",
   "title": "Block Lab",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "WordPress plugin with a simple templating system for building custom blocks.",
   "author": "Block Lab",
   "license": "GPL-2.0-or-later",

From 120126ffda563e8b905329e25d3b41c72d8d1478 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 22 Apr 2020 20:22:57 -0500
Subject: [PATCH 2/2] Fix failed JS test, at least locally

Add async and await,
to prevent the Jest error:
Warning: You seem to have overlapping act calls.
---
 js/blocks/components/test/fetch-input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/blocks/components/test/fetch-input.js b/js/blocks/components/test/fetch-input.js
index 2e60f319d..c8ac3b79e 100644
--- a/js/blocks/components/test/fetch-input.js
+++ b/js/blocks/components/test/fetch-input.js
@@ -67,12 +67,12 @@ describe( 'FetchInput', () => {
 		[ [ 'a-result' ], false ],
 		[ [ 'first-result', 'another-result' ], false ],
 	] )( 'should only have the error class if there are no results after focusing',
-		( apiResults, expected ) => {
+		async ( apiResults, expected ) => {
 			apiFetch.mockImplementationOnce( () => new Promise( ( resolve ) => resolve( apiResults ) ) );
 			const { input } = setup( baseProps );
 			fireEvent.focus( input );
 
-			waitForDomChange( { container: input } ).then( () => {
+			await waitForDomChange( { container: input } ).then( () => {
 				expect( input.classList.contains( 'text-control__error' ) ).toStrictEqual( expected );
 			} );
 		}