aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsett86 <csett86@web.de>2021-12-01 11:33:34 +0100
committerGitHub <noreply@github.com>2021-12-01 11:33:34 +0100
commit94f39ce1079d7c591f5d99736ca7f7fad71c214b (patch)
tree36959d8ad52c6d8e86273046fe67faded718bd25
parente5a93e89e4d554ebfa0783e1c6c5330f01f1cb4c (diff)
refactor: Remove electron-store to be ready for electron 14+ (#668)
Release this ~3 months after 2.9.0 was released (21 Sep 2021) so that users had 3 months to migrate to local storage Signed-off-by: Christoph Settgast <csett86@web.de>
-rw-r--r--app/features/redux/store.js25
-rw-r--r--app/preload/preload.js3
-rw-r--r--main.js4
-rw-r--r--package-lock.json545
-rw-r--r--package.json2
5 files changed, 325 insertions, 254 deletions
diff --git a/app/features/redux/store.js b/app/features/redux/store.js
index 4af76d1..e34a6ff 100644
--- a/app/features/redux/store.js
+++ b/app/features/redux/store.js
@@ -1,37 +1,14 @@
// @flow
import { createStore } from 'redux';
-import { persistReducer, getStoredState } from 'redux-persist';
+import { persistReducer } from 'redux-persist';
import storage from 'redux-persist/lib/storage'; // uses localStorage
import middleware from './middleware';
import reducers from './reducers';
-const migrateFromElectronStore = async state => {
- // migrate to local storage by checking if state is undefined
- // (first launch or first launch after switch to local storage)
- // and previous electron-store config.json exists.
- if (state === undefined && window.jitsiNodeAPI.electronStoreExists) {
- const electronStoreState = await getStoredState({
- key: 'root',
- storage: window.jitsiNodeAPI.createElectronStorage(),
- debug: true
- });
-
- if ('onboarding' in electronStoreState) {
- return electronStoreState;
- }
- }
-
- return state;
-};
-
const persistConfig = {
key: 'root',
-
- // remove this and all electron-store-related dependencies end of 2021
- // (3 months migration period from electron-store to local storage)
- migrate: migrateFromElectronStore,
storage,
whitelist: [
'onboarding',
diff --git a/app/preload/preload.js b/app/preload/preload.js
index 5f0bb3f..ceaa666 100644
--- a/app/preload/preload.js
+++ b/app/preload/preload.js
@@ -1,6 +1,5 @@
/* global process */
-const createElectronStorage = require('redux-persist-electron-storage');
const { ipcRenderer } = require('electron');
const os = require('os');
const jitsiMeetElectronUtils = require('@jitsi/electron-sdk');
@@ -10,12 +9,10 @@ const { openExternalLink } = require('../features/utils/openExternalLink');
const whitelistedIpcChannels = [ 'protocol-data-msg', 'renderer-ready' ];
window.jitsiNodeAPI = {
- createElectronStorage,
osUserInfo: os.userInfo,
openExternalLink,
platform: process.platform,
jitsiMeetElectronUtils,
- electronStoreExists: ipcRenderer.sendSync('electron-store-exists'),
ipc: {
on: (channel, listener) => {
if (!whitelistedIpcChannels.includes(channel)) {
diff --git a/main.js b/main.js
index 9da109d..1ac7795 100644
--- a/main.js
+++ b/main.js
@@ -399,7 +399,3 @@ ipcMain.on('renderer-ready', () => {
.send('protocol-data-msg', protocolDataForFrontApp);
}
});
-
-ipcMain.on('electron-store-exists', event => {
- event.returnValue = existsSync(path.join(app.getPath('userData'), 'config.json'));
-});
diff --git a/package-lock.json b/package-lock.json
index 004457c..335435d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,7 +47,6 @@
"electron-log": "^4.3.2",
"electron-notarize": "1.1.1",
"electron-react-devtools": "0.5.3",
- "electron-store": "^5.2.0",
"electron-updater": "^4.3.9",
"electron-window-state": "^5.0.3",
"eslint": "6.5.1",
@@ -72,7 +71,6 @@
"redux": "^4.0.5",
"redux-logger": "^3.0.6",
"redux-persist": "^5.10.0",
- "redux-persist-electron-storage": "^2.1.0",
"source-map-support": "^0.5.19",
"style-loader": "1.1.3",
"styled-components": "^3.4.10",
@@ -8526,54 +8524,6 @@
"node": ">=6"
}
},
- "node_modules/conf": {
- "version": "6.2.4",
- "resolved": "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz",
- "integrity": "sha512-GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ==",
- "dev": true,
- "dependencies": {
- "ajv": "^6.10.2",
- "debounce-fn": "^3.0.1",
- "dot-prop": "^5.0.0",
- "env-paths": "^2.2.0",
- "json-schema-typed": "^7.0.1",
- "make-dir": "^3.0.0",
- "onetime": "^5.1.0",
- "pkg-up": "^3.0.1",
- "semver": "^6.2.0",
- "write-file-atomic": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/conf/node_modules/onetime": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
- "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
- "dev": true,
- "dependencies": {
- "mimic-fn": "^2.1.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/conf/node_modules/semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true,
- "bin": {
- "semver": "bin/semver.js"
- }
- },
"node_modules/config-chain": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
@@ -9086,18 +9036,6 @@
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
"dev": true
},
- "node_modules/debounce-fn": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz",
- "integrity": "sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q==",
- "dev": true,
- "dependencies": {
- "mimic-fn": "^2.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/debug": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@@ -10140,28 +10078,6 @@
"chokidar": "^3.0.2"
}
},
- "node_modules/electron-store": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-5.2.0.tgz",
- "integrity": "sha512-iU3WDqEDAYNYR9XV7p0tJajq/zs9z7Nrn0sAoR5nDyn8h/9dr9kusKbTxD8NtVEBD1TB1pkGMqcbIt/y6knDwQ==",
- "dev": true,
- "dependencies": {
- "conf": "^6.2.1",
- "type-fest": "^0.7.1"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/electron-store/node_modules/type-fest": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
- "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
- "dev": true,
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/electron-updater": {
"version": "4.3.9",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.3.9.tgz",
@@ -15933,15 +15849,6 @@
"redux": ">3.0.0"
}
},
- "node_modules/redux-persist-electron-storage": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/redux-persist-electron-storage/-/redux-persist-electron-storage-2.1.0.tgz",
- "integrity": "sha512-8VhAttDPqrwZlGIiHB3/PzZZChCliom8qcex8Q+eW3lHpSMkbqAaYpoedRm29e3FoVnan3VT+UV22NGFXKPmCg==",
- "dev": true,
- "peerDependencies": {
- "electron-store": "*"
- }
- },
"node_modules/regenerate": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -18603,26 +18510,34 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/abbrev": {
"version": "1.1.1",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/ansi-regex": {
"version": "2.1.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/aproba": {
"version": "1.2.0",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/are-we-there-yet": {
"version": "1.1.5",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
@@ -18630,13 +18545,17 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/balanced-match": {
"version": "1.0.0",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/brace-expansion": {
"version": "1.1.11",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -18644,57 +18563,75 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/chownr": {
"version": "1.1.4",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/code-point-at": {
"version": "1.1.0",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/concat-map": {
"version": "0.0.1",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/console-control-strings": {
"version": "1.1.0",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/core-util-is": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/debug": {
"version": "3.2.6",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"ms": "^2.1.1"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/deep-extend": {
"version": "0.6.0",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/delegates": {
"version": "1.0.0",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/detect-libc": {
"version": "1.0.3",
+ "dev": true,
"inBundle": true,
"license": "Apache-2.0",
+ "optional": true,
"bin": {
"detect-libc": "bin/detect-libc.js"
},
@@ -18704,21 +18641,27 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/fs-minipass": {
"version": "1.2.7",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"minipass": "^2.6.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/fs.realpath": {
"version": "1.0.0",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/gauge": {
"version": "2.7.4",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
@@ -18732,8 +18675,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/glob": {
"version": "7.1.6",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -18751,13 +18696,17 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/has-unicode": {
"version": "2.0.1",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/iconv-lite": {
"version": "0.4.24",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"safer-buffer": ">= 2.1.2 < 3"
},
@@ -18767,16 +18716,20 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/ignore-walk": {
"version": "3.0.3",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"minimatch": "^3.0.4"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/inflight": {
"version": "1.0.6",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -18784,21 +18737,27 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/inherits": {
"version": "2.0.4",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/ini": {
"version": "1.3.5",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"engines": {
"node": "*"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/is-fullwidth-code-point": {
"version": "1.0.0",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"number-is-nan": "^1.0.0"
},
@@ -18808,13 +18767,17 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/isarray": {
"version": "1.0.0",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/minimatch": {
"version": "3.0.4",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"brace-expansion": "^1.1.7"
},
@@ -18824,13 +18787,17 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/minimist": {
"version": "1.2.5",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/minipass": {
"version": "2.9.0",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -18838,8 +18805,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/minizlib": {
"version": "1.3.3",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"minipass": "^2.9.0"
}
@@ -18847,8 +18816,10 @@
"node_modules/watchpack/node_modules/fsevents/node_modules/mkdirp": {
"version": "0.5.3",
"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"minimist": "^1.2.5"
},
@@ -18858,13 +18829,17 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/ms": {
"version": "2.1.2",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/needle": {
"version": "2.3.3",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"debug": "^3.2.6",
"iconv-lite": "^0.4.4",
@@ -18879,8 +18854,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/node-pre-gyp": {
"version": "0.14.0",
+ "dev": true,
"inBundle": true,
"license": "BSD-3-Clause",
+ "optional": true,
"dependencies": {
"detect-libc": "^1.0.2",
"mkdirp": "^0.5.1",
@@ -18899,8 +18876,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/nopt": {
"version": "4.0.3",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"abbrev": "1",
"osenv": "^0.1.4"
@@ -18911,21 +18890,27 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/npm-bundled": {
"version": "1.1.1",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"npm-normalize-package-bin": "^1.0.1"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/npm-normalize-package-bin": {
"version": "1.0.1",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/npm-packlist": {
"version": "1.4.8",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1",
@@ -18934,8 +18919,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/npmlog": {
"version": "4.1.2",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
@@ -18945,48 +18932,60 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/number-is-nan": {
"version": "1.0.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/object-assign": {
"version": "4.1.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/once": {
"version": "1.4.0",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"wrappy": "1"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/os-homedir": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/os-tmpdir": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/osenv": {
"version": "0.1.5",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -18994,21 +18993,27 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/path-is-absolute": {
"version": "1.0.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/process-nextick-args": {
"version": "2.0.1",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/rc": {
"version": "1.2.8",
+ "dev": true,
"inBundle": true,
"license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+ "optional": true,
"dependencies": {
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
@@ -19021,8 +19026,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/readable-stream": {
"version": "2.3.7",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -19035,8 +19042,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/rimraf": {
"version": "2.7.1",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"glob": "^7.1.3"
},
@@ -19046,49 +19055,65 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/safe-buffer": {
"version": "5.1.2",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/safer-buffer": {
"version": "2.1.2",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/sax": {
"version": "1.2.4",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/semver": {
"version": "5.7.1",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"bin": {
"semver": "bin/semver"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/set-blocking": {
"version": "2.0.0",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/signal-exit": {
"version": "3.0.2",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/string_decoder": {
"version": "1.1.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/string-width": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -19100,8 +19125,10 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/strip-ansi": {
"version": "3.0.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"dependencies": {
"ansi-regex": "^2.0.0"
},
@@ -19111,16 +19138,20 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/strip-json-comments": {
"version": "2.0.1",
+ "dev": true,
"inBundle": true,
"license": "MIT",
+ "optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/tar": {
"version": "4.4.13",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
@@ -19136,26 +19167,34 @@
},
"node_modules/watchpack/node_modules/fsevents/node_modules/util-deprecate": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
- "license": "MIT"
+ "license": "MIT",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/wide-align": {
"version": "1.1.3",
+ "dev": true,
"inBundle": true,
"license": "ISC",
+ "optional": true,
"dependencies": {
"string-width": "^1.0.2 || 2"
}
},
"node_modules/watchpack/node_modules/fsevents/node_modules/wrappy": {
"version": "1.0.2",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/fsevents/node_modules/yallist": {
"version": "3.1.1",
+ "dev": true,
"inBundle": true,
- "license": "ISC"
+ "license": "ISC",
+ "optional": true
},
"node_modules/watchpack/node_modules/glob-parent": {
"version": "3.1.0",
@@ -27018,41 +27057,6 @@
}
}
},
- "conf": {
- "version": "6.2.4",
- "resolved": "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz",
- "integrity": "sha512-GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ==",
- "dev": true,
- "requires": {
- "ajv": "^6.10.2",
- "debounce-fn": "^3.0.1",
- "dot-prop": "^5.0.0",
- "env-paths": "^2.2.0",
- "json-schema-typed": "^7.0.1",
- "make-dir": "^3.0.0",
- "onetime": "^5.1.0",
- "pkg-up": "^3.0.1",
- "semver": "^6.2.0",
- "write-file-atomic": "^3.0.0"
- },
- "dependencies": {
- "onetime": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
- "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
- "dev": true,
- "requires": {
- "mimic-fn": "^2.1.0"
- }
- },
- "semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
- }
- }
- },
"config-chain": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
@@ -27491,15 +27495,6 @@
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
"dev": true
},
- "debounce-fn": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz",
- "integrity": "sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q==",
- "dev": true,
- "requires": {
- "mimic-fn": "^2.1.0"
- }
- },
"debug": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@@ -28342,24 +28337,6 @@
"chokidar": "^3.0.2"
}
},
- "electron-store": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-5.2.0.tgz",
- "integrity": "sha512-iU3WDqEDAYNYR9XV7p0tJajq/zs9z7Nrn0sAoR5nDyn8h/9dr9kusKbTxD8NtVEBD1TB1pkGMqcbIt/y6knDwQ==",
- "dev": true,
- "requires": {
- "conf": "^6.2.1",
- "type-fest": "^0.7.1"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
- "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
- "dev": true
- }
- }
- },
"electron-updater": {
"version": "4.3.9",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.3.9.tgz",
@@ -33049,12 +33026,6 @@
"integrity": "sha512-sSJAzNq7zka3qVHKce1hbvqf0Vf5DuTVm7dr4GtsqQVOexnrvbV47RWFiPxQ8fscnyiuWyD2O92DOxPl0tGCRg==",
"dev": true
},
- "redux-persist-electron-storage": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/redux-persist-electron-storage/-/redux-persist-electron-storage-2.1.0.tgz",
- "integrity": "sha512-8VhAttDPqrwZlGIiHB3/PzZZChCliom8qcex8Q+eW3lHpSMkbqAaYpoedRm29e3FoVnan3VT+UV22NGFXKPmCg==",
- "dev": true
- },
"regenerate": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -35221,19 +35192,27 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
@@ -35241,11 +35220,15 @@
},
"balanced-match": {
"version": "1.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -35253,57 +35236,81 @@
},
"chownr": {
"version": "1.1.4",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"debug": {
"version": "3.2.6",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"ms": "^2.1.1"
}
},
"deep-extend": {
"version": "0.6.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"delegates": {
"version": "1.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"detect-libc": {
"version": "1.0.3",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"fs-minipass": {
"version": "1.2.7",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"minipass": "^2.6.0"
}
},
"fs.realpath": {
"version": "1.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"gauge": {
"version": "2.7.4",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"aproba": "^1.0.3",
"console-control-strings": "^1.0.0",
@@ -35318,6 +35325,8 @@
"glob": {
"version": "7.1.6",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -35329,11 +35338,15 @@
},
"has-unicode": {
"version": "2.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"iconv-lite": {
"version": "0.4.24",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
@@ -35341,6 +35354,8 @@
"ignore-walk": {
"version": "3.0.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"minimatch": "^3.0.4"
}
@@ -35348,6 +35363,8 @@
"inflight": {
"version": "1.0.6",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -35355,37 +35372,51 @@
},
"inherits": {
"version": "2.0.4",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
},
"isarray": {
"version": "1.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "1.2.5",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -35394,6 +35425,8 @@
"minizlib": {
"version": "1.3.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"minipass": "^2.9.0"
}
@@ -35401,17 +35434,23 @@
"mkdirp": {
"version": "0.5.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"minimist": "^1.2.5"
}
},
"ms": {
"version": "2.1.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"needle": {
"version": "2.3.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"debug": "^3.2.6",
"iconv-lite": "^0.4.4",
@@ -35421,6 +35460,8 @@
"node-pre-gyp": {
"version": "0.14.0",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"detect-libc": "^1.0.2",
"mkdirp": "^0.5.1",
@@ -35437,6 +35478,8 @@
"nopt": {
"version": "4.0.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
@@ -35445,17 +35488,23 @@
"npm-bundled": {
"version": "1.1.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"npm-normalize-package-bin": "^1.0.1"
}
},
"npm-normalize-package-bin": {
"version": "1.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"npm-packlist": {
"version": "1.4.8",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"ignore-walk": "^3.0.1",
"npm-bundled": "^1.0.1",
@@ -35465,6 +35514,8 @@
"npmlog": {
"version": "4.1.2",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
@@ -35474,30 +35525,42 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"once": {
"version": "1.4.0",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
},
"os-homedir": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"osenv": {
"version": "0.1.5",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -35505,15 +35568,21 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"process-nextick-args": {
"version": "2.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"rc": {
"version": "1.2.8",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
@@ -35524,6 +35593,8 @@
"readable-stream": {
"version": "2.3.7",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -35537,37 +35608,53 @@
"rimraf": {
"version": "2.7.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"glob": "^7.1.3"
}
},
"safe-buffer": {
"version": "5.1.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"sax": {
"version": "1.2.4",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"semver": {
"version": "5.7.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"set-blocking": {
"version": "2.0.0",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"signal-exit": {
"version": "3.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"string_decoder": {
"version": "1.1.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -35575,6 +35662,8 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -35584,17 +35673,23 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
"version": "2.0.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"tar": {
"version": "4.4.13",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
@@ -35607,22 +35702,30 @@
},
"util-deprecate": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"wide-align": {
"version": "1.1.3",
"bundled": true,
+ "dev": true,
+ "optional": true,
"requires": {
"string-width": "^1.0.2 || 2"
}
},
"wrappy": {
"version": "1.0.2",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.1.1",
- "bundled": true
+ "bundled": true,
+ "dev": true,
+ "optional": true
}
}
},
diff --git a/package.json b/package.json
index 77f57f3..8f0220d 100644
--- a/package.json
+++ b/package.json
@@ -167,7 +167,6 @@
"electron-log": "^4.3.2",
"electron-notarize": "1.1.1",
"electron-react-devtools": "0.5.3",
- "electron-store": "^5.2.0",
"electron-updater": "^4.3.9",
"electron-window-state": "^5.0.3",
"eslint": "6.5.1",
@@ -192,7 +191,6 @@
"redux": "^4.0.5",
"redux-logger": "^3.0.6",
"redux-persist": "^5.10.0",
- "redux-persist-electron-storage": "^2.1.0",
"source-map-support": "^0.5.19",
"style-loader": "1.1.3",
"styled-components": "^3.4.10",