From 03c2da353d53c73a01aef33d50a6b4445aa9b06b Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Sun, 5 Apr 2020 22:16:54 +0800
Subject: [PATCH] upgrade electron-store

---
 package.json             |  2 +-
 patches/conf+6.2.0.patch | 24 ------------------------
 yarn.lock                | 18 +++++++++---------
 3 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 patches/conf+6.2.0.patch

diff --git a/package.json b/package.json
index 17f04229..fa114d11 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
   },
   "dependencies": {
     "electron-is-dev": "^0.1.2",
-    "electron-store": "^5.1.0",
+    "electron-store": "^5.1.1",
     "execa": "^4.0.0",
     "ffmpeg-static": "^4.0.1",
     "ffprobe-static": "^3.0.0",
diff --git a/patches/conf+6.2.0.patch b/patches/conf+6.2.0.patch
deleted file mode 100644
index 4b7b2e1a..00000000
--- a/patches/conf+6.2.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/node_modules/conf/index.js b/node_modules/conf/index.js
-index c4daca9..52254f1 100644
---- a/node_modules/conf/index.js
-+++ b/node_modules/conf/index.js
-@@ -176,7 +176,18 @@ class Conf {
- 		if (process.env.SNAP) {
- 			fs.writeFileSync(this.path, data);
- 		} else {
--			writeFileAtomic.sync(this.path, data);
-+			try {
-+				writeFileAtomic.sync(this.path, data);
-+			} catch (error) {
-+				// Fix for https://github.com/sindresorhus/electron-store/issues/106
-+				// Sometimes on Windows, we will get an EXDEV error when atomic writing
-+				// (even though to the same directory), so we fall back to non atomic write
-+				if (error.code !== 'EXDEV') {
-+					throw error;
-+				}
-+	
-+				fs.writeFileSync(this.path, data);
-+			}
- 		}
- 	}
- 
diff --git a/yarn.lock b/yarn.lock
index 22273c61..4edebf33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3400,10 +3400,10 @@ concurrently@^5.1.0:
     tree-kill "^1.2.2"
     yargs "^13.3.0"
 
-conf@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/conf/-/conf-6.2.0.tgz#274d37a0a2e50757ffb89336e954d08718eb359a"
-  integrity sha512-fvl40R6YemHrFsNiyP7TD0tzOe3pQD2dfT2s20WvCaq57A1oV+RImbhn2Y4sQGDz1lB0wNSb7dPcPIvQB69YNA==
+conf@^6.2.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/conf/-/conf-6.2.3.tgz#0c0611f0fca25174d72c7b633ff6af9173a55f62"
+  integrity sha512-xwce2fuN77kiXiUq0tQImwJM0SXkGKt1/uZYyiQ9OWUKUQmF6gzIMyCL0idlpgQelKomSFMkAGn2QK7JJ2c1Cg==
   dependencies:
     ajv "^6.10.2"
     debounce-fn "^3.0.1"
@@ -4451,12 +4451,12 @@ electron-publish@22.4.1:
     lazy-val "^1.0.4"
     mime "^2.4.4"
 
-electron-store@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.1.0.tgz#0b3cb66b15d0002678fc5c13e8b0c38a8678d670"
-  integrity sha512-uhAF/4+zDb+y0hWqlBirEPEAR4ciCZDp4fRWGFNV62bG+ArdQPpXk7jS0MEVj3CfcG5V7hx7Dpq5oD+1j6GD8Q==
+electron-store@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.1.1.tgz#3040e5b4ad25d2e4caea59d505646c1e7c94a09b"
+  integrity sha512-FLidOVE8JVCdJXHd7xY/JojKJ2r2WNmWt0O/LlX2LuSVV7dkG2RSy2/Gm2LFw8OKDfrNBd9c/s4X1ikMrJEUKg==
   dependencies:
-    conf "^6.2.0"
+    conf "^6.2.1"
     type-fest "^0.7.1"
 
 electron-to-chromium@^1.3.341, electron-to-chromium@^1.3.363: