From da913ebf53e27d25e570c95830ff9f5778d67d5a Mon Sep 17 00:00:00 2001 From: Roldan Montilla Jr Date: Thu, 21 May 2020 23:24:17 +0800 Subject: [PATCH] fix(timer): issue about incorrect timer when the app is hidden The timer is pretty accurate when the app is visible. But when it is hidden, the timer goes wrong when you open it again for a while. Fixed issue #67 --- app/electron/electron.ts | 1 + app/package.json | 20 +-- app/public/electron.js | 1 + app/public/functions/autoUpdater.js | 1 + app/public/functions/blockShortcutKeys.js | 1 + app/public/functions/createSystemTray.js | 1 + app/public/functions/globalShortcuts.js | 1 + app/public/functions/hostBlocker.js | 1 + app/public/functions/index.js | 23 ++- app/public/helpers/constants.js | 1 + app/public/helpers/findBlockerIndexes.js | 1 + app/public/helpers/index.js | 23 ++- app/public/helpers/isWindow.js | 1 + app/public/helpers/readHostsFile.js | 1 + app/public/helpers/writeHostsFile.js | 1 + app/src/contexts/CounterContext.tsx | 164 +++++++++---------- app/yarn.lock | 185 ++++++++++++---------- 17 files changed, 226 insertions(+), 201 deletions(-) diff --git a/app/electron/electron.ts b/app/electron/electron.ts index 8f924378..adedb8a0 100644 --- a/app/electron/electron.ts +++ b/app/electron/electron.ts @@ -38,6 +38,7 @@ function createMainWindow() { webPreferences: { contextIsolation: true, enableRemoteModule: false, + backgroundThrottling: false, preload: path.join(__dirname, "preload.js"), }, }); diff --git a/app/package.json b/app/package.json index 9ee90f02..8c390084 100644 --- a/app/package.json +++ b/app/package.json @@ -77,7 +77,7 @@ }, "dependencies": { "autosize": "^4.0.2", - "electron-log": "^4.1.2", + "electron-log": "^4.1.3", "electron-updater": "^4.3.1", "is-electron": "^2.2.0", "react": "^16.13.1", @@ -85,33 +85,33 @@ "react-dom": "^16.13.1", "react-markdown": "^4.3.1", "react-redux": "^7.2.0", - "react-router-dom": "^5.1.2", + "react-router-dom": "^5.2.0", "react-scripts": "^3.4.1", "redux": "^4.0.5", "redux-devtools-extension": "^2.13.8", "styled-components": "^5.1.0", - "uuid": "^8.0.0", + "uuid": "^8.1.0", "v8-compile-cache": "^2.1.0" }, "devDependencies": { "@semantic-release/changelog": "^5.0.1", "@semantic-release/git": "^9.0.0", "@types/autosize": "^3.0.7", - "@types/jest": "^25.2.1", - "@types/node": "^13.13.4", - "@types/react": "^16.9.34", + "@types/jest": "^25.2.3", + "@types/node": "^14.0.4", + "@types/react": "^16.9.35", "@types/react-beautiful-dnd": "^12.1.2", "@types/react-dom": "^16.9.7", "@types/react-redux": "^7.1.7", "@types/react-router-dom": "^5.1.5", "@types/styled-components": "^5.1.0", - "@types/uuid": "^7.0.3", - "electron": "^8.2.5", - "electron-builder": "^22.6.0", + "@types/uuid": "^8.0.0", + "electron": "^9.0.0", + "electron-builder": "^22.6.1", "prettier": "^2.0.5", "say": "^0.16.0", "semantic-release": "^17.0.7", - "typescript": "^3.8.3" + "typescript": "^3.9.3" }, "browserslist": { "production": [ diff --git a/app/public/electron.js b/app/public/electron.js index 86dd5127..870f7363 100644 --- a/app/public/electron.js +++ b/app/public/electron.js @@ -28,6 +28,7 @@ function createMainWindow() { webPreferences: { contextIsolation: true, enableRemoteModule: false, + backgroundThrottling: false, preload: path_1.default.join(__dirname, "preload.js"), }, }); diff --git a/app/public/functions/autoUpdater.js b/app/public/functions/autoUpdater.js index 68462fe9..4710233d 100644 --- a/app/public/functions/autoUpdater.js +++ b/app/public/functions/autoUpdater.js @@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.activateAutoUpdate = void 0; var electron_updater_1 = require("electron-updater"); var electron_log_1 = __importDefault(require("electron-log")); function activateAutoUpdate(_a) { diff --git a/app/public/functions/blockShortcutKeys.js b/app/public/functions/blockShortcutKeys.js index 28f9cf22..c119ca6b 100644 --- a/app/public/functions/blockShortcutKeys.js +++ b/app/public/functions/blockShortcutKeys.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.blockShortcutKeys = void 0; var electron_1 = require("electron"); function blockShortcutKeys(window, shortcutKeys) { window.on("focus", function () { diff --git a/app/public/functions/createSystemTray.js b/app/public/functions/createSystemTray.js index 9d62b68c..e5bc648a 100644 --- a/app/public/functions/createSystemTray.js +++ b/app/public/functions/createSystemTray.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.createSystemTray = void 0; var electron_1 = require("electron"); var tray; function createSystemTray(_a) { diff --git a/app/public/functions/globalShortcuts.js b/app/public/functions/globalShortcuts.js index 5774089c..cfc141b3 100644 --- a/app/public/functions/globalShortcuts.js +++ b/app/public/functions/globalShortcuts.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.activateGlobalShortcuts = void 0; var electron_1 = require("electron"); function activateGlobalShortcuts(shortcuts) { shortcuts.map(function (_a) { diff --git a/app/public/functions/hostBlocker.js b/app/public/functions/hostBlocker.js index 61c8e08e..580bd609 100644 --- a/app/public/functions/hostBlocker.js +++ b/app/public/functions/hostBlocker.js @@ -43,6 +43,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () { return r; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.unBlockWebsiteList = exports.blockWebsiteList = void 0; var helpers_1 = require("../helpers"); // TODO: run ` ipconfig /flushdns` for Windows if doesn't work function blockWebsiteList(domains) { diff --git a/app/public/functions/index.js b/app/public/functions/index.js index a8bfd5a7..5823e04f 100644 --- a/app/public/functions/index.js +++ b/app/public/functions/index.js @@ -1,10 +1,17 @@ "use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __exportStar = (this && this.__exportStar) || function(m, exports) { + for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); +}; Object.defineProperty(exports, "__esModule", { value: true }); -__export(require("./blockShortcutKeys")); -__export(require("./globalShortcuts")); -__export(require("./createSystemTray")); -__export(require("./autoUpdater")); -__export(require("./hostBlocker")); +__exportStar(require("./blockShortcutKeys"), exports); +__exportStar(require("./globalShortcuts"), exports); +__exportStar(require("./createSystemTray"), exports); +__exportStar(require("./autoUpdater"), exports); +__exportStar(require("./hostBlocker"), exports); diff --git a/app/public/helpers/constants.js b/app/public/helpers/constants.js index 30af8d20..ab7bfd34 100644 --- a/app/public/helpers/constants.js +++ b/app/public/helpers/constants.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.BLOCKER = exports.UPDATES = exports.ACTIONS = exports.CHANNELS = void 0; var CHANNELS; (function (CHANNELS) { CHANNELS["TO_MAIN"] = "TO_MAIN"; diff --git a/app/public/helpers/findBlockerIndexes.js b/app/public/helpers/findBlockerIndexes.js index 132c04a6..868bb942 100644 --- a/app/public/helpers/findBlockerIndexes.js +++ b/app/public/helpers/findBlockerIndexes.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.findBlockerIndexes = void 0; var constants_1 = require("./constants"); function findBlockerIndexes(hosts) { var positions = { start: -1, end: -1 }; diff --git a/app/public/helpers/index.js b/app/public/helpers/index.js index 5cbf6a97..a2b90540 100644 --- a/app/public/helpers/index.js +++ b/app/public/helpers/index.js @@ -1,10 +1,17 @@ "use strict"; -function __export(m) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __exportStar = (this && this.__exportStar) || function(m, exports) { + for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p); +}; Object.defineProperty(exports, "__esModule", { value: true }); -__export(require("./constants")); -__export(require("./isWindow")); -__export(require("./readHostsFile")); -__export(require("./writeHostsFile")); -__export(require("./findBlockerIndexes")); +__exportStar(require("./constants"), exports); +__exportStar(require("./isWindow"), exports); +__exportStar(require("./readHostsFile"), exports); +__exportStar(require("./writeHostsFile"), exports); +__exportStar(require("./findBlockerIndexes"), exports); diff --git a/app/public/helpers/isWindow.js b/app/public/helpers/isWindow.js index c3838704..550a590d 100644 --- a/app/public/helpers/isWindow.js +++ b/app/public/helpers/isWindow.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.HOSTS_FILE_PATH = exports.EndOfLine = exports.isWindow = void 0; exports.isWindow = function () { return process.platform === "win32"; }; exports.EndOfLine = exports.isWindow() ? "\r\n" : "\n"; exports.HOSTS_FILE_PATH = exports.isWindow() diff --git a/app/public/helpers/readHostsFile.js b/app/public/helpers/readHostsFile.js index 757c480f..4dfae5d4 100644 --- a/app/public/helpers/readHostsFile.js +++ b/app/public/helpers/readHostsFile.js @@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.readHostsFile = void 0; var fs_1 = __importDefault(require("fs")); var _1 = require("."); function readHostsFile() { diff --git a/app/public/helpers/writeHostsFile.js b/app/public/helpers/writeHostsFile.js index c296ef1a..8329107c 100644 --- a/app/public/helpers/writeHostsFile.js +++ b/app/public/helpers/writeHostsFile.js @@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); +exports.writeHostsFile = void 0; var fs_1 = __importDefault(require("fs")); var _1 = require("."); function writeHostsFile(content) { diff --git a/app/src/contexts/CounterContext.tsx b/app/src/contexts/CounterContext.tsx index 375019db..e8fa99bc 100644 --- a/app/src/contexts/CounterContext.tsx +++ b/app/src/contexts/CounterContext.tsx @@ -205,104 +205,94 @@ const CounterProvider: React.FC = ({ children }) => { interval = setInterval(() => { counter--; setCount(counter); - if (counter === 60) { - if (timerType === SHORT_BREAK) { - notification( - "60 Seconds Left for Short Break", - { body: "Please prepare yourself getting back to work." }, - sixtySecondsLeftShortBreak - ); - } else if (timerType === LONG_BREAK) { + }, 1000); + } + + return () => clearInterval(interval); + }, [count, playing]); + + useEffect(() => { + if (count === 60) { + if (timerType === SHORT_BREAK) { + notification( + "60 Seconds Left for Short Break", + { body: "Please prepare yourself getting back to work." }, + sixtySecondsLeftShortBreak + ); + } else if (timerType === LONG_BREAK) { + notification( + "60 Seconds Left for Long Break", + { body: "Please prepare yourself getting back to work." }, + sixtySecondsLeftLongBreak + ); + } else if (timerType === SPECIAL_BREAK) { + notification( + "60 Seconds Left for Special Break", + { body: "Please prepare yourself getting back to work." }, + sixtySecondsLeftSpecialBreak + ); + } + } + + if (count === 30 && timerType === STAY_FOCUS) { + notification( + "30 Seconds Left to Work", + { body: "Please pause all media playing if there's one." }, + thirtySecondsLeftToWork + ); + } + + if (count === 0) { + switch (timerType) { + case STAY_FOCUS: + if (round < sessionRounds) { + dispatch(setTimerType("SHORT_BREAK")); notification( - "60 Seconds Left for Long Break", - { body: "Please prepare yourself getting back to work." }, - sixtySecondsLeftLongBreak + "Work Time Finished", + { body: "It is time to take a short break." }, + shortBreakStart ); - } else if (timerType === SPECIAL_BREAK) { + } else { + dispatch(setTimerType("LONG_BREAK")); notification( - "60 Seconds Left for Special Break", - { body: "Please prepare yourself getting back to work." }, - sixtySecondsLeftSpecialBreak + "Session Rounds Completed", + { body: "It is time to take a long break." }, + longBreakStart ); } - } + break; - // Added 1 second due to notification delay - if (counter === 30 && timerType === STAY_FOCUS) { + case SHORT_BREAK: + dispatch(setTimerType("STAY_FOCUS")); + dispatch(setRound(round + 1)); notification( - "30 Seconds Left to Work", - { body: "Please pause all media playing if there's one." }, - thirtySecondsLeftToWork + "Short Break Finished", + { body: "It is time to focus and work again." }, + shortBreakFinished ); - } - - if (counter === 0) { - switch (timerType) { - case STAY_FOCUS: - if (round < sessionRounds) { - dispatch(setTimerType("SHORT_BREAK")); - notification( - "Work Time Finished", - { body: "It is time to take a short break." }, - shortBreakStart - ); - } else { - dispatch(setTimerType("LONG_BREAK")); - notification( - "Session Rounds Completed", - { body: "It is time to take a long break." }, - longBreakStart - ); - } - break; - - case SHORT_BREAK: - dispatch(setTimerType("STAY_FOCUS")); - dispatch(setRound(round + 1)); - notification( - "Short Break Finished", - { body: "It is time to focus and work again." }, - shortBreakFinished - ); - break; + break; - case LONG_BREAK: - dispatch(setTimerType("STAY_FOCUS")); - dispatch(setRound(1)); - notification( - "Long Break Finished", - { body: "It is time to focus and work again." }, - longBreakFinished - ); - break; + case LONG_BREAK: + dispatch(setTimerType("STAY_FOCUS")); + dispatch(setRound(1)); + notification( + "Long Break Finished", + { body: "It is time to focus and work again." }, + longBreakFinished + ); + break; - case SPECIAL_BREAK: - dispatch(setTimerType("STAY_FOCUS")); - notification( - "Special Break Finished", - { body: "It is time to focus and work again." }, - specialBreakFinished - ); - break; - } - return clearInterval(interval); - } - }, 1000); + case SPECIAL_BREAK: + dispatch(setTimerType("STAY_FOCUS")); + notification( + "Special Break Finished", + { body: "It is time to focus and work again." }, + specialBreakFinished + ); + break; + } } - - return () => clearInterval(interval); - }, [ - playing, - count, - round, - sessionRounds, - shortBreak, - longBreak, - timerType, - dispatch, - duration, - notification, - ]); + }, [count, dispatch, notification, round, sessionRounds, timerType]); return ( = 8": +"@types/node@>= 8", "@types/node@^14.0.4": version "14.0.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz#43a63fc5edce226bed106b31b875165256271107" integrity sha512-k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew== @@ -1787,7 +1787,7 @@ "@types/history" "*" "@types/react" "*" -"@types/react@*", "@types/react@^16.9.34": +"@types/react@*": version "16.9.34" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349" integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow== @@ -1795,6 +1795,14 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@^16.9.35": + version "16.9.35" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368" + integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/retry@^0.12.0": version "0.12.0" resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" @@ -1827,10 +1835,10 @@ "@types/react-native" "*" csstype "^2.2.0" -"@types/uuid@^7.0.3": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.3.tgz#45cd03e98e758f8581c79c535afbd4fc27ba7ac8" - integrity sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw== +"@types/uuid@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0" + integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw== "@types/yargs-parser@*": version "15.0.0" @@ -1844,13 +1852,20 @@ dependencies: "@types/yargs-parser" "*" -"@types/yargs@^15.0.0", "@types/yargs@^15.0.4": +"@types/yargs@^15.0.0": version "15.0.4" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg== dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.5": + version "15.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" + integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== + dependencies: + "@types/yargs-parser" "*" + "@typescript-eslint/eslint-plugin@^2.10.0": version "2.25.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz#0b60917332f20dcff54d0eb9be2a9e9f4c9fbd02" @@ -2288,26 +2303,26 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.8: - version "3.5.8" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.8.tgz#4b96cf7d114171b20f32138082dc7cf20f16b85d" - integrity sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw== +app-builder-bin@3.5.9: + version "3.5.9" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f" + integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg== -app-builder-lib@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.0.tgz#65782fa8fc96180a22c008eb78c1355349bb0b86" - integrity sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA== +app-builder-lib@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.1.tgz#f17bfbde1bbb26ae438e450b66005bf6714feb30" + integrity sha512-ENL7r+H7IBfDb4faeLASgndsXrAT7AV7m7yJjcpbFDXYma6an7ZWGFIvR0HJrsfiC5TIB8kdLJ/aMSImrrSi/Q== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chromium-pickle-js "^0.2.0" debug "^4.1.1" ejs "^3.1.2" - electron-publish "22.6.0" + electron-publish "22.6.1" fs-extra "^9.0.0" hosted-git-info "^3.0.4" is-ci "^2.0.0" @@ -3086,15 +3101,15 @@ builder-util-runtime@8.7.0: debug "^4.1.1" sax "^1.2.4" -builder-util@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.0.tgz#25a3aca05d2c44949f0600282264dace8d289ee7" - integrity sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng== +builder-util@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.1.tgz#78172c3634da460325277ef798994592e595eff3" + integrity sha512-A9cF+bSHqRTSKIUHEyE92Tl0Uh12N7yZRH9bccIL3gRUwtp6ulF28LsjNIWTSQ1clZo2M895cT5PCrKzjPQFVg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" "@types/fs-extra" "^8.1.0" - app-builder-bin "3.5.8" + app-builder-bin "3.5.9" bluebird-lst "^1.0.9" builder-util-runtime "8.7.0" chalk "^4.0.0" @@ -4610,13 +4625,13 @@ dir-glob@^3.0.0, dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.0.tgz#78c3dee24f5713f4844d458949041e31fe7eec30" - integrity sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A== +dmg-builder@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.1.tgz#5777a9eb6904db5bf1f4c69addbf462f5f9bf4e4" + integrity sha512-jUTN0acP15puzevtQASj7QEPgUGpedWSuSnOwR/++JbeYRTwU2oro09h/KZnaeMcxgxjdmT3tYLJeY1XUfPbRg== dependencies: - app-builder-lib "22.6.0" - builder-util "22.6.0" + app-builder-lib "22.6.1" + builder-util "22.6.1" fs-extra "^9.0.0" iconv-lite "^0.5.1" js-yaml "^3.13.1" @@ -4836,18 +4851,18 @@ ejs@^3.1.2: dependencies: jake "^10.6.1" -electron-builder@^22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.0.tgz#3ac81634e27026892d66f3a52568e65a7d28d26a" - integrity sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q== +electron-builder@^22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.1.tgz#9cc704356ecba1342ff1c94d610aad1f3c6a8b02" + integrity sha512-3/VNg9GfXKHM53TilFtfF1+bsAR8THK1XHgeqCpsiequa02J9jTPc/DhpCUKQPkrs6/EIGxP7uboop7XYoew0Q== dependencies: - "@types/yargs" "^15.0.4" - app-builder-lib "22.6.0" + "@types/yargs" "^15.0.5" + app-builder-lib "22.6.1" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chalk "^4.0.0" - dmg-builder "22.6.0" + dmg-builder "22.6.1" fs-extra "^9.0.0" is-ci "^2.0.0" lazy-val "^1.0.4" @@ -4856,24 +4871,24 @@ electron-builder@^22.6.0: update-notifier "^4.1.0" yargs "^15.3.1" -electron-log@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.1.2.tgz#da1fdf1950965ec0cf3a04803054e4202083251d" - integrity sha512-MGPjGBEj6p0JdJmbqxbGud7kkHdV+T+D7gq1U+mfsnUM+o0bd4nPsQjVdgqQPsj0epoKdGbNIZ4FPpTQKhRfZA== +electron-log@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.1.3.tgz#ece91d7b478c4b2fa7b73b3c26d4e822f5db1dc1" + integrity sha512-W7lWIP23U6/2eDJvz/GcTl1E/Ik7p/aFiV73gA0VjNxymJnVkucMLr2Sd1LvHcJT1oXYwBQnVyQI7YOcKkE3Ug== -electron-publish@22.6.0: - version "22.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.0.tgz#11dca595cfe3c0fdbc364c28dbb8838a1c6ec799" - integrity sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA== +electron-publish@22.6.1: + version "22.6.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.1.tgz#d5381220d3e0f3bfa869c5a059fd253a561e0f8a" + integrity sha512-/MkS47ospdSfAFW5Jp52OzYou14HhGJpZ51uAc3GJ5rCfACeqpimC/n1ajRLE3hcXxTWfd3t9MCuClq5jrUO5w== dependencies: "@types/fs-extra" "^8.1.0" bluebird-lst "^1.0.9" - builder-util "22.6.0" + builder-util "22.6.1" builder-util-runtime "8.7.0" chalk "^4.0.0" fs-extra "^9.0.0" lazy-val "^1.0.4" - mime "^2.4.4" + mime "^2.4.5" electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413: version "1.3.415" @@ -4893,10 +4908,10 @@ electron-updater@^4.3.1: lodash.isequal "^4.5.0" semver "^7.1.3" -electron@^8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.5.tgz#ae3cb23d5517b2189fd35298e487198d65d1a291" - integrity sha512-LxSCUwmlfJtRwthd3ofpYaZ+1C2hQSW8Ep1DD9K3VbnDItO+kb3t1z35daJgAab78j54aOwo9gMxJtvU0Ftj6w== +electron@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-9.0.0.tgz#335cd426a8a542ad8d4c96c0c40a8668ab5527b8" + integrity sha512-JsaSQNPh+XDYkLj8APtVKTtvpb86KIG57W5OOss4TNrn8L3isC9LsCITwfnVmGIXHhvX6oY/weCtN5hAAytjVg== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -6253,11 +6268,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -gud@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" - integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== - gzip-size@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" @@ -8907,7 +8917,7 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.4.3: +mime@^2.4.3, mime@^2.4.5: version "2.4.5" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009" integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w== @@ -8937,14 +8947,13 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256" integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY= -mini-create-react-context@^0.3.0: - version "0.3.2" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189" - integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw== +mini-create-react-context@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040" + integrity sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA== dependencies: - "@babel/runtime" "^7.4.0" - gud "^1.0.0" - tiny-warning "^1.0.2" + "@babel/runtime" "^7.5.5" + tiny-warning "^1.0.3" mini-css-extract-plugin@0.9.0: version "0.9.0" @@ -11454,29 +11463,29 @@ react-redux@^7.1.1, react-redux@^7.2.0: prop-types "^15.7.2" react-is "^16.9.0" -react-router-dom@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18" - integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew== +react-router-dom@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" + integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA== dependencies: "@babel/runtime" "^7.1.2" history "^4.9.0" loose-envify "^1.3.1" prop-types "^15.6.2" - react-router "5.1.2" + react-router "5.2.0" tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" - integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A== +react-router@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293" + integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw== dependencies: "@babel/runtime" "^7.1.2" history "^4.9.0" hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" - mini-create-react-context "^0.3.0" + mini-create-react-context "^0.4.0" path-to-regexp "^1.7.0" prop-types "^15.6.2" react-is "^16.6.0" @@ -13425,7 +13434,7 @@ tiny-relative-date@^1.3.0: resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== -tiny-warning@^1.0.0, tiny-warning@^1.0.2: +tiny-warning@^1.0.0, tiny-warning@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== @@ -13652,10 +13661,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== +typescript@^3.9.3: + version "3.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a" + integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ== uglify-js@^3.1.4: version "3.9.3" @@ -14016,10 +14025,10 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" - integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== +uuid@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" + integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg== v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.0: version "2.1.0"