fixed electron-builder

Author: schickling

.travis.yml

@@ -4,6 +4,12 @@ osx_image: xcode9.2
 language: node_js
 node_js: "8"
 
+cache:
+  directories:
+  - node_modules
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+
 install:
   - |
     security create-keychain -p travis build.keychain
@@ -19,3 +25,6 @@ install:
 notifications:
   email: false
 
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"

packages/graphql-playground-electron/package.json

@@ -6,9 +6,7 @@
   "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration)",
   "version": "v1.3.13",
   "author": {
-    "name": "Graphcool",
-    "email": "[email protected]",
-    "url": "https://www.graph.cool"
+    "name": "Graphcool"
   },
   "main": "lib/main",
   "build": {
@@ -20,28 +18,11 @@
     "win": {
       "icon": "static/icons/icon.ico"
     },
-    "nsis": {
-      "oneClick": false,
-      "perMachine": true,
-      "allowElevation": true,
-      "allowToChangeInstallationDirectory": true,
-      "runAfterFinish": false
-    },
     "linux": {
-      "category": "DeveloperTools",
+      "category": "Development",
       "target": [
-        {
-          "target": "deb",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        }
+        "AppImage",
+        "deb"
       ]
     },
     "files": [
@@ -66,7 +47,8 @@
     "build:ts": "rimraf lib && tsc",
     "build:webpack": "rimraf ./dist && NODE_ENV=production GRAPHQL_ENDPOINT=$BACKEND_ADDR/system webpack --config webpack.config.build.js && cp -r static/* dist",
     "build": "npm run build:ts && npm run build:webpack && cp -r dist lib && rimraf ./build:electron",
-    "release": "npm run build && electron-builder -lmw",
+    "release": "npm run build && electron-builder",
+    "release:all": "npm run build && electron-builder -lmw",
     "release:mac": "npm run build && electron-builder -m",
     "release:win": "npm run build && electron-builder -w",
     "release:linux": "npm run build && electron-builder -l",
@@ -91,11 +73,13 @@
     "test-quick"
   ],
   "dependencies": {
+    "@types/ms": "^0.7.30",
     "classnames": "^2.2.5",
     "date-fns": "^1.29.0",
     "electron-is-dev": "^0.3.0",
     "electron-localshortcut": "^2.0.2",
     "electron-log": "^2.2.13",
+    "electron-squirrel-startup": "^1.0.0",
     "electron-updater": "^2.17.6",
     "find-up": "^2.1.0",
     "graphcool-styles": "^0.2.5",
@@ -106,6 +90,7 @@
     "js-yaml": "^3.10.0",
     "lodash.merge": "^4.6.0",
     "minimist": "^1.2.0",
+    "ms": "^2.1.1",
     "query-string": "^5.0.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
@@ -136,7 +121,7 @@
     "concurrently": "^3.5.1",
     "css-loader": "^0.23.1",
     "electron": "^1.7.10",
-    "electron-builder": "19.45.5",
+    "electron-builder": "^19.49.2",
     "electron-devtools-installer": "^2.2.3",
     "extract-text-webpack-plugin": "^2.0.0-beta.3",
     "file-loader": "^0.11.2",

packages/graphql-playground-electron/src/main/index.ts

@@ -10,12 +10,17 @@ import {
 } from 'electron'
 import * as queryString from 'query-string'
 import * as fs from 'fs'
-import dev = require('electron-is-dev')
-import { autoUpdater } from 'electron-updater'
 import { log } from '../shared/utils'
 import { buildTemplate } from './menu'
 import { createWindow } from './createWindow'
 import { WindowContext } from './types'
+import { startUpdates } from './updates'
+import squirrelStartup = require('electron-squirrel-startup')
+
+// Immediately quit the app if squirrel is launching it
+if (squirrelStartup) {
+  app.quit()
+}
 
 const windowContext: WindowContext = {
   readyWindowsPromises: {},
@@ -64,6 +69,10 @@ app.on('open-file', (event, filePath) => {
   forceSend('OpenSelectedFile', filePath, filePath)
 })
 
+ipcMain.on('online-status-changed', (event, status) => {
+  process.env.CONNECTION = status
+})
+
 ipcMain.on('async', (event, arg) => {
   const focusedWindow = BrowserWindow.getFocusedWindow()
   if (focusedWindow) {
@@ -83,19 +92,18 @@ ipcMain.on('cwd', (event, msg) => {
 app.on('ready', () => {
   createWindow(windowContext)
 
-  if (!dev) {
-    const logger = require('electron-log')
-    logger.transports.file.level = 'info'
-    autoUpdater.logger = logger
+  startUpdates()
+  // const logger = require('electron-log')
+  // logger.transports.file.level = 'info'
+  // autoUpdater.logger = logger
 
-    forceSend('SettingsRequest', '')
+  // forceSend('SettingsRequest', '')
 
-    ipcMain.once('SettingsResponse', (event, settingsString) => {
-      log.info('settings', settingsString)
-      autoUpdater.allowPrerelease = getBetaUpdates(settingsString)
-      autoUpdater.checkForUpdatesAndNotify()
-    })
-  }
+  // ipcMain.once('SettingsResponse', (event, settingsString) => {
+  //   log.info('settings', settingsString)
+  //   autoUpdater.allowPrerelease = getBetaUpdates(settingsString)
+  //   autoUpdater.checkForUpdatesAndNotify()
+  // })
 
   const menu = Menu.buildFromTemplate(buildTemplate(windowContext))
   Menu.setApplicationMenu(menu)
@@ -170,13 +178,13 @@ async function forceSend(channel: string, arg: string, byPath?: string) {
   window.webContents.send(channel, arg)
 }
 
-function getBetaUpdates(settingsString: string | undefined): boolean {
-  try {
-    const settings = JSON.parse(settingsString)
-    return !!settings['general.betaUpdates']
-  } catch (e) {
-    //
-  }
+// function getBetaUpdates(settingsString: string | undefined): boolean {
+//   try {
+//     const settings = JSON.parse(settingsString)
+//     return !!settings['general.betaUpdates']
+//   } catch (e) {
+//     //
+//   }
 
-  return false
-}
+//   return false
+// }

packages/graphql-playground-electron/src/main/notify.ts

@@ -0,0 +1,22 @@
+import { shell, Notification } from 'electron'
+
+export const notify = ({ title, body, url, onClick }) => {
+  const notification = new Notification({
+    title,
+    body,
+    silent: true,
+  })
+
+  if (url || onClick) {
+    notification.on('click', () => {
+      if (onClick) {
+        return onClick()
+      }
+
+      shell.openExternal(url)
+    })
+  }
+
+  notification.show()
+  console.log(`[Notification] ${title}: ${body}`)
+}

packages/graphql-playground-electron/src/main/updates.ts

@@ -0,0 +1,70 @@
+import { app, autoUpdater } from 'electron'
+import ms = require('ms')
+import dev = require('electron-is-dev')
+
+const setUpdateURL = () => {
+  const server = 'https://hazel-server-ppbimurjwk.now.sh/update'
+  autoUpdater.setFeedURL(`${server}/${process.platform}/${app.getVersion()}`)
+}
+
+const checkForUpdates = () => {
+  if (process.env.CONNECTION === 'offline') {
+    // Try again after half an hour
+    setTimeout(checkForUpdates, ms('30m'))
+    return
+  }
+
+  // Ensure we're pulling from the correct channel
+  try {
+    setUpdateURL()
+  } catch (err) {
+    // Retry later if setting the update URL failed
+    return
+  }
+
+  // Then ask the server for updates
+  autoUpdater.checkForUpdates()
+}
+
+const startAppUpdates = () => {
+  autoUpdater.on('error', error => {
+    // Report errors to console. We can't report
+    // to Slack and restart here, because it will
+    // cause the app to never start again
+    console.error(error)
+
+    // Then check again for update after 15 minutes
+    setTimeout(checkForUpdates, ms('15m'))
+  })
+
+  // Check for app update after startup
+  setTimeout(checkForUpdates, ms('10s'))
+
+  autoUpdater.on('update-downloaded', () => {
+    autoUpdater.quitAndInstall()
+    app.quit()
+  })
+
+  autoUpdater.on('checking-for-update', () => {
+    console.log('Checking for app updates...')
+  })
+
+  autoUpdater.on('update-available', () => {
+    console.log('Found update for the app! Downloading...')
+  })
+
+  autoUpdater.on('update-not-available', () => {
+    console.log('No updates found. Checking again in 5 minutes...')
+    setTimeout(checkForUpdates, ms('5m'))
+  })
+}
+
+export const startUpdates = () => {
+  if (process.platform === 'linux') {
+    return
+  }
+
+  if (!dev) {
+    startAppUpdates()
+  }
+}