From 38d5926ee8e1ea2d39e5a8a8060cdd57e84ec804 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sat, 5 Jun 2021 12:59:23 -0400
Subject: [PATCH] electron@5

---
 extension/package.json                  |  6 +++---
 extension/test/electron/fixture/main.js |  9 ++++----
 extension/yarn.lock                     | 28 ++++++++++++-------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/extension/package.json b/extension/package.json
index d6e60f0d..165596a4 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -20,7 +20,7 @@
     "lint": "eslint .",
     "test:app": "cross-env BABEL_ENV=test jest test/app",
     "test:chrome": "jest test/chrome",
-    "test:electron": "jest test/electron && rimraf test/electron/tmp",
+    "test:electron": "jest test/electron",
     "test": "npm run test:app && npm run build:extension && npm run test:chrome && npm run test:electron"
   },
   "repository": {
@@ -44,8 +44,8 @@
     "bestzip": "^2.1.7",
     "copy-webpack-plugin": "^6.3.1",
     "cross-env": "^7.0.2",
-    "electron": "^3.1.13",
-    "electron-chromedriver": "^3.0.0",
+    "electron": "^5.0.13",
+    "electron-chromedriver": "^5.0.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-15.4": "^1.4.2",
     "eslint": "^7.6.0",
diff --git a/extension/test/electron/fixture/main.js b/extension/test/electron/fixture/main.js
index 03a81908..ab317c97 100644
--- a/extension/test/electron/fixture/main.js
+++ b/extension/test/electron/fixture/main.js
@@ -1,8 +1,6 @@
 const path = require('path');
 const { app, BrowserWindow } = require('electron');
 
-app.setPath('userData', path.join(__dirname, '../tmp'));
-
 app.on('window-all-closed', app.quit);
 app.on('ready', () => {
   BrowserWindow.addDevToolsExtension(
@@ -12,7 +10,10 @@ app.on('ready', () => {
   const mainWindow = new BrowserWindow({
     width: 150,
     height: 100,
+    webPreferences: {
+      nodeIntegration: true,
+    },
   });
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
-  mainWindow.openDevTools({ mode: 'detach' });
+  mainWindow.loadFile('index.html');
+  mainWindow.webContents.openDevTools({ mode: 'detach' });
 });
diff --git a/extension/yarn.lock b/extension/yarn.lock
index 44cba5ae..bc213f7e 100644
--- a/extension/yarn.lock
+++ b/extension/yarn.lock
@@ -1350,7 +1350,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
   integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
 
-"@types/node@^10.1.4":
+"@types/node@^10.12.18":
   version "10.17.60"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
@@ -3814,15 +3814,15 @@ editor@~1.0.0:
   resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
   integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I=
 
-electron-chromedriver@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-3.0.0.tgz#ec0a17badb6c3529813c660bf91a43fb91407674"
-  integrity sha512-xWivZRiPTtDFJt+qXv7Ax/Dmhxj0iqESOxoLZ2szu3fv6k1vYDUDJUMHfdfVAke9D2gBRIgChuGb5j3YEt6hxQ==
+electron-chromedriver@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-5.0.1.tgz#0c102a482f16bd47f54fcdd238cf64210395ff4a"
+  integrity sha512-w82q6KkIsKjzhcucllpxeulIxYn5rccNw43rpbMuZcgMQ0EPsckoYwUt7Gadmdi14xniZ+debN9SM8V1EUyaBQ==
   dependencies:
-    electron-download "^4.1.0"
-    extract-zip "^1.6.5"
+    electron-download "^4.1.1"
+    extract-zip "^1.6.7"
 
-electron-download@^4.1.0:
+electron-download@^4.1.0, electron-download@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
   integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==
@@ -3842,12 +3842,12 @@ electron-to-chromium@^1.3.591:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257"
   integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg==
 
-electron@^3.1.13:
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.13.tgz#aeb276f4cf5e3785078b6495e982ee46d553a5d2"
-  integrity sha512-aRNywoUSO1Va/lpU4nz3K6GDyFqYtlOnHGLcERAAHfhB+IJrJ34cUJW4FVBpm43AwvUdAeuCkVKRLtOmrgx5CA==
+electron@^5.0.13:
+  version "5.0.13"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.13.tgz#81d44f2078fb13d306279cf3854d3734f2c390b4"
+  integrity sha512-AM73AMZpb/5zm8eIXsIcp2eMdniD5WO+FqMtlIzhhtSjixflDm0pLtgudz0fHtiT/w6V+6YcpDVb4TtHtrJbHQ==
   dependencies:
-    "@types/node" "^10.1.4"
+    "@types/node" "^10.12.18"
     electron-download "^4.1.0"
     extract-zip "^1.0.3"
 
@@ -4600,7 +4600,7 @@ extract-zip@^1.0.3:
     mkdirp "0.5.1"
     yauzl "2.4.1"
 
-extract-zip@^1.6.5:
+extract-zip@^1.6.7:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
   integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==