From bbef14ccc6c0663f1cc1899702bd0e7a80e13c2f Mon Sep 17 00:00:00 2001
From: Ronan Jouchet <ronan@jouchet.fr>
Date: Sat, 21 Jul 2018 08:45:01 -0400
Subject: [PATCH] Bump default Electron to 2.0.5, upgrade deps

---
 app/package.json                 |  2 +-
 package.json                     | 12 ++++++------
 src/constants.js                 |  2 +-
 src/infer/inferUserAgent.js      |  2 +-
 src/infer/inferUserAgent.test.js |  2 +-
 webpack.config.js                |  3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/package.json b/app/package.json
index 47af71d..7dce043 100644
--- a/app/package.json
+++ b/app/package.json
@@ -4,7 +4,7 @@
   "description": "Placeholder for the nativefier cli to override with a target url",
   "main": "lib/main.js",
   "dependencies": {
-    "electron-context-menu": "^0.9.1",
+    "electron-context-menu": "^0.10.0",
     "electron-dl": "^1.10.0",
     "electron-window-state": "^4.1.1",
     "loglevel": "^1.5.1",
diff --git a/package.json b/package.json
index 0427a49..3124faa 100644
--- a/package.json
+++ b/package.json
@@ -63,27 +63,27 @@
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-jest": "^22.1.0",
+    "babel-jest": "^23.4.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-register": "^6.26.0",
     "chai": "^4.1.2",
     "del": "^3.0.0",
-    "eslint": "^4.17.0",
-    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint": "^5.2.0",
+    "eslint-config-airbnb-base": "^13.0.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-prettier": "^2.6.0",
     "gulp": "^3.9.1",
     "gulp-babel": "^7.0.1",
     "gulp-sourcemaps": "^2.6.4",
-    "jest": "^22.1.4",
+    "jest": "^23.4.1",
     "prettier": "^1.12.1",
-    "regenerator-runtime": "^0.11.1",
+    "regenerator-runtime": "^0.12.0",
     "require-dir": "^1.0.0",
     "run-sequence": "^2.2.1",
-    "webpack-stream": "^4.0.0"
+    "webpack-stream": "^5.0.0"
   },
   "engines": {
     "node": ">= 4.0"
diff --git a/src/constants.js b/src/constants.js
index f389a23..1a4f1e7 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,5 +1,5 @@
 import path from 'path';
 
 export const DEFAULT_APP_NAME = 'APP';
-export const ELECTRON_VERSION = '2.0.4';
+export const ELECTRON_VERSION = '2.0.5';
 export const PLACEHOLDER_APP_DIR = path.join(__dirname, './../', 'app');
diff --git a/src/infer/inferUserAgent.js b/src/infer/inferUserAgent.js
index e07dc35..44f78b6 100644
--- a/src/infer/inferUserAgent.js
+++ b/src/infer/inferUserAgent.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
 import log from 'loglevel';
 
 const ELECTRON_VERSIONS_URL = 'https://atom.io/download/atom-shell/index.json';
-const DEFAULT_CHROME_VERSION = '58.0.3029.110';
+const DEFAULT_CHROME_VERSION = '61.0.3163.100';
 
 function getChromeVersionForElectronVersion(
   electronVersion,
diff --git a/src/infer/inferUserAgent.test.js b/src/infer/inferUserAgent.test.js
index 1b2038e..8ae0f2b 100644
--- a/src/infer/inferUserAgent.test.js
+++ b/src/infer/inferUserAgent.test.js
@@ -31,7 +31,7 @@ describe('Infer User Agent', () => {
 
     const TIMEOUT_URL = 'http://www.google.com:81/';
     await expect(inferUserAgent('1.6.7', 'darwin', TIMEOUT_URL)).resolves.toBe(
-      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36',
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36',
     );
   });
 });
diff --git a/webpack.config.js b/webpack.config.js
index 6de0624..e36a5b7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,9 +16,10 @@ module.exports = {
   },
   externals: nodeModules,
   module: {
-    loaders: [
+    rules: [
       { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
     ],
   },
   devtool: 'source-map',
+  mode: 'none',
 };