From 889af461c6dfe4aaf86da625d905cb5b3aa31fbc Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Fri, 11 May 2018 16:23:43 +0200
Subject: [PATCH] Upgrade to Electron 2.0.0.

---
 CHANGELOG.md      |  2 +-
 package-lock.json | 53 ++++++++++++++++++++++++++++++++---------------
 package.json      |  2 +-
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f02a8f22..de175268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added option for new display format in the calendar module with date headers with times/events below.
 
 ### Changed
-- Use Electron 2 Beta. **Please test!**
+- Upgrade to Electron 2.0.0. **Please test!**
 - Remove yarn-or-npm which breaks production builds.
 
 ### Fixed
diff --git a/package-lock.json b/package-lock.json
index 6577be46..7a98d4fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,11 @@
         }
       }
     },
+    "@types/node": {
+      "version": "8.10.14",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.14.tgz",
+      "integrity": "sha512-TKQqQIaYNO+8MrOsFgobkt3fbMzkfXhBFKcg20Nip5Omptw1HOY/IEvYiFtMwIbr7Me/Y2H/JO+TgNUMJ9NGjA=="
+    },
     "JSV": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
@@ -611,6 +616,11 @@
             "ms": "2.0.0"
           }
         },
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+        },
         "qs": {
           "version": "6.5.1",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
@@ -1567,20 +1577,13 @@
       "dev": true
     },
     "electron": {
-      "version": "2.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.0-beta.7.tgz",
-      "integrity": "sha512-DSUHGT2JkZc4pja2JdlG+TJa/nX2tz2I9UHdYPY0iKUrZngmTpP2FUypVt5pK+O9v0set5sL1lu1Y7c2dG4DDQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.0.tgz",
+      "integrity": "sha512-FCcVzHgoBmNTPUEhKN7yUxjluCRNAQsHNOfdtFEWKL3DPYEdLdyQW8CpmJEMqIXha5qZ+qdKVAtwvvuJs+b/PQ==",
       "requires": {
-        "@types/node": "8.10.2",
+        "@types/node": "8.10.14",
         "electron-download": "3.3.0",
         "extract-zip": "1.6.5"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "8.10.2",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz",
-          "integrity": "sha512-A6Uv1anbsCvrRDtaUXS2xZ5tlzD+Kg7yMRlSLFDy3z0r7KlGXDzL14vELXIAgpk2aJbU3XeZZQRcEkLkowT92g=="
-        }
       }
     },
     "electron-download": {
@@ -1616,7 +1619,7 @@
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.19"
+        "iconv-lite": "0.4.23"
       }
     },
     "end-of-stream": {
@@ -2217,7 +2220,7 @@
       "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.19",
+        "iconv-lite": "0.4.23",
         "jschardet": "1.5.1",
         "tmp": "0.0.31"
       }
@@ -2626,7 +2629,7 @@
         "grunt-known-options": "1.1.0",
         "grunt-legacy-log": "1.0.1",
         "grunt-legacy-util": "1.0.0",
-        "iconv-lite": "0.4.19",
+        "iconv-lite": "0.4.23",
         "js-yaml": "3.5.5",
         "minimatch": "3.0.4",
         "nopt": "3.0.6",
@@ -3136,9 +3139,12 @@
       "dev": true
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
     },
     "ienoopen": {
       "version": "1.0.0",
@@ -5801,6 +5807,11 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -7340,6 +7351,14 @@
       "dev": true,
       "requires": {
         "iconv-lite": "0.4.19"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+          "dev": true
+        }
       }
     },
     "whatwg-url": {
diff --git a/package.json b/package.json
index 1215193b..bb6085b0 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
   "dependencies": {
     "body-parser": "^1.18.2",
     "colors": "^1.1.2",
-    "electron": "beta",
+    "electron": "^2.0.0",
     "express": "^4.16.2",
     "express-ipfilter": "0.3.1",
     "feedme": "latest",