From 39a05f216efd4fd68fc428540d8d47c44d3993f5 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Tue, 24 Aug 2021 05:17:20 +0530
Subject: chore: upgrade electron to v13.2.2

---
 CHANGELOG.md      |  8 ++++++++
 README.md         |  2 +-
 package-lock.json | 18 +++++++++---------
 package.json      |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d1ea759c..8719e3387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [v5.6.1-nightly.37](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.36...v5.6.1-nightly.37) (2021-08-24)
+
+- Upgraded to [electron 13.2.2](https://github.com/electron/electron/releases/tag/v13.2.2) 💖 @vraravam
+
+### Bug Fixes
+
+- Fixing bug where the service-defaults are not merged when creating a service 💖 @vraravam
+
 # [v5.6.1-nightly.36](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.35...v5.6.1-nightly.36) (2021-08-23)
 
 ### Bug Fixes
diff --git a/README.md b/README.md
index 235f74802..f23c0cb30 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi`.
 
 ### Adds internal changes
 
-- [x] Upgrades to Electron 13.2.1
+- [x] Upgrades to Electron 13.2.2
 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Minifies build files to improve app size
 - [x] Adds "npm run prepare-code" command for development to lint and beautify code
diff --git a/package-lock.json b/package-lock.json
index 25cb34ebb..438fe8ae6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2387,9 +2387,9 @@
       }
     },
     "@electron/get": {
-      "version": "1.12.4",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.4.tgz",
-      "integrity": "sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.13.0.tgz",
+      "integrity": "sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -8938,9 +8938,9 @@
       "dev": true
     },
     "boolean": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.2.tgz",
-      "integrity": "sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz",
+      "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==",
       "dev": true,
       "optional": true
     },
@@ -12405,9 +12405,9 @@
       }
     },
     "electron": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.2.1.tgz",
-      "integrity": "sha512-/K0Uw+o3+phbHtrVL6qDFVJqmeRF6EIPwVeUHEH5R8JNy13f4X3RouKjQzVyY/Os8fEqYHGFONWhD6q6g750HQ==",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.2.2.tgz",
+      "integrity": "sha512-thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index 78c52c0d6..fd4ac2334 100644
--- a/package.json
+++ b/package.json
@@ -165,7 +165,7 @@
     "cross-env": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "electron": "13.2.1",
+    "electron": "13.2.2",
     "electron-builder": "22.12.1",
     "electron-notarize": "1.1.0",
     "eslint": "7.32.0",
-- 
cgit v1.2.3-70-g09d2