upgrade: electron 8.2.0 and builder 22.4.1 (#14)

* upgrade: electron 7 * add no-sandbox * upgrade electron and electron-builder * upgrade: electron 8.2.0 and builder 22.4.1 * update app uri * fix: linux icon issue
ringcentral · Mar 26, 2020 · fada1b3 · fada1b3
1 parent 53a3e8e
commit fada1b3
Show file tree

Hide file tree

Showing 12 changed files with 638 additions and 1,055 deletions.
diff --git a/app.html b/app.html
@@ -120,7 +120,7 @@
         partition="persist:rcstorage"
         allowpopups
         id="rc-widget-adapter-frame"
-        src="https://ringcentral.github.io/ringcentral-embeddable/app.html?userAgent=RingCentralEmbeddableForLinux/0.1.2&disableConferenceCall=false&disableActiveCallControl=false"
+        src="https://ringcentral.github.io/ringcentral-embeddable/app.html?appVersion=0.1.3&userAgent=RingCentralEmbeddableForLinux/0.1.3&disableConferenceCall=false"
       >
       </webview>
     </div>

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -7,11 +7,10 @@ files:
   - app.js
   - preload.js
   - header_logo.svg
-  - icon.png
-  - icon.icns
-  - build/icon.*
+  - icon.*
+  - icons/*
 directories:
-  buildResources: build
+  buildResources: ./
   output: release
 publish:
   -
@@ -39,4 +38,6 @@ linux:
     - deb
     - AppImage
   category: Telephony
-  desktop: rc-ev.desktop
+  executableName: ringcentral-embeddable-voice
+  executableArgs:
+    - --no-sandbox
diff --git a/icons/128x128.png b/icons/128x128.png
diff --git a/icons/16x16.png b/icons/16x16.png
diff --git a/icons/256x256.png b/icons/256x256.png
diff --git a/icons/32x32.png b/icons/32x32.png
diff --git a/icons/48x48.png b/icons/48x48.png
diff --git a/icons/512x512.png b/icons/512x512.png
diff --git a/main.js b/main.js
@@ -1,5 +1,4 @@
 const { app, BrowserWindow, ipcMain } = require('electron');
-
 const singleInstanceLock = app.requestSingleInstanceLock();
 
 if (!singleInstanceLock) {
@@ -28,6 +27,7 @@ function createMainWindow() {
     },
     frame: false,
     show: false, // hidden the windown before loaded
+    icon: __dirname + '/icons/32x32.png',
   });
   // open dev tool default
   if (process.env.DEBUG == 1) {

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "package-all": "electron-builder -mwl"
   },
   "devDependencies": {
-    "electron": "^6.0.12",
-    "electron-builder": "^21.2.0"
+    "electron": "^8.2.0",
+    "electron-builder": "^22.4.1"
   }
 }
diff --git a/rc-ev.desktop b/rc-ev.desktop