[SM-327] Electron hard reset

apps/desktop/package.json

@@ -23,11 +23,12 @@
     "build:dev": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"",
     "build:main": "cross-env NODE_ENV=production webpack --config webpack.main.js",
     "build:main:dev": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js",
+    "build:main:watch": "npm run build-native && cross-env NODE_ENV=development webpack --config webpack.main.js --watch",
     "build:renderer": "cross-env NODE_ENV=production webpack --config webpack.renderer.js",
     "build:renderer:dev": "cross-env NODE_ENV=development webpack --config webpack.renderer.js",
     "build:renderer:watch": "cross-env NODE_ENV=development webpack --config webpack.renderer.js --watch",
-    "electron": "npm run build:main:dev && concurrently -k -n Main,Rend -c yellow,cyan \"electron --inspect=5858 ./build --watch\" \"npm run build:renderer:watch\"",
-    "electron:ignore": "npm run build:main:dev && concurrently -k -n Main,Rend -c yellow,cyan \"electron --inspect=5858 --ignore-certificate-errors ./build --watch\" \"npm run build:renderer:watch\"",
+    "electron": "node ./scripts/start.js",
+    "electron:ignore": "node ./scripts/start.js --ignore-certificate-errors",
     "clean:dist": "rimraf ./dist/*",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
     "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never",

apps/desktop/scripts/start.js

@@ -0,0 +1,34 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const concurrently = require("concurrently");
+const rimraf = require("rimraf");
+
+const args = process.argv.splice(2);
+
+rimraf.sync("build");
+
+concurrently(
+  [
+    {
+      name: "Main",
+      command: "npm run build:main:watch",
+      prefixColor: "yellow",
+    },
+    {
+      name: "Rend",
+      command: "npm run build:renderer:watch",
+      prefixColor: "cyan",
+    },
+    {
+      name: "Elec",
+      command: `npx wait-on ./build/main.js && npx electron --inspect=5858 ${args.join(
+        " "
+      )} ./build --watch`,
+      prefixColor: "green",
+    },
+  ],
+  {
+    prefix: "name",
+    outputStream: process.stdout,
+    killOthers: ["success", "failure"],
+  }
+);

apps/desktop/src/main.ts

@@ -64,8 +64,12 @@ export class Main {
     const watch = args.some((val) => val === "--watch");
 
     if (watch) {
+      const execName = process.platform === "win32" ? "electron.cmd" : "electron";
       // eslint-disable-next-line
-      require("electron-reload")(__dirname, {});
+      require("electron-reload")(__dirname, {
+        electron: path.join(__dirname, "../../../", "node_modules", ".bin", execName),
+        electronArgv: ["--inspect=5858", "--watch"],
+      });
     }
 
     this.logService = new ElectronLogService(null, app.getPath("userData"));

package.json

@@ -129,6 +129,7 @@
     "typescript": "4.6.4",
     "url": "^0.11.0",
     "util": "^0.12.4",
+    "wait-on": "^6.0.1",
     "webpack": "^5.64.4",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.9.3",