From 716f366ef336491a9c3a578bb589c2759d2712d7 Mon Sep 17 00:00:00 2001
From: Bailey Stein <bailey.stein@deptagency.com>
Date: Mon, 15 Aug 2022 16:39:33 -0400
Subject: [PATCH] #219: Upgrade electron to v10, set enableRemoteModule to
 true, and replace deprecated Buffer() with Buffer.from()

---
 app/app/bcl/bclService.js          |  2 +-
 app/app/project/osServerService.js |  2 +-
 app/background.js                  |  1 +
 package-lock.json                  | 14 +++++++-------
 package.json                       |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/app/bcl/bclService.js b/app/app/bcl/bclService.js
index cf38e5ca..d5d777b5 100644
--- a/app/app/bcl/bclService.js
+++ b/app/app/bcl/bclService.js
@@ -560,7 +560,7 @@ export class BCL {
   //   vm.$http.get(url, {responseType: 'arraybuffer'}).then(response => {
   //     //extract dir and save to disk in local measures directory
   //     // convert arraybuffer to node buffer
-  //     const buf = new Buffer(new Uint8Array(response.data));
+  //     const buf = new Buffer.from(new Uint8Array(response.data));
   //     const zip = new vm.AdmZip(buf);
   //     // extract to location (and overwrite)
   //     zip.extractAllTo(vm.Project.getMeasuresDir().path() + '/', true);
diff --git a/app/app/project/osServerService.js b/app/app/project/osServerService.js
index 29faff31..9eace943 100644
--- a/app/app/project/osServerService.js
+++ b/app/app/project/osServerService.js
@@ -1212,7 +1212,7 @@ export class OsServer {
 
       // extract dir and save to disk in local measures directory
       // convert arraybuffer to node buffer
-      const buf = new Buffer(new Uint8Array(response.data));
+      const buf = new Buffer.from(new Uint8Array(response.data));
       if (vm.Message.showDebug()) vm.$log.debug('buffer');
 
       // save
diff --git a/app/background.js b/app/background.js
index 3eb15f47..4d0d0546 100644
--- a/app/background.js
+++ b/app/background.js
@@ -40,6 +40,7 @@ app.on('ready', () => {
     width: 1000,
     height: 600,
     webPreferences: {
+      enableRemoteModule: true,
       nodeIntegration: true,
       webviewTag: true,
       webSecurity: false // Disable the same-origin policy when using http
diff --git a/package-lock.json b/package-lock.json
index 80edb959..92cb9316 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "browser-sync-spa": "~1.0.3",
         "chalk": "~1.1.1",
         "del": "~2.2.0",
-        "electron": "~9.4.4",
+        "electron": "~10.4.7",
         "eslint-plugin-angular": "~1.0.0",
         "eslint-plugin-lodash": "~1.5.1",
         "estraverse": "~4.2.0",
@@ -3932,9 +3932,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "9.4.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.4.tgz",
-      "integrity": "sha512-dcPlTrMWQu5xuSm6sYV42KK/BRIqh3erM8v/WtZqaDmG7pkCeJpvw26Dgbqhdt78XmqqGiN96giEe6A3S9vpAQ==",
+      "version": "10.4.7",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.4.7.tgz",
+      "integrity": "sha512-je+AokZfKldI5GItXOx5pwBEAnbEqTrEPhaRUm2RN0OFBPXO+7wjJ3X+HvvlOHvKtfZrlU+57Dmkg1DseSFOPA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -18919,9 +18919,9 @@
       "dev": true
     },
     "electron": {
-      "version": "9.4.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.4.tgz",
-      "integrity": "sha512-dcPlTrMWQu5xuSm6sYV42KK/BRIqh3erM8v/WtZqaDmG7pkCeJpvw26Dgbqhdt78XmqqGiN96giEe6A3S9vpAQ==",
+      "version": "10.4.7",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.4.7.tgz",
+      "integrity": "sha512-je+AokZfKldI5GItXOx5pwBEAnbEqTrEPhaRUm2RN0OFBPXO+7wjJ3X+HvvlOHvKtfZrlU+57Dmkg1DseSFOPA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index 7ef7520b..69bc1a09 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "browser-sync-spa": "~1.0.3",
     "chalk": "~1.1.1",
     "del": "~2.2.0",
-    "electron": "~9.4.4",
+    "electron": "~10.4.7",
     "eslint-plugin-angular": "~1.0.0",
     "eslint-plugin-lodash": "~1.5.1",
     "estraverse": "~4.2.0",