From 3aa5370c2bd79d6f9139e3b19a59cdffb194e216 Mon Sep 17 00:00:00 2001
From: Roman Axelrod <roman@axe-web.com>
Date: Thu, 18 Aug 2022 06:51:25 +0300
Subject: [PATCH] Fix Path issue.

---
 build.js  | 9 +++++----
 server.js | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.js b/build.js
index 00fb8bd..a3e652e 100755
--- a/build.js
+++ b/build.js
@@ -4,7 +4,7 @@ import {exec} from 'child_process';
 import config from 'config';
 import Generator from "yeoman-generator";
 
-const isDev = process.env.NODE_ENV === 'development' || config.get('isDev'); // Check README file in case you get "missing files" error.
+const isDev = process.env.NODE_ENV === 'development' || (config.has('isDev') && config.get('isDev')); // Check README file in case you get "missing files" error.
 const modulePath = isDev ? '' : 'node_modules/create-block-dev-tool/';
 
 const blockName = config.has('blockName') ? config.get('blockName') : 'development';
@@ -14,7 +14,7 @@ class buildGenerator extends Generator {
     this.data = await this.prompt([
       {
         type: "list",
-        name: "platfrom",
+        name: "platform",
         message: "Choose Platform",
         choices: ['WordPress', 'Hubspot', 'JavaScript', 'PHP'],
         default: 'WordPress'
@@ -24,8 +24,9 @@ class buildGenerator extends Generator {
 
   writing() {
     new Promise((resolve => {
-      if (['WordPress', 'PHP'].includes(this.data.platfrom)) {
-        exec(`cd platforms/php && composer install && php build.php '${blockName}' '${modulePath}'`, function (error, stdout) {
+      if (['WordPress', 'PHP'].includes(this.data.platform)) {
+        const backPath = modulePath ? modulePath.substr(-1).split('/').map(() => '..').join('/') : '';
+        exec(`cd ${modulePath}platforms/php && composer install && php build.php '${blockName}' '${backPath}'`, function (error, stdout) {
           console.log(stdout);
           resolve();
         });
diff --git a/server.js b/server.js
index 27ea9d6..a8220e9 100755
--- a/server.js
+++ b/server.js
@@ -22,7 +22,7 @@ import {escape} from "lodash-es";
  * Constants
  */
 
-const isDev = process.env.NODE_ENV === 'development' || config.get('isDev'); // Check README file in case you get "missing files" error.
+const isDev = process.env.NODE_ENV === 'development' || (config.has('isDev') && config.get('isDev')); // Check README file in case you get "missing files" error.
 const modulePath = isDev ? '' : 'node_modules/create-block-dev-tool/';
 const projectDir = modulePath;