Merge pull request #801 from mrfelton/chore/update-deps

Chore/update deps

app/main.dev.js

@@ -7,6 +7,10 @@
  * `./app/main.prod.js` using webpack. This gives us some performance wins.
  */
 import { app, BrowserWindow, session } from 'electron'
+import installExtension, {
+  REACT_DEVELOPER_TOOLS,
+  REDUX_DEVTOOLS
+} from 'electron-devtools-installer'
 import { mainLog } from './lib/utils/log'
 import ZapMenuBuilder from './lib/zap/menuBuilder'
 import ZapController from './lib/zap/controller'
@@ -57,15 +61,13 @@ app.on('ready', () => {
    * In development mode or when DEBUG_PROD is set, enable debugging tools.
    */
   if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
-    // eslint-disable global-require
-    require('electron-debug')()
-    const installer = require('electron-devtools-installer')
-    const forceDownload = !!process.env.UPGRADE_EXTENSIONS
-    const extensions = ['REACT_DEVELOPER_TOOLS', 'REDUX_DEVTOOLS']
+    installExtension(REACT_DEVELOPER_TOOLS)
+      .then(name => mainLog.debug(`Added Extension: ${name}`))
+      .catch(err => mainLog.warn(`An error occurred when installing REACT_DEVELOPER_TOOLS: ${err}`))
 
-    Promise.all(extensions.map(name => installer.default(installer[name], forceDownload))).catch(
-      mainLog.error
-    )
+    installExtension(REDUX_DEVTOOLS)
+      .then(name => mainLog.debug(`Added Extension: ${name}`))
+      .catch(err => mainLog.warn(`An error occurred when installing REDUX_DEVTOOLS: ${err}`))
 
     zap.mainWindow.webContents.once('dom-ready', () => {
       zap.mainWindow.openDevTools()

app/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/LN-Zap/zap-desktop"
   },
   "scripts": {
-    "postinstall": "npm rebuild --runtime=electron --target=2.0.2 --disturl=https://atom.io/download/electron"
+    "postinstall": "npm rebuild --runtime=electron --target=3.0.0 --disturl=https://atom.io/download/electron"
   },
   "license": "MIT",
   "dependencies": {

package.json

@@ -195,14 +195,14 @@
     "@commitlint/config-conventional": "^7.1.2",
     "add-asset-html-webpack-plugin": "^3.0.1",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^9.0.0",
+    "babel-eslint": "^10.0.1",
     "babel-jest": "^23.6.0",
     "babel-loader": "^7.1.4",
     "babel-plugin-add-module-exports": "^1.0.0",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-dynamic-import-webpack": "^1.0.2",
     "babel-plugin-flow-runtime": "^0.17.0",
-    "babel-plugin-react-intl": "^3.0.0",
+    "babel-plugin-react-intl": "^3.0.1",
     "babel-plugin-react-intl-auto": "^1.1.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
@@ -227,52 +227,52 @@
     "enzyme": "^3.6.0",
     "enzyme-adapter-react-16": "^1.5.0",
     "enzyme-to-json": "^3.3.4",
-    "eslint": "^5.6.0",
+    "eslint": "^5.6.1",
     "eslint-config-airbnb": "^17.1.0",
-    "eslint-config-prettier": "^3.0.1",
+    "eslint-config-prettier": "^3.1.0",
     "eslint-formatter-pretty": "^1.3.0",
     "eslint-import-resolver-webpack": "^0.10.1",
     "eslint-plugin-compat": "^2.5.1",
-    "eslint-plugin-flowtype": "^2.50.0",
+    "eslint-plugin-flowtype": "^2.50.3",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^21.22.0",
+    "eslint-plugin-jest": "^21.24.0",
     "eslint-plugin-json": "^1.2.1",
     "eslint-plugin-jsx-a11y": "^6.1.1",
     "eslint-plugin-markdown": "^1.0.0-beta.6",
-    "eslint-plugin-prettier": "^2.6.2",
+    "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-react": "^7.11.1",
     "extract-react-intl-messages": "^0.10.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "fbjs-scripts": "^0.8.3",
+    "fbjs-scripts": "^1.0.1",
     "file-loader": "^2.0.0",
-    "flow-bin": "^0.81.0",
+    "flow-bin": "^0.82.0",
     "flow-runtime": "^0.17.0",
     "flow-typed": "^2.5.1",
     "html-webpack-plugin": "^3.2.0",
     "http-proxy-middleware": "^0.19.0",
-    "husky": "1.0.0-rc.14",
+    "husky": "1.1.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^23.6.0",
-    "jsdom": "^12.0.0",
+    "jsdom": "^12.1.0",
     "koa-connect": "^2.0.1",
-    "lint-staged": "^7.2.2",
-    "lnd-binary": "^0.3.6",
+    "lint-staged": "^7.3.0",
+    "lnd-binary": "^0.3.7",
     "minimist": "^1.2.0",
     "mock-spawn": "^0.2.6",
     "node-sass": "^4.9.3",
-    "prettier": "^1.14.2",
-    "react-test-renderer": "^16.5.1",
+    "prettier": "^1.14.3",
+    "react-test-renderer": "^16.5.2",
     "redux-logger": "^3.0.6",
     "rimraf": "^2.6.2",
     "sass-loader": "^7.1.0",
     "spectron": "^4.0.0",
     "style-loader": "^0.23.0",
-    "stylelint": "^9.5.0",
+    "stylelint": "^9.6.0",
     "stylelint-config-standard": "^18.2.0",
     "stylelint-formatter-pretty": "^1.0.3",
     "url-loader": "^1.1.1",
-    "webpack": "^4.19.0",
+    "webpack": "^4.20.2",
     "webpack-bundle-analyzer": "^3.0.2",
     "webpack-command": "^0.4.1",
     "webpack-merge": "^4.1.4",
@@ -286,10 +286,8 @@
     "country-data-lookup": "^0.0.3",
     "debug": "^4.0.1",
     "debug-logger": "^0.4.1",
-    "devtron": "^1.4.0",
-    "electron": "^2.0.9",
-    "electron-debug": "^2.0.0",
-    "electron-is-dev": "^0.3.0",
+    "electron": "^3.0.2",
+    "electron-is-dev": "^1.0.1",
     "electron-store": "^2.0.0",
     "font-awesome": "^4.7.0",
     "get-port": "^4.0.0",
@@ -300,27 +298,30 @@
     "lodash.pick": "^4.4.0",
     "prop-types": "^15.6.2",
     "qrcode.react": "0.8.0",
-    "react": "^16.5.1",
-    "react-dom": "^16.5.1",
-    "react-hot-loader": "^4.3.8",
+    "react": "^16.5.2",
+    "react-dom": "^16.5.2",
+    "react-hot-loader": "^4.3.11",
     "react-inlinesvg": "^0.8.1",
-    "react-intl": "^2.6.0",
+    "react-intl": "^2.7.0",
     "react-intl-redux": "^2.0.2",
-    "react-modal": "^3.5.1",
+    "react-modal": "^3.6.1",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^5.0.0-alpha.9",
-    "react-spring": "^5.8.0",
+    "react-spring": "^5.9.0",
     "redux": "^4.0.0",
     "redux-electron-ipc": "^1.1.13",
     "redux-thunk": "^2.3.0",
-    "reselect": "^3.0.1",
+    "reselect": "^4.0.0",
     "satoshi-bitcoin": "^1.0.4",
     "source-map-support": "^0.5.9",
     "split2": "^3.0.0",
     "tildify": "^1.2.0",
     "untildify": "^3.0.3",
-    "validator": "^10.7.1"
+    "validator": "^10.8.0"
+  },
+  "resolutions": {
+    "spectron/**/electron-chromedriver": "^3.0.0-beta.1"
   },
   "main": "internals/webpack/webpack.config.base.js",
   "directories": {