From 305b2a689c307eab09f920cd8e6cfe12a812a954 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Wed, 13 Jan 2021 13:50:46 -0800
Subject: [PATCH] electron app: switch back to electron 11.2 / chrome 87 to
 keep flash plugin support bump version to 1.3.6

---
 CHANGES.md                 |  4 ++--
 package.json               |  4 ++--
 src/electron-replay-app.js |  3 +--
 ui.js                      |  4 ++--
 yarn.lock                  | 20 ++++++++++----------
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6c93fa8..059debc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,7 @@
 ## CHANGES
 
-v1.3.6-alpha.0
-- Special build for testing auto-update functionality -- not for general use
+v1.3.6
+- Switch back to Electron 11.2.0 / Chrome 87 to keep support for Flash plugin
 
 v1.3.5
 - Dependency update: Latest wabac.js / warcio / wombat
diff --git a/package.json b/package.json
index 935dcd1..2e72c83 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.3.6-alpha.0",
+  "version": "1.3.6",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "copy-webpack-plugin": "^6.3.0",
     "css-loader": "^3.5.3",
-    "electron": "^12.0.0-beta.14",
+    "electron": "^11.2.0",
     "electron-builder": "^22.7.0",
     "electron-notarize": "^1.0.0",
     "http-server": "^0.12.3",
diff --git a/src/electron-replay-app.js b/src/electron-replay-app.js
index 67e360b..b9a1e16 100644
--- a/src/electron-replay-app.js
+++ b/src/electron-replay-app.js
@@ -162,9 +162,8 @@ class ElectronReplayApp
   }
 
   checkUpdates() {
-    autoUpdater.channel = "alpha";
     autoUpdater.logger = log;
-    autoUpdater.logger.transports.file.level = "debug";
+    autoUpdater.logger.transports.file.level = "info";
     autoUpdater.checkForUpdatesAndNotify();
   }
 
diff --git a/ui.js b/ui.js
index 778a532..5521c51 100644
--- a/ui.js
+++ b/ui.js
@@ -367,7 +367,7 @@ const oe=new WeakMap,ne=v(e=>t=>{if(!(t instanceof P))throw new Error("unsafeSVG
                   <div style="display: flex">
                     <div class="has-text-centered" style="width: 220px">
                       <wr-anim-logo class="logo" size="48px"></wr-anim-logo>
-                      <div style="font-size: smaller; margin-bottom: 1em">${pe?"App":""} v${"1.3.6-alpha.0"}</div>
+                      <div style="font-size: smaller; margin-bottom: 1em">${pe?"App":""} v${"1.3.6"}</div>
                     </div>
 
                     ${pe?q`
@@ -1146,7 +1146,7 @@ const oe=new WeakMap,ne=v(e=>t=>{if(!(t instanceof P))throw new Error("unsafeSVG
               <a href="#" role="button" class="dropdown-item" @click="${this.onAbout}">
                 <fa-icon class="menu-logo" size="1.0rem" aria-hidden="true" .svg=${this.appLogo}></fa-icon>
                 <span>&nbsp;About ${this.appName}</span>
-                <span class="menu-version">(${"1.3.6-alpha.0"})</span>
+                <span class="menu-version">(${"1.3.6"})</span>
               </a>
             </div>
           </div>
diff --git a/yarn.lock b/yarn.lock
index a8fdf35..29a31b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -537,16 +537,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
   integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
 
+"@types/node@^12.0.12":
+  version "12.19.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.13.tgz#888e2b34159fb91496589484ec169618212b51b7"
+  integrity sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==
+
 "@types/node@^13.7.0":
   version "13.13.30"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.30.tgz#1ed6e01e4ca576d5aec9cc802cc3bcf94c274192"
   integrity sha512-HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA==
 
-"@types/node@^14.6.2":
-  version "14.14.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340"
-  integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==
-
 "@types/pvutils@*":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@types/pvutils/-/pvutils-0.0.2.tgz#e21684962cfa58ac920fd576d90556032dc86009"
@@ -2762,13 +2762,13 @@ electron-updater@^4.3.5:
     lodash.isequal "^4.5.0"
     semver "^7.3.2"
 
-electron@^12.0.0-beta.14:
-  version "12.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.0-beta.14.tgz#f8c40c7e479879c305e519380e710c0a357aa734"
-  integrity sha512-PYM+EepIEj9kLePXEb9gIxzZk5H4zM7LGg5iw60OHt+SYEECPNFJmPj3N6oHKu3W+KrCG7285Vgz2ZCp1u0kKA==
+electron@^11.2.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7"
+  integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q==
   dependencies:
     "@electron/get" "^1.0.1"
-    "@types/node" "^14.6.2"
+    "@types/node" "^12.0.12"
     extract-zip "^1.0.3"
 
 elliptic@^6.5.2, elliptic@^6.5.3: