Electron build fixes

BTS-CM · Aug 1, 2024 · 049c9ab · 049c9ab
1 parent eda9b69
commit 049c9ab
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 703 deletions.
diff --git a/app/background.js b/app/background.js
diff --git a/app/background.js.map b/app/background.js.map
diff --git a/app/preload.js b/app/preload.js
diff --git a/app/preload.js.map b/app/preload.js.map
diff --git a/build/webpack.main.config.js b/build/webpack.main.config.js
@@ -12,7 +12,7 @@ module.exports = function(env) {
             filename: "[name].js",
             path: path.resolve(__dirname, "../app"),
         },
-        mode: env === "production" ? "production" : "development",
+        mode: env && env.length ? env : "production",
         node: {
             __dirname: false,
             __filename: false

diff --git a/build/webpack.preload.config.js b/build/webpack.preload.config.js
@@ -11,7 +11,7 @@ module.exports = function(env) {
             path: path.resolve(__dirname, "../app"),
         },
         target: 'electron-preload',
-        mode: env === "production" ? "production" : "development",
+        mode: env && env.length ? env : "production",
 
         node: {
             __dirname: false,

diff --git a/package.json b/package.json
@@ -17,8 +17,15 @@
       "node_modules/**/*",
       "package.json"
     ],
+    "extraResources": [
+      {
+        "from": "./astroDist",
+        "to": "astroDist"
+      }
+    ],
     "directories": {
-      "buildResources": "resources"
+      "buildResources": "resources",
+      "output": "dist"
     },
     "nsis": {
       "oneClick": false,

diff --git a/src/background.js b/src/background.js
@@ -42,7 +42,15 @@ const createWindow = async () => {
     });
 
     const expressApp = express();
-    expressApp.use(express.static('astroDist'));
+
+    let astroDistPath;
+    if (process.env.NODE_ENV === 'development') {
+        astroDistPath = 'astroDist';
+    } else {
+        astroDistPath = path.join(process.resourcesPath, 'astroDist');
+    }
+
+    expressApp.use(express.static(astroDistPath));
     expressApp.listen(8080, () => {
         console.log("Express server listening on port 8080");
     });