From b8da7dd6ee7686361c95f6dd674647096f7ac91a Mon Sep 17 00:00:00 2001
From: Abhigyan Khaund <mail@abhigyan.xyz>
Date: Tue, 23 Jan 2018 00:29:15 +0530
Subject: [PATCH] gulp-dev: Add nodeman to dev script and fix renderer reload
 on changes.

Fixes: #368.
---
 app/renderer/main.html |  9 +++++++++
 gulpfile.js            |  2 +-
 package-lock.json      | 28 ++++++++++++++++++++++++++++
 package.json           |  5 +++--
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/renderer/main.html b/app/renderer/main.html
index 15add895..5bf5e2ab 100644
--- a/app/renderer/main.html
+++ b/app/renderer/main.html
@@ -41,4 +41,13 @@
 </body>
 <script src="js/main.js"></script>
 
+<!-- To trigger electron.reload on changes in renderer from gulp -->
+<script>
+  window.addEventListener('load', () => {
+    const isDev = require('electron-is-dev');
+    if (isDev) {
+      require('electron-connect').client.create();
+    }
+  });
+</script>
 </html>
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index a1bf907b..d71dc2a6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,7 +14,7 @@ gulp.task('dev', () => {
   // Reload renderer process
 	gulp.watch('app/renderer/css/*.css', ['reload:renderer']);
 	gulp.watch('app/renderer/*.html', ['reload:renderer']);
-	gulp.watch('app/renderer/js/*.js', ['reload:renderer']);
+	gulp.watch('app/renderer/js/**/*.js', ['reload:renderer']);
 });
 
 gulp.task('restart:browser', done => {
diff --git a/package-lock.json b/package-lock.json
index c59e14c2..249fc038 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4762,6 +4762,34 @@
         "inherits": "2.0.1"
       }
     },
+    "nodemon": {
+      "version": "1.14.11",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz",
+      "integrity": "sha512-323uPopdzYcyDR2Ze1UOLF9zocwoQEyGPiKaLm/Y8Mbfjylt/YueAJUVHqox+vgG8TqZqZApcHv5lmUvrn/KQw==",
+      "dev": true,
+      "requires": {
+        "chokidar": "2.0.0",
+        "debug": "3.1.0",
+        "ignore-by-default": "1.0.1",
+        "minimatch": "3.0.4",
+        "pstree.remy": "1.1.0",
+        "semver": "5.4.1",
+        "touch": "3.1.0",
+        "undefsafe": "2.0.1",
+        "update-notifier": "2.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "node-abi": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
diff --git a/package.json b/package.json
index 95cb5f99..27ce42b1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "postinstall": "electron-builder install-app-deps",
     "test": "xo",
     "test-e2e": "gulp test-e2e",
-    "dev": "gulp dev",
+    "dev": "gulp dev & nodemon --watch app/main --watch app/renderer --exec 'npm test' -e html,css,js",
     "pack": "electron-builder --dir",
     "dist": "electron-builder",
     "mas": "electron-builder --mac mas",
@@ -109,13 +109,14 @@
     "assert": "1.4.1",
     "cp-file": "^5.0.0",
     "devtron": "1.4.0",
-    "electron-builder": "19.53.6",
     "electron": "1.7.10",
+    "electron-builder": "19.53.6",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",
     "gulp": "3.9.1",
     "gulp-tape": "0.0.9",
     "is-ci": "^1.0.10",
+    "nodemon": "^1.14.11",
     "pre-commit": "1.2.2",
     "spectron": "3.7.2",
     "tap-colorize": "^1.2.0",