Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-25 11:43:17 +01:00
Code Issues Releases Activity

upgrade electron-store

Browse Source
This commit is contained in:
Mikael Finstad 2020-04-05 22:16:54 +08:00
parent 34a6a3424f
commit 03c2da353d
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

24
patches/conf+6.2.0.patch
View File

@ -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);
+ }
}
}

18
yarn.lock
View File

@ -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: