Merge branch 'v2.3.0'

.gitignore

@@ -1,5 +1,7 @@
-dist/
 .idea/
+build/
+dist/
 nbproject/
+node_modules/
 vendor/
-wordpress/
+wordpress/

composer.json

@@ -2,7 +2,7 @@
   "name": "redbit/simpleshop-wp-plugin",
   "description": "SimpleShop WordPress Plugin",
   "keywords": ["simpleshop", "vyfakturuj", "api", "faktura"],
-  "homepage": "https://www.simpleshop.cz/category/wordpress-plugin/",
+  "homepage": "https://podpora.redbit.cz/stitek/wp-plugin/",
   "type": "wordpress-plugin",
   "license": "MIT",
   "authors": [
@@ -16,6 +16,7 @@
   },
   "require": {
     "php": ">=5.6.20",
+    "ext-json": "*",
     "cmb2/cmb2": "dev-master",
     "webdevstudios/cmb2-post-search-field": "dev-master",
     "vyfakturuj/vyfakturuj-api-php": "^2.5"

deploy-exclude.lst

@@ -1,13 +1,16 @@
 *.git*
 *.gitignore*
 *.idea*
-*nbproject*
 *assets*
 *dist*
+*node_modules*
 *tools*
 *wordpress*
 *.DS_Store
 composer.json
 composer.lock
 deploy-exclude.lst
 deploy.php
+package.json
+package-lock.json
+webpack.config.js

deploy.php

@@ -19,7 +19,6 @@
 }
 
 
-
 class DeployScript {
 	/** @var string */
 	public $distDir = '';
@@ -52,11 +51,15 @@ public function run( array $args ) {
 
 		$this->validateVersion( $this->version );
 
-		// Update deps
-		echo "Updating dependencies...\n";
+		// Update Composer deps
+		echo "Updating Composer dependencies...\n";
 		$this->updateComposer();
-		echo "Updating dependencides done OK.\n\n";
+		echo "Updating Composer dependencides done OK.\n\n";
 
+		// Update NPM deps
+		echo "Building Gutenberg blocks...\n";
+		$this->buildBlock();
+		echo "Building Gutenberg blocks done OK.\n\n";
 
 		// Building package
 		echo sprintf( 'Building package for version %s... ', $this->version );
@@ -178,7 +181,7 @@ private function cleanDir( $dir ) {
 
 	private function updateComposer( $baseDir = __DIR__ ) {
 		$prevDir = getcwd();
-		$cmd     = 'composer install --ignore-platform-reqs';
+		$cmd     = 'composer install --ignore-platform-reqs && composer status --verbose';
 
 		chdir( $baseDir );
 		passthru( $cmd, $return_var );
@@ -189,6 +192,20 @@ private function updateComposer( $baseDir = __DIR__ ) {
 		}
 	}
 
+	private function buildBlock( $baseDir = __DIR__ ) {
+		$prevDir = getcwd();
+		$cmd     = 'npm install && npm run build';
+
+		chdir( $baseDir );
+		passthru( $cmd, $return_var );
+		chdir( $prevDir );
+
+		if ( $return_var !== 0 ) {
+			throw new \RuntimeException( sprintf( 'NPM command failed, command was: "%s"', $cmd ) );
+		}
+
+	}
+
 	/**
 	 * @return string
 	 */