fix(updater): switch update menu items

- fixed update menu items.
- delete ".map" files before packing.

re #56

Author: breeze2

.gitignore

@@ -28,3 +28,6 @@ yarn-error.log*
 # breader
 public/electron.js
 public/electron.js.map
+
+# electron
+dev-app-update.yml

.travis.yml

@@ -1,5 +1,6 @@
 env:
   - SENTRY_RELEASE=$TRAVIS_TAG
+  - YARN_GPG=no
 
 matrix:
   include:
@@ -44,11 +45,13 @@ after_success:
   - if [ $TRAVIS_OS_NAME = linux ]; then cat ./coverage/lcov.info | yarn coveralls; fi
 
 before_deploy:
-  - yarn electron-pack --publish never
+  - ls ./build
+  - ls ./build/static/js
   - yarn sentry-cli releases new $SENTRY_RELEASE
   - yarn sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps --rewrite ./build
   - yarn sentry-cli releases finalize $SENTRY_RELEASE
-  - ls ./
+  - find ./build -name "*.map" -exec rm -f {} \;
+  - yarn electron-pack --publish never
   - ls ./dist
 
 deploy:

main/index.ts

@@ -1,15 +1,19 @@
 // Modules to control application life and create native browser window
 import * as Sentry from '@sentry/electron'
-import { app, BrowserWindow, Menu } from 'electron'
+import { app, BrowserWindow } from 'electron'
 import isDev from 'electron-is-dev'
 import path from 'path'
-import { template as menuTemplate } from './menu'
+import { initMenu } from './menu'
+import { initUpdaterMenuItems } from './updater'
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow: BrowserWindow | null = null
 const isWindows = process.platform === 'win32'
 
+initMenu()
+initUpdaterMenuItems()
+
 function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
@@ -48,7 +52,7 @@ function createWindow() {
       .catch((err: any) => console.error('An error occurred: ', err))
     // require('devtron').install()
 
-    mainWindow.loadURL('http://localhost:3000/?react_perf')
+    mainWindow.loadURL('http://localhost:3000')
   } else {
     mainWindow.loadFile(path.join(__dirname, '/../build/index.html'))
   }
@@ -74,10 +78,6 @@ function createWindow() {
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on('ready', createWindow)
-app.on('ready', () => {
-  const menu = Menu.buildFromTemplate(menuTemplate)
-  Menu.setApplicationMenu(menu)
-})
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {

main/menu.ts

@@ -2,13 +2,14 @@ import {
   app,
   BrowserWindow,
   Event,
+  Menu,
   MenuItem,
   MenuItemConstructorOptions,
   shell,
 } from 'electron'
-import { checkForUpdates } from './updater'
+import { checkForUpdates, restartToUpdate, UPDATER_STATUS_MAP } from './updater'
 
-export const template: MenuItemConstructorOptions[] = [
+const template: MenuItemConstructorOptions[] = [
   {
     label: 'Edit',
     submenu: [
@@ -66,6 +67,17 @@ export const template: MenuItemConstructorOptions[] = [
   },
 ]
 
+function addAboutMenuItem(
+  items: MenuItemConstructorOptions[],
+  position: number
+) {
+  const aboutItem: MenuItemConstructorOptions = {
+    label: `About ${app.getName()}`,
+    role: 'about',
+  }
+  items.splice.apply(items, [position, 0, aboutItem])
+}
+
 function addUpdateMenuItems(
   items: MenuItemConstructorOptions[],
   position: number
@@ -78,7 +90,34 @@ function addUpdateMenuItems(
     {
       click: checkForUpdates,
       enabled: true,
+      id: UPDATER_STATUS_MAP.NORMAL,
       label: 'Check for Updates',
+      visible: true,
+    },
+    {
+      enabled: false,
+      id: UPDATER_STATUS_MAP.CHECKING,
+      label: 'Checking updates...',
+      visible: false,
+    },
+    {
+      enabled: false,
+      id: UPDATER_STATUS_MAP.DOWNLOADING,
+      label: 'Downloading updates...',
+      visible: false,
+    },
+    {
+      enabled: false,
+      id: UPDATER_STATUS_MAP.ERROR,
+      label: 'Update Failed',
+      visible: false,
+    },
+    {
+      click: restartToUpdate,
+      enabled: true,
+      id: UPDATER_STATUS_MAP.READY,
+      label: 'Restart to update',
+      visible: false,
     },
   ]
 
@@ -110,14 +149,10 @@ function addPreferencesMenu(
 }
 
 if (process.platform === 'darwin') {
-  const name = app.getName()
+  const appName = app.getName()
   template.unshift({
-    label: name,
+    label: appName,
     submenu: [
-      {
-        label: `About ${name}`,
-        role: 'about',
-      },
       {
         type: 'separator',
       },
@@ -131,7 +166,7 @@ if (process.platform === 'darwin') {
       },
       {
         accelerator: 'Command+H',
-        label: `Hide ${name}`,
+        label: `Hide ${appName}`,
         role: 'hide',
       },
       {
@@ -155,15 +190,21 @@ if (process.platform === 'darwin') {
       },
     ],
   })
-
+  addAboutMenuItem(template[0].submenu as MenuItemConstructorOptions[], 0)
   addPreferencesMenu(template[0].submenu as MenuItemConstructorOptions[], 1)
   addUpdateMenuItems(template[0].submenu as MenuItemConstructorOptions[], 1)
-  // addPreferencesMenu(template, template.length - 1)
 }
 
 if (process.platform === 'win32' || process.platform === 'linux') {
   const helpMenu = template[template.length - 1].submenu
 
-  addUpdateMenuItems(helpMenu as MenuItemConstructorOptions[], 0)
   addPreferencesMenu(template, template.length - 1)
+  addUpdateMenuItems(helpMenu as MenuItemConstructorOptions[], 0)
+  // showAboutPanel not working in windows
+  // addAboutMenuItem(helpMenu as MenuItemConstructorOptions[], 0)
+}
+
+export function initMenu() {
+  const menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
 }