From ae5796271c5c3a759050bc370bce4736a6463eb5 Mon Sep 17 00:00:00 2001
From: "Vladimir Pal (BeDoIt)" <mail.vpal@gmail.com>
Date: Wed, 21 Mar 2018 17:44:05 +0200
Subject: [PATCH] fix: clear cache in menu

---
 .../AuthForm/AuthDebugger/AuthDebugger.jsx    |  13 ++
 .../SettingsModal/General/GeneralSettings.jsx |   2 +-
 app/menu.js                                   |  39 ++++-
 app/sagas/index.js                            |   2 +
 app/sagas/initializeApp.js                    |  19 +++
 app/sagas/issues.js                           |   1 -
 app/sagas/settings.js                         |  43 +++---
 yarn.lock                                     | 136 ++++++++++++++----
 8 files changed, 198 insertions(+), 57 deletions(-)

diff --git a/app/containers/AuthForm/AuthDebugger/AuthDebugger.jsx b/app/containers/AuthForm/AuthDebugger/AuthDebugger.jsx
index cb4ff7612..a4be34619 100644
--- a/app/containers/AuthForm/AuthDebugger/AuthDebugger.jsx
+++ b/app/containers/AuthForm/AuthDebugger/AuthDebugger.jsx
@@ -13,6 +13,9 @@ import type {
   Connector,
 } from 'react-redux';
 
+import {
+  settingsActions,
+} from 'actions';
 import {
   getUiState,
 } from 'selectors';
@@ -32,6 +35,7 @@ import CopyIcon from '@atlaskit/icon/glyph/copy';
 import FileIcon from '@atlaskit/icon/glyph/file';
 import CrossIcon from '@atlaskit/icon/glyph/cross';
 import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
+import EditorRemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 
 import {
   AuthDebuggerContainer,
@@ -59,6 +63,15 @@ const AuthDebugger: StatelessFunctionalComponent<Props> = ({
         Auth debug console 📺
       </DebugHeaderTitle>
       <DebugActions>
+        <Tooltip content="Clear cache">
+          <EditorRemoveIcon
+            onClick={() => {
+              dispatch(
+                settingsActions.clearElectronCache(),
+              );
+            }}
+          />
+        </Tooltip>
         <Tooltip content="Copy to clipboard">
           <CopyIcon onClick={() => ipcRenderer.send('copy-login-debug', messages)} />
         </Tooltip>
diff --git a/app/containers/Modals/SettingsModal/General/GeneralSettings.jsx b/app/containers/Modals/SettingsModal/General/GeneralSettings.jsx
index ea89229ed..3a5bc5d5a 100644
--- a/app/containers/Modals/SettingsModal/General/GeneralSettings.jsx
+++ b/app/containers/Modals/SettingsModal/General/GeneralSettings.jsx
@@ -66,7 +66,7 @@ const GeneralSettings: StatelessFunctionalComponent<Props> = ({
         <br />
         <ButtonGroup>
           <Button
-            appearance="danger"
+            appearance="primary"
             onClick={clearChache}
           >
             Clear cache
diff --git a/app/menu.js b/app/menu.js
index 62ed505a9..4f50f4da9 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -4,6 +4,9 @@ import {
   shell,
   BrowserWindow,
 } from 'electron';
+import {
+  CLEAR_ELECTRON_CACHE,
+} from './actions/actionTypes/settings';
 
 
 export default class MenuBuilder {
@@ -58,6 +61,19 @@ export default class MenuBuilder {
         { label: 'Hide Others', accelerator: 'Command+Shift+H', role: 'hideothers' },
         { label: 'Show All', role: 'unhide' },
         { type: 'separator' },
+        {
+          label: 'Clear cache',
+          click: (menu, win) => {
+            if (win) {
+              win.webContents.send(
+                'dispatch',
+                {
+                  type: CLEAR_ELECTRON_CACHE,
+                },
+              );
+            }
+          },
+        },
         {
           label: 'Quit',
           accelerator: 'Command+Q',
@@ -183,8 +199,29 @@ export default class MenuBuilder {
           shell.openExternal('https://web-pal.atlassian.net/servicedesk/customer/portal/2');
         },
       }],
+    }, {
+      label: 'Clear cache',
+      click: (menu, win) => {
+        if (win) {
+          win.webContents.send(
+            'dispatch',
+            {
+              type: CLEAR_ELECTRON_CACHE,
+            },
+          );
+        }
+      },
+    }, {
+      label: 'Quit',
+      accelerator: 'Ctrl+Q',
+      click: (menu, win) => {
+        if (win && win.id !== 1) {
+          win.hide();
+        } else {
+          app.quit();
+        }
+      },
     }];
-
     return templateDefault;
   }
 }
diff --git a/app/sagas/index.js b/app/sagas/index.js
index badfe29ec..fdc73ad84 100644
--- a/app/sagas/index.js
+++ b/app/sagas/index.js
@@ -18,6 +18,7 @@ import * as traySagas from './tray';
 
 import {
   initializeApp,
+  createDispatchActionListener,
 } from './initializeApp';
 
 
@@ -25,6 +26,7 @@ export default function* rootSaga(): Generator<*, void, *> {
   yield all([
     // INITIALIZATION
     fork(initializeApp),
+    fork(createDispatchActionListener),
 
     // auth
     fork(authSagas.createIpcAuthListeners),
diff --git a/app/sagas/initializeApp.js b/app/sagas/initializeApp.js
index 797ec0d86..71a66f560 100644
--- a/app/sagas/initializeApp.js
+++ b/app/sagas/initializeApp.js
@@ -2,6 +2,7 @@
 import {
   call,
   put,
+  take,
   fork,
 } from 'redux-saga/effects';
 import {
@@ -45,6 +46,7 @@ import {
   infoLog,
   notify,
 } from './ui';
+import createIpcChannel from './ipc';
 
 import jira from '../utils/jiraClient';
 import {
@@ -292,3 +294,20 @@ export function* initializeApp(): Generator<*, *, *> {
     yield put(uiActions.setUiState('initializeInProcess', false));
   }
 }
+
+
+function getDispatchActionListener(channel) {
+  return function* listenReFetchIssue() {
+    while (true) {
+      const {
+        payload,
+      } = yield take(channel);
+      yield put(payload[0]);
+    }
+  };
+}
+
+export function* createDispatchActionListener(): Generator<*, *, *> {
+  const dispatchChannel = yield call(createIpcChannel, 'dispatch');
+  yield fork(getDispatchActionListener(dispatchChannel));
+}
diff --git a/app/sagas/issues.js b/app/sagas/issues.js
index 7a9cacc52..f41e0d8b9 100644
--- a/app/sagas/issues.js
+++ b/app/sagas/issues.js
@@ -179,7 +179,6 @@ function* fetchAdditionalWorklogsForIssues(issues) {
         'filled issues with lacking worklogs: ',
         withAdditionalWorklogs,
       );
-      trackMixpanel('Additional worklogs was fetched');
       return withAdditionalWorklogs;
     }
     return issues;
diff --git a/app/sagas/settings.js b/app/sagas/settings.js
index 730b8a569..b0883dc6d 100644
--- a/app/sagas/settings.js
+++ b/app/sagas/settings.js
@@ -18,7 +18,6 @@ import * as Api from 'api';
 import {
   actionTypes,
   uiActions,
-  authActions,
 } from 'actions';
 import {
   getSettingsState,
@@ -95,24 +94,18 @@ export function* watchLocalDesktopSettingsChange(): Generator<*, *, *> {
   yield takeEvery(actionTypes.SET_LOCAL_DESKTOP_SETTING, onChangeLocalDesktopSettings);
 }
 
-function* clearElectronCacheSaga(): Generator<*, *, *> {
-  try {
-    const appDir = remote.getGlobal('appDir');
-    yield call(removeDir, appDir);
-    yield put(authActions.logoutRequest({ dontForget: true }));
-  }
-  catch(e) {
-    console.log(`@@ Error while removing appDir (${appDir})`, e);
+function* removeAllIn(dir, pathName) {
+  const p = path.join(dir, pathName);
+  const stat = yield cps(fs.lstat, p);
+  if (stat.isDirectory()) {
+    yield call(removeDir, p); // eslint-disable-line
+  } else {
+    yield cps(fs.unlink, p);
+    console.log(`Removed file ${p}`);
   }
 }
 
-export function* watchClearElectronChanheRequest(): Generator<*, *, *> {
-  yield takeEvery(actionTypes.CLEAR_ELECTRON_CACHE, clearElectronCacheSaga);
-}
-
-
 function* removeDir(dir) {
-  const ex = fs.existsSync(dir);
   const exists = yield cps(fs.lstat, dir);
   if (exists) {
     const files = yield cps(fs.readdir, dir);
@@ -124,13 +117,17 @@ function* removeDir(dir) {
   }
 }
 
-function* removeAllIn(dir, pathName) {
-  const p = path.join(dir, pathName);
-  const stat = yield cps(fs.lstat, p);
-  if (stat.isDirectory()) {
-    yield call(removeDir, p);
-  } else {
-    yield cps(fs.unlink, p);
-    console.log(`Removed file ${p}`);
+function* clearElectronCacheSaga(): Generator<*, *, *> {
+  try {
+    const appDir = remote.getGlobal('appDir');
+    yield call(removeDir, appDir);
+    remote.app.relaunch();
+    remote.app.exit(0);
+  } catch (err) {
+    console.log('@@ Error while removing appDir', err);
   }
 }
+
+export function* watchClearElectronChanheRequest(): Generator<*, *, *> {
+  yield takeEvery(actionTypes.CLEAR_ELECTRON_CACHE, clearElectronCacheSaga);
+}
diff --git a/yarn.lock b/yarn.lock
index aa08b60e0..1ba841102 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,13 +22,17 @@
     "7zip-bin-mac" "~1.0.1"
     "7zip-bin-win" "~2.1.1"
 
+"7zip-bin@~3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-3.0.0.tgz#17416dc542f41511b26a9667b92847d75ef150fe"
+
 "7zip@0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
 
 "@atlaskit/analytics-next@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@atlaskit/analytics-next/-/analytics-next-1.1.3.tgz#a1b1f72c2a4c4e9f0484318b8563e6f35579a27c"
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@atlaskit/analytics-next/-/analytics-next-1.1.6.tgz#e919760ff66807df1f812deb1bb78a10a86e32c1"
   dependencies:
     prop-types "^15.5.10"
 
@@ -361,7 +365,7 @@
 
 "@types/node@^7.0.18":
   version "7.0.56"
-  resolved "http://registry.npmjs.org/@types/node/-/node-7.0.56.tgz#b6b659049191822be43c14610c1785d4b9cddecf"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.56.tgz#b6b659049191822be43c14610c1785d4b9cddecf"
 
 JSONStream@^1.0.4:
   version "1.3.2"
@@ -1874,7 +1878,16 @@ builder-util-runtime@4.0.3:
     fs-extra-p "^4.5.0"
     sax "^1.2.4"
 
-builder-util-runtime@^4.0.3, builder-util-runtime@~4.0.3:
+builder-util-runtime@^4.0.3, builder-util-runtime@^4.0.5:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.1.0.tgz#7dcd042d555d2f161a5538d7a0ea8c292daa0683"
+  dependencies:
+    bluebird-lst "^1.0.5"
+    debug "^3.1.0"
+    fs-extra-p "^4.5.2"
+    sax "^1.2.4"
+
+builder-util-runtime@~4.0.3:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62"
   dependencies:
@@ -1883,7 +1896,7 @@ builder-util-runtime@^4.0.3, builder-util-runtime@~4.0.3:
     fs-extra-p "^4.5.0"
     sax "^1.2.4"
 
-builder-util@4.2.1, builder-util@^4.2.1:
+builder-util@4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.1.tgz#ca9f0ddb5af1da5fe432129f7c6cbd447b552016"
   dependencies:
@@ -1903,6 +1916,26 @@ builder-util@4.2.1, builder-util@^4.2.1:
     temp-file "^3.1.1"
     tunnel-agent "^0.6.0"
 
+builder-util@^4.2.1:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.5.tgz#babc190e2f2c3681497632b5cc274f1543aa9264"
+  dependencies:
+    "7zip-bin" "~3.0.0"
+    bluebird-lst "^1.0.5"
+    builder-util-runtime "^4.0.5"
+    chalk "^2.3.0"
+    debug "^3.1.0"
+    fs-extra-p "^4.5.0"
+    ini "^1.3.5"
+    is-ci "^1.1.0"
+    js-yaml "^3.10.0"
+    lazy-val "^1.0.3"
+    semver "^5.5.0"
+    source-map-support "^0.5.3"
+    stat-mode "^0.2.2"
+    temp-file "^3.1.1"
+    tunnel-agent "^0.6.0"
+
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1998,12 +2031,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000815"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000815.tgz#0e218fa133d0d071c886aa041b435258cc746891"
+  version "1.0.30000817"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000817.tgz#c9f8e236887cf60ae623d1fb1e5ec92877ab1229"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000815"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz#3a4258e6850362185adb11b0d754a48402d35bf6"
+  version "1.0.30000817"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000817.tgz#e993c380eb4bfe76a2aed4223f841c02d6e0d832"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2290,8 +2323,8 @@ commander@2.6.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
 
 commander@^2.11.0, commander@^2.13.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322"
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
 commitizen@2.9.6:
   version "2.9.6"
@@ -3318,8 +3351,8 @@ electron-publish@19.55.2:
     mime "^2.2.0"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.39"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.39.tgz#d7a4696409ca0995e2750156da612c221afad84d"
+  version "1.3.40"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
 
 electron-updater@2.20.1:
   version "2.20.1"
@@ -3920,10 +3953,14 @@ extract-zip@^1.0.3:
     mkdirp "0.5.0"
     yauzl "2.4.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
 eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
@@ -4220,7 +4257,7 @@ fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
-fs-extra-p@^4.5.0:
+fs-extra-p@^4.5.0, fs-extra-p@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.2.tgz#0a22aba489284d17f375d5dc5139aa777fe2df51"
   dependencies:
@@ -5511,8 +5548,8 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
 
 keycode@^2.1.2, keycode@^2.1.7:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
 
 keytar@^4.1.0:
   version "4.2.0"
@@ -6056,7 +6093,7 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -6064,6 +6101,10 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -6095,10 +6136,14 @@ moment-duration-format@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-2.2.1.tgz#b9ce5e5051a15282a0a6c361f0c05685c7ead47c"
 
-moment@2.20.1, moment@2.x:
+moment@2.20.1:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
+moment@2.x:
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
+
 ms@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
@@ -6132,10 +6177,14 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@2.8.0, nan@^2.3.0, nan@~2.8.0:
+nan@2.8.0, nan@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
+nan@^2.3.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 nan@~2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
@@ -6187,13 +6236,20 @@ node-abi@^2.1.1, node-abi@^2.2.0:
   dependencies:
     semver "^5.4.1"
 
-node-fetch@1.6.3, node-fetch@^1.0.1:
+node-fetch@1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-forge@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
@@ -7633,10 +7689,14 @@ redux-resource-plugins@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/redux-resource-plugins/-/redux-resource-plugins-2.1.0.tgz#e5ccc778d9db6d8fc2deef523da7090f8d4c9e8a"
 
-redux-resource@2.4.0, redux-resource@^2.0.0:
+redux-resource@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/redux-resource/-/redux-resource-2.4.0.tgz#9d132e2921f1ae77d8794d7c87fe16f47d237a08"
 
+redux-resource@^2.0.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/redux-resource/-/redux-resource-2.4.1.tgz#cd12b45112ac9dc5ed42ffcb2f98ffd70fd81751"
+
 redux-saga@0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.0.tgz#0a231db0a1489301dd980f6f2f88d8ced418f724"
@@ -7783,7 +7843,7 @@ request-promise@^4.1.1:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2.81.0, request@^2.45.0, request@^2.79.0:
+request@2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -7810,7 +7870,7 @@ request@2.81.0, request@^2.45.0, request@^2.79.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.83.0:
+request@^2.45.0, request@^2.79.0, request@^2.83.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
@@ -7886,8 +7946,8 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
 resolve@^1.1.6, resolve@^1.2.0, resolve@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
   dependencies:
     path-parse "^1.0.5"
 
@@ -8095,8 +8155,8 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -8276,7 +8336,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.3, source-map-support@^0.5.1, source-map-support@^0.5.2:
+source-map-support@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
   dependencies:
@@ -8288,6 +8348,12 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@^0.5.1, source-map-support@^0.5.2, source-map-support@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8"
+  dependencies:
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -9440,14 +9506,22 @@ winston@2.1.0:
     pkginfo "0.3.x"
     stack-trace "0.0.x"
 
-word-wrap@1.1.0, word-wrap@^1.0.3:
+word-wrap@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.1.0.tgz#356153d61d10610d600785c5d701288e0ae764a6"
 
-wordwrap@0.0.2, wordwrap@~0.0.2:
+word-wrap@^1.0.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+
+wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"