From 321c6c5c0171e257f48036b530fa99a4fa1b9047 Mon Sep 17 00:00:00 2001
From: Valerie <valerie@valnet.xyz>
Date: Wed, 20 Jul 2022 16:40:43 -0400
Subject: [PATCH] second pass, really...

---
 package-lock.json                | 37 ++++++++++++++++++++++++--------
 package.json                     |  1 +
 packages/renderer/.eslintrc.json |  3 ++-
 packages/renderer/tsconfig.json  |  1 -
 scripts/watch.js                 |  6 +++---
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de8d21f..a20e51a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
         "electron-updater": "5.0.5",
         "eslint-plugin-react": "^7.30.1",
         "express": "^4.18.1",
+        "get-port": "^6.1.2",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-time-ago": "^7.2.1",
@@ -4397,12 +4398,14 @@
       }
     },
     "node_modules/get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
-      "dev": true,
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
+      "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
       "engines": {
-        "node": ">=4"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/get-stream": {
@@ -7110,6 +7113,15 @@
         "get-port": "^3.1.0"
       }
     },
+    "node_modules/sync-rpc/node_modules/get-port": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/tar": {
       "version": "6.1.11",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
@@ -11364,10 +11376,9 @@
       }
     },
     "get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
-      "dev": true
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
+      "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw=="
     },
     "get-stream": {
       "version": "4.1.0",
@@ -13367,6 +13378,14 @@
       "dev": true,
       "requires": {
         "get-port": "^3.1.0"
+      },
+      "dependencies": {
+        "get-port": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+          "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
+          "dev": true
+        }
       }
     },
     "tar": {
diff --git a/package.json b/package.json
index 0fc3dd4..1861871 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "electron-updater": "5.0.5",
     "eslint-plugin-react": "^7.30.1",
     "express": "^4.18.1",
+    "get-port": "^6.1.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-time-ago": "^7.2.1",
diff --git a/packages/renderer/.eslintrc.json b/packages/renderer/.eslintrc.json
index 3a98671..c6c86a8 100644
--- a/packages/renderer/.eslintrc.json
+++ b/packages/renderer/.eslintrc.json
@@ -12,5 +12,6 @@
     "parser": "@typescript-eslint/parser",
     "ecmaVersion": 12,
     "sourceType": "module"
-  }
+  },
+  "no-unused-vars": "off"
 }
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
index 4edc9da..085a55e 100644
--- a/packages/renderer/tsconfig.json
+++ b/packages/renderer/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "impl"
     "module": "esnext",
     "target": "esnext",
     "sourceMap": false,
diff --git a/scripts/watch.js b/scripts/watch.js
index cd91bd1..34d1b1c 100644
--- a/scripts/watch.js
+++ b/scripts/watch.js
@@ -5,6 +5,8 @@ const electronPath = require('electron');
 const {spawn} = require('child_process');
 const node = 'node' + (process.platform === 'win32' ? '.exe' : '');
 
+const server = !process.argv.includes('--noserver');
+
 /** @type 'production' | 'development'' */
 const mode = process.env.MODE = process.env.MODE || 'development';
 
@@ -45,14 +47,12 @@ const setupServerPackageWatcher = () => {
     plugins: [{
       name: 'reload-server-on-server-package-change',
       writeBundle() {
-        /** Kill electron ff process already exist */
         if (spawnProcess !== null) {
           spawnProcess.off('exit', processDied);
           spawnProcess.kill('SIGINT');
           spawnProcess = null;
         }
 
-        /** Spawn new electron process */
         spawnProcess = spawn(node, ['./index.cjs'], {
           cwd: './packages/server/dist',
         });
@@ -195,7 +195,7 @@ const setupPreloadPackageWatcher = ({ws}) =>
      * See {@link setupMainPackageWatcher} JSDoc
      */
     await setupMainPackageWatcher(rendererWatchServer);
-    await setupServerPackageWatcher();
+    if(server) await setupServerPackageWatcher();
   } catch (e) {
     console.error(e);
     process.exit(1);