Merge pull request #166 from kinvolk/fix-how-we-check-dev-mode

app: Update how we check dev mode for desktop app
headlamp-k8s · Jan 13, 2021 · 26b61f8 · 26b61f8
2 parents 8625dbf + bacab83
commit 26b61f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/electron/main.js b/app/electron/main.js
@@ -137,8 +137,7 @@ function startElecron() {
   const menu = Menu.buildFromTemplate(template);
   Menu.setApplicationMenu(menu);
 
-  const isDev = process.mainModule.filename.indexOf('app.asar') === -1 ||
-    process.mainModule.filename.indexOf('app') === -1;
+  const isDev = process.env.ELECTRON_DEV || false;
 
   function createWindow () {
     const startUrl = process.env.ELECTRON_START_URL || url.format({

diff --git a/app/package.json b/app/package.json
@@ -10,7 +10,7 @@
     "start": "npm run copy-server-binary && cd ../ && make run-backend  & cd ../frontend/ && export BROWSER=none && npm start",
     "build": "npm run copy-server-binary && cd ../frontend/ && PUBLIC_URL='./' npm run build && cp -r ../app/electron/. build/electron",
     "package": "mkdir -p build && cp -r ../frontend/build/* ./build && electron-builder build -c.extraMetadata.main=build/electron/main.js --publish never",
-    "serve-dev": "export ELECTRON_START_URL=http://localhost:3000 && electron .",
+    "serve-dev": "export ELECTRON_DEV=1 && export ELECTRON_START_URL=http://localhost:3000 && electron .",
     "publish": "mkdir -p build && cp -r ../frontend/build/* ./build && electron-builder build -c.extraMetadata.main=build/electron/main.js --publish always"
   },
   "build": {
@@ -48,7 +48,10 @@
       "../frontend/node_modules/**/*",
       "node_modules/**/*"
     ],
-    "extraResources": ["./electron/server","./electron/server.exe"],
+    "extraResources": [
+      "./electron/server",
+      "./electron/server.exe"
+    ],
     "extraFiles": [
       {
         "from": "../frontend/build",