From a9e92e95b3a4c20f311c5d2d1af4125b1408fe15 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 11 May 2024 22:57:21 +0300
Subject: [PATCH] #12: Fix www.js in electron

---
 electron/bin/copy-dist.ts | 16 ++++++----------
 electron/src/electron.ts  |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/electron/bin/copy-dist.ts b/electron/bin/copy-dist.ts
index 78f09a1a3..ea28e12b4 100644
--- a/electron/bin/copy-dist.ts
+++ b/electron/bin/copy-dist.ts
@@ -33,7 +33,12 @@ async function copyFiles() {
 }
 
 async function copyDirs() {
-  const dirsToCopy = ["../common/images", "../client/libraries", "../server/db"];
+  const dirsToCopy = [
+      "../common/images",
+      "../client/src",
+      "../client/libraries",
+      "../server/src/views",
+      "../server/db"];
   for (const dir of dirsToCopy) {
     const destPath = path.join(DEST_DIR, trimRelativePath(dir));
     console.log(`Copying ${dir} -> ${destPath}`);
@@ -41,14 +46,6 @@ async function copyDirs() {
   }
 }
 
-async function copyClient() {
-  const srcDirsToCopy = ["../client/src", "../server/src/views"];
-  for (const dir of srcDirsToCopy) {
-    console.log(`Copying ${dir}`);
-    await fs.copy(dir, path.join(DEST_DIR_SRC, trimRelativePath(dir)));
-  }
-}
-
 async function copyNodeModules() {
   const nodeModulesFile = [
     "../client/node_modules/react/umd/react.production.min.js",
@@ -100,7 +97,6 @@ async function copyServerNodeModules() {
 try {
   copyFiles();
   copyDirs();
-  copyClient();
   copyNodeModules();
   copyServerNodeModules();
   console.log("Copying complete!");
diff --git a/electron/src/electron.ts b/electron/src/electron.ts
index 1acce293c..ffe380f6c 100644
--- a/electron/src/electron.ts
+++ b/electron/src/electron.ts
@@ -60,4 +60,4 @@ electron.app.on("will-quit", () => {
 // this is to disable electron warning spam in the dev console (local development only)
 process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
 
-require("./src/www.js");
+require("../../server/src/www.js"); // path is relative to dist/electron/src as defined in package.lock main