From 10fc4d82fd4f273db57ac52bf0c6477a07a6b8ac Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Sat, 25 Jul 2020 23:50:25 +0800
Subject: [PATCH 01/19] fix(forgotaccount): fix dialog not closing

---
 babel.config.js                           |   2 +-
 package.json                              |  12 +-
 public/index.html                         |   9 +-
 src/assets/preloader-i18n-inline.js       |  21 +-
 src/components/toolbar/AccountManager.vue |   1 +
 src/components/toolbar/ForgotAccount.vue  |   5 +-
 src/locales/en.yml                        |   4 +-
 src/utils/unmarshaller.js                 |  16 +-
 src/utils/validator.js                    |   3 +
 yarn.lock                                 | 942 +++++++++-------------
 10 files changed, 414 insertions(+), 601 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 3f84a21a..cca4a1a9 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   presets: [
-    ['@vue/app', {
+    ["@vue/cli-plugin-babel/preset", {
       useBuiltIns: "entry"
     }]
   ],
diff --git a/package.json b/package.json
index c2c5b1fc..2e995ba5 100644
--- a/package.json
+++ b/package.json
@@ -46,15 +46,15 @@
     "@intlify/vue-i18n-loader": "^1.0.0",
     "@kazupon/vue-i18n-loader": "^0.3.0",
     "@mdi/font": "4.9.95",
-    "@vue/cli-plugin-babel": "^3.9.0",
-    "@vue/cli-plugin-eslint": "^3.9.0",
+    "@vue/cli-plugin-babel": "~4.4.6",
+    "@vue/cli-plugin-eslint": "~4.4.6",
     "@vue/cli-service": "^4.4.6",
     "axios": "^0.19.0",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
     "browserslist-ga-export": "^2.0.0",
     "cz-conventional-changelog": "3.0.2",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
     "eslint-plugin-vuetify": "^1.0.0-beta.5",
     "husky": "^4.2.5",
     "js-yaml-loader": "^1.2.2",
@@ -67,6 +67,8 @@
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.4.3",
     "webpack": "^4.42.1",
+    "webpack-bundle-analyzer": "^3.8.0",
+    "webpack-cli": "^3.3.12",
     "workbox-webpack-plugin": "^5.1.2"
   },
   "postcss": {
diff --git a/public/index.html b/public/index.html
index 81553731..42c8c0c5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -72,14 +72,7 @@
 </main>
 <!--<script type="text/javascript">"use strict";navigator.serviceWorker.getRegistrations().then(function(registrations){for(let registration of registrations){registration.unregister()}});caches.keys().then(keys=>{keys.forEach(el => caches.delete(el))});</script>-->
 <script type="text/javascript">"use strict";function __reload(){navigator.serviceWorker.getRegistrations().then(function(registrations){for(let registration of registrations){registration.unregister()}});caches.keys().then(keys=>{caches.delete(keys.find(el=>~el.indexOf("workbox-precache")))});window.location.reload()}(function(){function processNode(node){var tagName=(node.tagName||'').toLowerCase();var nodeAttribute=tagName==='script'&&node.src?'src':tagName==='link'&&node.rel==='stylesheet'&&node.href?'href':null;if(nodeAttribute){node.onerror=function(e){console.error("failing to get assets.",e);if(!~e.target.src.indexOf(window.location.origin)){return;}document.querySelector(".load_failed").style.display="block";document.querySelector(".sk-chase").style.opacity=0;document.querySelector(".load_title").style.opacity=0}}}new MutationObserver(function(mutations){for(var i=0;i<mutations.length;++i){var mutation=mutations[i];var addedNodes=mutation.addedNodes;for(var j=0;j<addedNodes.length;++j){processNode(addedNodes[j])}}}).observe(document,{childList:true,attributes:true,characterData:false,subtree:true,attributeOldValue:false})}());</script>
-<script type="text/javascript">function _slicedToArray(a,c){return _arrayWithHoles(a)||_iterableToArrayLimit(a,c)||_unsupportedIterableToArray(a,c)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}
-function _unsupportedIterableToArray(a,c){if(a){if("string"===typeof a)return _arrayLikeToArray(a,c);var b=Object.prototype.toString.call(a).slice(8,-1);"Object"===b&&a.constructor&&(b=a.constructor.name);if("Map"===b||"Set"===b)return Array.from(a);if("Arguments"===b||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(b))return _arrayLikeToArray(a,c)}}function _arrayLikeToArray(a,c){if(null==c||c>a.length)c=a.length;for(var b=0,d=Array(c);b<c;b++)d[b]=a[b];return d}
-function _iterableToArrayLimit(a,c){if("undefined"!==typeof Symbol&&Symbol.iterator in Object(a)){var b=[],d=!0,e=!1,f=void 0;try{for(var g=a[Symbol.iterator](),h;!(d=(h=g.next()).done)&&(b.push(h.value),!c||b.length!==c);d=!0);}catch(k){e=!0,f=k}finally{try{if(!d&&null!=g["return"])g["return"]()}finally{if(e)throw f;}}return b}}function _arrayWithHoles(a){if(Array.isArray(a))return a}
-Object.entries||(Object.entries=function(a){for(var c=Object.keys(a),b=c.length,d=Array(b);b--;)d[b]=[c[b],a[c[b]]];return d});
-var _i18n={getFirstBrowserLanguageWithRegionCode:function(){var a=window.navigator,c=["language","browserLanguage","systemLanguage","userLanguage"],b,d=null;if(Array.isArray(a.languages))for(b=0;b<a.languages.length;b++){var e=a.languages[b];var f=e.length;!d&&f&&(d=e);if(e&&2<f)return e}for(b=0;b<c.length;b++)if(e=a[c[b]],null!=e&&(f=e.length,!d&&f&&(d=e),e&&2<f))return e;return d},getFirstBrowserLanguage:function(){var a=this.getFirstBrowserLanguageWithRegionCode().replace("_","-");if(!a)return"zh";
-    var c=a.split("-");return 1===c.length?a:2===c.length?c[0]:a},data:{en:{"load_title--text":"Loading","load_caption--text":"Initialization may take some time","load_copyright--text":"Penguin Statistics"},ja:{"load_title--text":"\u8aad\u307f\u8fbc\u307f\u4e2d...","load_caption--text":"\u521d\u3081\u3066\u306e\u8aad\u307f\u8fbc\u307f\u306f\u52d5\u4f5c\u304c\u9045\u304f\u306a\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059<br>\u5c11\u3005\u304a\u5f85\u3061\u4e0b\u3055\u3044","load_copyright--text":"\u30da\u30f3\u30ae\u30f3\u6025\u4fbf\u30c7\u30fc\u30bf\u7d71\u8a08\u51e6\u7406\u90e8\u9580"},
-    ko:{"load_title--text":"\ub85c\ub529\uc911...","load_caption--text":"\ucd08\uae30 \uc124\uc815\uc5d0 \uc2dc\uac04\uc774 \uc880 \uac78\ub9b4 \uc218 \uc788\uc73c\ub2c8, \uae30\ub2e4\ub824 \uc8fc\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4","load_copyright--text":"\ud3ad\uadc4 \ubb3c\ub958 \ub370\uc774\ud130 \ubd84\uc11d \ubd80\uc11c"}},fill:function(a,c){document.querySelector("#"+a).innerHTML=c},render:function(){document.querySelector("#load_copyright_year--text").textContent=(new Date).getFullYear().toString();
-    var a=this.getFirstBrowserLanguage();if(a in this.data&&"string"===typeof a&&2>=a.length){var c=0;for(a=Object.entries(this.data[a]);c<a.length;c++){var b=_slicedToArray(a[c],2);this.fill(b[0],b[1])}}}};try{_i18n.render()}catch(a){console.error(a)};</script>
+<script type="text/javascript">"use strict";function _slicedToArray(arr,i){return _arrayWithHoles(arr)||_iterableToArrayLimit(arr,i)||_unsupportedIterableToArray(arr,i)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++){arr2[i]=arr[i]}return arr2}function _iterableToArrayLimit(arr,i){if(typeof Symbol==="undefined"||!(Symbol.iterator in Object(arr)))return;var _arr=[];var _n=true;var _d=false;var _e=undefined;try{for(var _i=arr[Symbol.iterator](),_s;!(_n=(_s=_i.next()).done);_n=true){_arr.push(_s.value);if(i&&_arr.length===i)break}}catch(err){_d=true;_e=err}finally{try{if(!_n&&_i["return"]!=null)_i["return"]()}finally{if(_d)throw _e;}}return _arr}function _arrayWithHoles(arr){if(Array.isArray(arr))return arr}if(!Object.entries)Object.entries=function(obj){var ownProps=Object.keys(obj),i=ownProps.length,resArray=new Array(i);while(i--){resArray[i]=[ownProps[i],obj[ownProps[i]]]}return resArray};var _i18n={languageWithRegion:function languageWithRegion(){var nav=window.navigator,browserLanguagePropertyKeys=['language','browserLanguage','systemLanguage','userLanguage'],i,language,len,shortLanguage=null;if(Array.isArray(nav.languages)){for(i=0;i<nav.languages.length;i++){language=nav.languages[i];len=language.length;if(!shortLanguage&&len){shortLanguage=language}if(language&&len>2){return language}}}for(i=0;i<browserLanguagePropertyKeys.length;i++){language=nav[browserLanguagePropertyKeys[i]];if(language==null){continue}len=language.length;if(!shortLanguage&&len){shortLanguage=language}if(language&&len>2){return language}}return shortLanguage},language:function language(){if(localStorage){var settings=localStorage.getItem("penguin-stats-settings");if(settings){try{var data=JSON.parse(settings);return data.settings.language}catch(e){}}}var language=this.languageWithRegion().replace("_","-");if(!language)return"en";var languages=language.split("-");if(languages.length===1){return language}else if(languages.length===2){return languages[0]}else{return language}},data:{"en":{"load_title--text":"Loading","load_caption--text":"Initialization may take some time","load_copyright--text":"Penguin Statistics"},"ja":{"load_title--text":"読み込み中...","load_caption--text":"初めての読み込みは動作が遅くなる可能性があります<br>少々お待ち下さい","load_copyright--text":"ペンギン急便データ統計処理部門"},"ko":{"load_title--text":"로딩중...","load_caption--text":"초기 설정에 시간이 좀 걸릴 수 있으니, 기다려 주시기 바랍니다","load_copyright--text":"펭귄 물류 데이터 분석 부서"}},fill:function fill(key,content){document.querySelector("#"+key).innerHTML=content},render:function render(){document.querySelector("#load_copyright_year--text").textContent=new Date().getFullYear().toString();var language=this.language();if(language in this.data&&typeof language==="string"&&language.length<=2){var messages=this.data[language];for(var _i=0,_Object$entries=Object.entries(messages);_i<_Object$entries.length;_i++){var _Object$entries$_i=_slicedToArray(_Object$entries[_i],2),key=_Object$entries$_i[0],value=_Object$entries$_i[1];this.fill(key,value)}}}};try{_i18n.render()}catch(e){console.error(e)}</script>
 <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="2aa1bf4c-8c34-4028-9e1c-ca1f6c330779";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
 </body>
 </html>
diff --git a/src/assets/preloader-i18n-inline.js b/src/assets/preloader-i18n-inline.js
index 20dd35de..9201f5e9 100644
--- a/src/assets/preloader-i18n-inline.js
+++ b/src/assets/preloader-i18n-inline.js
@@ -12,7 +12,7 @@ if (!Object.entries)
   };
 
 let _i18n = {
-  getFirstBrowserLanguageWithRegionCode () {
+  languageWithRegion () {
     let nav = window.navigator,
       browserLanguagePropertyKeys = ['language', 'browserLanguage', 'systemLanguage', 'userLanguage'],
       i,
@@ -50,9 +50,20 @@ let _i18n = {
 
     return shortLanguage;
   },
-  getFirstBrowserLanguage () {
-    const language = this.getFirstBrowserLanguageWithRegionCode().replace("_", "-");
-    if (!language) return "zh"; // use default
+  language () {
+    if (localStorage) {
+      const settings = localStorage.getItem("penguin-stats-settings")
+      if (settings) {
+        try {
+          const data = JSON.parse(settings);
+          return data.settings.language
+        } catch (e) {
+          // fallback
+        }
+      }
+    }
+    const language = this.languageWithRegion().replace("_", "-");
+    if (!language) return "en"; // use default
     const languages = language.split("-");
     if (languages.length === 1) {
       return language
@@ -85,7 +96,7 @@ let _i18n = {
   },
   render () {
     document.querySelector("#load_copyright_year--text").textContent = new Date().getFullYear().toString();
-    let language = this.getFirstBrowserLanguage();
+    let language = this.language();
     if (language in this.data && typeof language === "string" && language.length <= 2) {
       let messages = this.data[language];
       for (let [key, value] of Object.entries(messages)) {
diff --git a/src/components/toolbar/AccountManager.vue b/src/components/toolbar/AccountManager.vue
index 90e294bb..a71ba1db 100644
--- a/src/components/toolbar/AccountManager.vue
+++ b/src/components/toolbar/AccountManager.vue
@@ -128,6 +128,7 @@
                 <ForgotAccount
                   v-if="historyDialog"
                   @loggedIn="loggedIn"
+                  @close="historyDialog = false"
                 />
               </v-dialog>
             </template>
diff --git a/src/components/toolbar/ForgotAccount.vue b/src/components/toolbar/ForgotAccount.vue
index dfc2b3b0..fdfb3cbe 100644
--- a/src/components/toolbar/ForgotAccount.vue
+++ b/src/components/toolbar/ForgotAccount.vue
@@ -119,7 +119,10 @@
     <v-divider />
     <v-card-actions>
       <v-spacer />
-      <v-btn text>
+      <v-btn
+        text
+        @click="$emit('close')"
+      >
         {{ $t('meta.dialog.close') }}
       </v-btn>
     </v-card-actions>
diff --git a/src/locales/en.yml b/src/locales/en.yml
index 5af3918d..1cdf19da 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -435,8 +435,8 @@ auth:
     subtitle: Let's recover your login information
     penguinIdHistory:
       title: Previously used PenguinID
-      lastLoginAt: Last logged in on this device at {time}
+      lastLoginAt: Last login at {time}
       loginAsUserId: Login as this PenguinID
       deleteUserId: Delete this PenguinID record
       noData: No Data
-      tips: Only able to recover PenguinID that are used on client v3.3.1 or newer versions
+      tips: Only able to recover PenguinID that are used in client v3.3.1 or newer versions
diff --git a/src/utils/unmarshaller.js b/src/utils/unmarshaller.js
index 2d93d56b..ad726af1 100644
--- a/src/utils/unmarshaller.js
+++ b/src/utils/unmarshaller.js
@@ -1,5 +1,6 @@
 import Console from "@/utils/Console";
 import get from "@/utils/getters";
+import validator from "@/utils/validator";
 
 const errors = {
   planner: {
@@ -30,8 +31,8 @@ export default {
               // and if the config file have any of those param, it should also pass the validation
 
               // valid need OR valid have
-              (item.hasOwnProperty("need") && Number.isInteger(item.need) && item.need >= 0) ||
-              (item.hasOwnProperty("have") && Number.isInteger(item.have) && item.have >= 0)
+              (validator.have(item, "need") && Number.isInteger(item.need) && item.need >= 0) ||
+              (validator.have(item, "have") && Number.isInteger(item.have) && item.have >= 0)
             )
           ) {
             convertionErrors.push({
@@ -40,16 +41,19 @@ export default {
               reason: errors.planner.config.invalidItemSegment
             });
 
-            Console.info("PlannerIO", item.hasOwnProperty("need"), Number.isInteger(item.need), item.need >= 0,
-              item.hasOwnProperty("have"), Number.isInteger(item.have), item.have >= 0)
+            Console.info(
+              "PlannerIO",
+              validator.have(item, "need"), Number.isInteger(item.need), item.need >= 0,
+              validator.have(item, "have"), Number.isInteger(item.have), item.have >= 0
+            )
             Console.info("PlannerImport", "one of the item data is invalid. not importing this and continue to the next one (reason: need or have invalid): ", index, item)
             continue
           }
 
           // item identifier `id` or `name` check
 
-          const haveId = item.hasOwnProperty("id"); // later versions use id to represent item
-          const haveName = item.hasOwnProperty("name"); // older versions use (chinese) name to represent item
+          const haveId = validator.have(item, "id"); // later versions use id to represent item
+          const haveName = validator.have(item, "name"); // older versions use (chinese) name to represent item
           if (haveId) {
             if (haveName) {
               // we don't need the name anymore if the item have an id
diff --git a/src/utils/validator.js b/src/utils/validator.js
index a9c2d1c2..cb2aa962 100644
--- a/src/utils/validator.js
+++ b/src/utils/validator.js
@@ -10,6 +10,9 @@ export default {
   notEmptyArray (data) {
     return data.length > 0 || "data must be an non-empty array"
   },
+  have (object, key) {
+    return Object.prototype.hasOwnProperty.call(object, key)
+  },
   all (...validators) {
     for (const validator of validators) {
       if (validator !== true) return validator
diff --git a/yarn.lock b/yarn.lock
index c8344942..3d239361 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,7 +18,7 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.8.4":
+"@babel/core@^7.8.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.4.tgz#780e8b83e496152f8dd7df63892b2e052bf1d51d"
   integrity sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA==
@@ -40,6 +40,28 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.9.6":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330"
+  integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.5"
+    "@babel/types" "^7.10.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243"
@@ -50,6 +72,15 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/generator@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69"
+  integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==
+  dependencies:
+    "@babel/types" "^7.10.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
@@ -65,7 +96,7 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.10.4":
+"@babel/helper-compilation-targets@^7.10.4", "@babel/helper-compilation-targets@^7.9.6":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
   integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
@@ -88,6 +119,18 @@
     "@babel/helper-replace-supers" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
+"@babel/helper-create-class-features-plugin@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+
 "@babel/helper-create-regexp-features-plugin@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
@@ -144,7 +187,14 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4":
+"@babel/helper-member-expression-to-functions@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz#172f56e7a63e78112f3a04055f24365af702e7ee"
+  integrity sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==
+  dependencies:
+    "@babel/types" "^7.10.5"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
   integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
@@ -164,6 +214,19 @@
     "@babel/types" "^7.10.4"
     lodash "^4.17.13"
 
+"@babel/helper-module-transforms@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6"
+  integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
+
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
@@ -257,7 +320,12 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64"
   integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==
 
-"@babel/plugin-proposal-async-generator-functions@^7.10.4", "@babel/plugin-proposal-async-generator-functions@^7.2.0":
+"@babel/parser@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
+  integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
+
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6"
   integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==
@@ -266,7 +334,7 @@
     "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.10.4":
+"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
   integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
@@ -274,12 +342,12 @@
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.1.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.4.tgz#fe20ef10cc73f386f70910fca48798041cd357c7"
-  integrity sha512-JHTWjQngOPv+ZQQqOGv2x6sCCr4IYWy7S1/VH6BE9ZfkoLrdQ2GpEP3tfb5M++G9PwvqjhY8VC/C3tXm+/eHvA==
+"@babel/plugin-proposal-decorators@^7.8.3":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz#42898bba478bc4b1ae242a703a953a7ad350ffb4"
+  integrity sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.10.5"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.10.4"
 
@@ -291,7 +359,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.10.4", "@babel/plugin-proposal-json-strings@^7.2.0":
+"@babel/plugin-proposal-json-strings@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
   integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
@@ -315,7 +383,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.3.4":
+"@babel/plugin-proposal-object-rest-spread@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
   integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
@@ -324,7 +392,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.4", "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
   integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
@@ -348,7 +416,7 @@
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
   integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
@@ -356,7 +424,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0":
+"@babel/plugin-syntax-async-generators@^7.8.0":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -377,21 +445,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0":
+"@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0":
+"@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
   integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
@@ -412,14 +480,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
+"@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
@@ -440,14 +508,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.4", "@babel/plugin-transform-arrow-functions@^7.2.0":
+"@babel/plugin-transform-arrow-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
   integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.10.4", "@babel/plugin-transform-async-to-generator@^7.3.4":
+"@babel/plugin-transform-async-to-generator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
   integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
@@ -456,14 +524,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.4", "@babel/plugin-transform-block-scoped-functions@^7.2.0":
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
   integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.10.4", "@babel/plugin-transform-block-scoping@^7.3.4":
+"@babel/plugin-transform-block-scoping@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787"
   integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==
@@ -471,7 +539,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.10.4", "@babel/plugin-transform-classes@^7.3.4":
+"@babel/plugin-transform-classes@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
   integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
@@ -485,21 +553,21 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.4", "@babel/plugin-transform-computed-properties@^7.2.0":
+"@babel/plugin-transform-computed-properties@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
   integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.10.4", "@babel/plugin-transform-destructuring@^7.2.0":
+"@babel/plugin-transform-destructuring@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
   integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
   integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
@@ -507,14 +575,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.4", "@babel/plugin-transform-duplicate-keys@^7.2.0":
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
   integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.4", "@babel/plugin-transform-exponentiation-operator@^7.2.0":
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
   integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
@@ -522,14 +590,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.10.4", "@babel/plugin-transform-for-of@^7.2.0":
+"@babel/plugin-transform-for-of@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
   integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.10.4", "@babel/plugin-transform-function-name@^7.2.0":
+"@babel/plugin-transform-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
   integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
@@ -537,7 +605,7 @@
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.10.4", "@babel/plugin-transform-literals@^7.2.0":
+"@babel/plugin-transform-literals@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
   integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
@@ -551,7 +619,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.2.0":
+"@babel/plugin-transform-modules-amd@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz#cb407c68b862e4c1d13a2fc738c7ec5ed75fc520"
   integrity sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA==
@@ -560,7 +628,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.8.3":
+"@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
   integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
@@ -570,7 +638,7 @@
     "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.4", "@babel/plugin-transform-modules-systemjs@^7.3.4":
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9"
   integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==
@@ -580,7 +648,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.4", "@babel/plugin-transform-modules-umd@^7.2.0":
+"@babel/plugin-transform-modules-umd@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
   integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
@@ -588,21 +656,21 @@
     "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4", "@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
   integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.10.4":
+"@babel/plugin-transform-new-target@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
   integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.10.4", "@babel/plugin-transform-object-super@^7.2.0":
+"@babel/plugin-transform-object-super@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
   integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
@@ -610,7 +678,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.10.4", "@babel/plugin-transform-parameters@^7.2.0":
+"@babel/plugin-transform-parameters@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced"
   integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==
@@ -625,7 +693,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.4", "@babel/plugin-transform-regenerator@^7.3.4":
+"@babel/plugin-transform-regenerator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
   integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
@@ -639,31 +707,31 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@^7.4.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7"
-  integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw==
+"@babel/plugin-transform-runtime@^7.9.6":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86"
+  integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w==
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.4", "@babel/plugin-transform-shorthand-properties@^7.2.0":
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
   integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.10.4", "@babel/plugin-transform-spread@^7.2.0":
+"@babel/plugin-transform-spread@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
   integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.10.4", "@babel/plugin-transform-sticky-regex@^7.2.0":
+"@babel/plugin-transform-sticky-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
   integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
@@ -671,7 +739,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.10.4", "@babel/plugin-transform-template-literals@^7.2.0":
+"@babel/plugin-transform-template-literals@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc"
   integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==
@@ -679,7 +747,7 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.4", "@babel/plugin-transform-typeof-symbol@^7.2.0":
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
   integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
@@ -693,7 +761,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.4", "@babel/plugin-transform-unicode-regex@^7.2.0":
+"@babel/plugin-transform-unicode-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
   integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
@@ -701,56 +769,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@^7.0.0 < 7.4.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
-  integrity sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.3.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.3.4"
-    "@babel/plugin-transform-classes" "^7.3.4"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.2.0"
-    "@babel/plugin-transform-dotall-regex" "^7.2.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.2.0"
-    "@babel/plugin-transform-function-name" "^7.2.0"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.3.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.2.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.2.0"
-    browserslist "^4.3.4"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.3.0"
-
-"@babel/preset-env@^7.8.4":
+"@babel/preset-env@^7.8.4", "@babel/preset-env@^7.9.6":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
   integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
@@ -831,18 +850,17 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime-corejs2@^7.2.0":
+"@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.10.4.tgz#5d48ee239624d511c88208da86c27a161ee01cf7"
-  integrity sha512-9sArmpZDQsnR1yyAcU51DxQrntWxt0LUKjPp3pIyo7kVLfaqKt8muppcT87QmFkXV5H50qXAF8JWOjk0jaXRYA==
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"
+  integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==
   dependencies:
-    core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"
-  integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==
+"@babel/runtime@^7.9.6":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c"
+  integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -870,6 +888,21 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
+"@babel/traverse@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564"
+  integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/types" "^7.10.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/types@^7.10.4", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee"
@@ -879,6 +912,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
+  integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@commitlint/execute-rule@^9.0.1":
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-9.0.1.tgz#59993cf87103d75b56c6ae790cd4240c1863b3c2"
@@ -1184,26 +1226,28 @@
     lodash.kebabcase "^4.1.1"
     svg-tags "^1.0.0"
 
-"@vue/babel-preset-app@^3.12.1":
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.12.1.tgz#24c477052f078f30fdb7735103b14dd1fa2cbfe1"
-  integrity sha512-Zjy5jQaikV1Pz+ri0YgXFS7q4/5wCxB5tRkDOEIt5+4105u0Feb/pvH20nVL6nx9GyXrECFfcm7Yxr/z++OaPQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-decorators" "^7.1.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.4.0"
-    "@babel/preset-env" "^7.0.0 < 7.4.0"
-    "@babel/runtime" "^7.0.0"
-    "@babel/runtime-corejs2" "^7.2.0"
-    "@vue/babel-preset-jsx" "^1.0.0"
-    babel-plugin-dynamic-import-node "^2.2.0"
-    babel-plugin-module-resolver "3.2.0"
-    core-js "^2.6.5"
-
-"@vue/babel-preset-jsx@^1.0.0":
+"@vue/babel-preset-app@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.4.6.tgz#92aef916e83f1abe0a2ed1e9e2cef5b332f958c4"
+  integrity sha512-urIa6Qk3lKacLvscrzxMNyYlTqKFcPAUo5MohOjv1ISZ9PssHw693WTOrqSC0XksdMLtp/rnLvc6l5G8Muk0lw==
+  dependencies:
+    "@babel/core" "^7.9.6"
+    "@babel/helper-compilation-targets" "^7.9.6"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.9.6"
+    "@babel/preset-env" "^7.9.6"
+    "@babel/runtime" "^7.9.6"
+    "@vue/babel-preset-jsx" "^1.1.2"
+    babel-plugin-dynamic-import-node "^2.3.3"
+    core-js "^3.6.5"
+    core-js-compat "^3.6.5"
+    semver "^6.1.0"
+
+"@vue/babel-preset-jsx@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz#2e169eb4c204ea37ca66c2ea85a880bfc99d4f20"
   integrity sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==
@@ -1255,31 +1299,30 @@
   resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.4.6.tgz#58f996066d8c0a0a45ad4b5c6f3f213f9945a9ba"
   integrity sha512-fzjg2gWQt+jw5fyLsD9HZNxGNQgZjLDI2s9bLWJwRucdfmncSi9neqA0TZyszGrgcJA4Qu4V5KgV0qwVSBYCaw==
 
-"@vue/cli-plugin-babel@^3.9.0":
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.12.1.tgz#9a79159de8cd086b013fa6d78a39830b2e2ec706"
-  integrity sha512-Zetvz8PikLCGomeKOKu8pC9YQ7cfxs7pGpvEOzaxGdhMnebhjAYR6i6dOB57A6N5lhxQksXCtYTv26QgfiIpdg==
+"@vue/cli-plugin-babel@~4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.6.tgz#d5d750d4f74900c00836e19c164193650df26f3b"
+  integrity sha512-9cX9mN+4DIbcqw3rV6UBOA0t5zikIkrBLQloUzsOBOu5Xb7/UoD7inInFj7bnyHUflr5LqbdWJ+etCQcWAIIXA==
   dependencies:
-    "@babel/core" "^7.0.0"
-    "@vue/babel-preset-app" "^3.12.1"
-    "@vue/cli-shared-utils" "^3.12.1"
-    babel-loader "^8.0.5"
+    "@babel/core" "^7.9.6"
+    "@vue/babel-preset-app" "^4.4.6"
+    "@vue/cli-shared-utils" "^4.4.6"
+    babel-loader "^8.1.0"
+    cache-loader "^4.1.0"
+    thread-loader "^2.1.3"
     webpack "^4.0.0"
 
-"@vue/cli-plugin-eslint@^3.9.0":
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.12.1.tgz#302c463867f38e790bb996eafdf7159c782dc8cf"
-  integrity sha512-tVTZlEZsy3sQbO4LLWFK11yzlWwqVAqaM+IY+BeWHITBzEJKh2KmouG+x6x/reXiU3qROsMJ4Ej3Hs8buSMWyQ==
+"@vue/cli-plugin-eslint@~4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.6.tgz#442d62a70dd93e4a549ff9164d2d10f4e97a58f1"
+  integrity sha512-3a9rVpOKPQsDgAlRkhmBMHboGobivG/47BbQGE66Z8YJxrgF/AWikP3Jy67SmxtszRkyiWfw4aJFRV9r3MzffQ==
   dependencies:
-    "@vue/cli-shared-utils" "^3.12.1"
-    babel-eslint "^10.0.1"
-    eslint-loader "^2.1.2"
+    "@vue/cli-shared-utils" "^4.4.6"
+    eslint-loader "^2.2.1"
     globby "^9.2.0"
+    inquirer "^7.1.0"
     webpack "^4.0.0"
     yorkie "^2.0.0"
-  optionalDependencies:
-    eslint "^4.19.1"
-    eslint-plugin-vue "^4.7.1"
 
 "@vue/cli-plugin-router@^4.4.6":
   version "4.4.6"
@@ -1351,24 +1394,6 @@
     webpack-dev-server "^3.11.0"
     webpack-merge "^4.2.2"
 
-"@vue/cli-shared-utils@^3.12.1":
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.12.1.tgz#bcf076287ddadeebbb97c6a748dfe9ff50ec8df0"
-  integrity sha512-jFblzRFjutGwu5utOKdVlPlsbA1lBUNNQlAThzNqej+JtTKJjnvjlhjKX0Gq0oOny5FjKWhoyfQ74p9h1qE6JQ==
-  dependencies:
-    "@hapi/joi" "^15.0.1"
-    chalk "^2.4.1"
-    execa "^1.0.0"
-    launch-editor "^2.2.1"
-    lru-cache "^5.1.1"
-    node-ipc "^9.1.1"
-    open "^6.3.0"
-    ora "^3.4.0"
-    request "^2.87.0"
-    request-promise-native "^1.0.7"
-    semver "^6.0.0"
-    string.prototype.padstart "^3.0.0"
-
 "@vue/cli-shared-utils@^4.4.6":
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz#0ec59880920736c6dd79079ac0b5ceac29fa55e1"
@@ -1583,14 +1608,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-
-acorn-jsx@^5.0.0, acorn-jsx@^5.2.0:
+acorn-jsx@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
@@ -1600,17 +1618,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.5.0:
-  version "5.7.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-
-acorn@^6.0.2, acorn@^6.0.7, acorn@^6.4.1:
+acorn@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
@@ -1645,27 +1653,12 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
-
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957"
   integrity sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==
 
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
   version "6.12.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
   integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
@@ -1695,6 +1688,13 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -1916,16 +1916,7 @@ axios@^0.19.0:
   dependencies:
     follow-redirects "1.5.10"
 
-babel-code-frame@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-eslint@^10.0.1:
+babel-eslint@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
   integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
@@ -1944,7 +1935,7 @@ babel-extract-comments@^1.0.0:
   dependencies:
     babylon "^6.18.0"
 
-babel-loader@^8.0.5:
+babel-loader@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
   integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
@@ -1955,24 +1946,13 @@ babel-loader@^8.0.5:
     pify "^4.0.1"
     schema-utils "^2.6.5"
 
-babel-plugin-dynamic-import-node@^2.2.0, babel-plugin-dynamic-import-node@^2.3.3:
+babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
   integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-module-resolver@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
-  integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
-  dependencies:
-    find-babel-config "^1.1.0"
-    glob "^7.1.2"
-    pkg-up "^2.0.0"
-    reselect "^3.0.1"
-    resolve "^1.4.0"
-
 babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
@@ -2243,7 +2223,7 @@ browserslist-ga@0.0.12:
     opener "^1.5.1"
     portfinder "^1.0.25"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.3.4, browserslist@^4.8.5:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
   version "4.13.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d"
   integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==
@@ -2396,13 +2376,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -2410,11 +2383,6 @@ caller-path@^2.0.0:
   dependencies:
     caller-callsite "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -2496,7 +2464,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -2583,11 +2551,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2617,6 +2580,13 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-highlight@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.4.tgz#098cb642cf17f42adc1c1145e07f960ec4d7522b"
@@ -2649,6 +2619,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 clipboard-polyfill@^2.8.6:
   version "2.8.6"
   resolved "https://registry.yarnpkg.com/clipboard-polyfill/-/clipboard-polyfill-2.8.6.tgz#19d27283f11f2933bb18737263b98b8c95b5a0f7"
@@ -2704,11 +2679,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 coa@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@@ -2873,7 +2843,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2979,7 +2949,7 @@ copy-webpack-plugin@^5.1.1:
     serialize-javascript "^2.1.2"
     webpack-log "^2.0.0"
 
-core-js-compat@^3.6.2:
+core-js-compat@^3.6.2, core-js-compat@^3.6.5:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
   integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
@@ -2987,7 +2957,7 @@ core-js-compat@^3.6.2:
     browserslist "^4.8.5"
     semver "7.0.0"
 
-core-js@^2.4.0, core-js@^2.6.5:
+core-js@^2.4.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -3054,7 +3024,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
@@ -3562,13 +3532,6 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -3758,6 +3721,15 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
+enhanced-resolve@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -3842,7 +3814,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-loader@^2.1.2:
+eslint-loader@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337"
   integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==
@@ -3853,20 +3825,6 @@ eslint-loader@^2.1.2:
     object-hash "^1.1.4"
     rimraf "^2.6.1"
 
-eslint-plugin-vue@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
-  integrity sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==
-  dependencies:
-    vue-eslint-parser "^2.0.3"
-
-eslint-plugin-vue@^5.0.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961"
-  integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==
-  dependencies:
-    vue-eslint-parser "^5.0.0"
-
 eslint-plugin-vue@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe"
@@ -3884,15 +3842,7 @@ eslint-plugin-vuetify@^1.0.0-beta.5:
     eslint-plugin-vue "^6.2.2"
     requireindex "^1.2.0"
 
-eslint-scope@^3.7.1:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
-  integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
   integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
@@ -3908,7 +3858,7 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
+eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
@@ -3920,124 +3870,55 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  integrity sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
-eslint@^5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+eslint@^6.7.2:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
+    ajv "^6.10.0"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
     esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.11"
+    lodash "^4.17.14"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
+    optionator "^0.8.3"
     progress "^2.0.0"
     regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
     table "^5.2.3"
     text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
 
 esm@^3.2.13:
   version "3.2.25"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^3.5.2, espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
-espree@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
-  integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
-  dependencies:
-    acorn "^6.0.2"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
-
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
-  dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
-
-espree@^6.2.1:
+espree@^6.1.2, espree@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
   integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
@@ -4051,7 +3932,7 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.0, esquery@^1.0.1:
+esquery@^1.0.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
   integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
@@ -4295,11 +4176,6 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4358,13 +4234,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
+    escape-string-regexp "^1.0.5"
 
 file-entry-cache@^5.0.1:
   version "5.0.1"
@@ -4421,14 +4296,6 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
-  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
-
 find-cache-dir@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
@@ -4516,16 +4383,6 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -4751,7 +4608,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -4803,6 +4660,13 @@ global-modules@^1.0.0:
     is-windows "^1.0.1"
     resolve-dir "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
@@ -4814,11 +4678,27 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -5280,7 +5160,7 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore@^3.3.3, ignore@^3.3.5:
+ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
@@ -5371,7 +5251,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4:
+ini@^1.3.4, ini@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -5408,7 +5288,7 @@ inquirer@6.5.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^3.0.6, inquirer@^3.3.0:
+inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
@@ -5447,23 +5327,23 @@ inquirer@^5.2.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-inquirer@^6.2.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+inquirer@^7.0.0, inquirer@^7.1.0:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
     through "^2.3.6"
 
 internal-ip@^4.3.0:
@@ -5474,7 +5354,7 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0:
+interpret@^1.0.0, interpret@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
@@ -5884,11 +5764,6 @@ js-cookie@^2.2.1:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
   integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
 
-js-levenshtein@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
-
 js-message@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15"
@@ -5906,11 +5781,6 @@ js-queue@2.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
 js-yaml-loader@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz#2c15f93915617acd19676d648945fa3003f8629b"
@@ -5920,7 +5790,7 @@ js-yaml-loader@^1.2.2:
     loader-utils "^1.2.3"
     un-eval "^1.2.0"
 
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1:
+js-yaml@^3.13.1:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
   integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -5955,11 +5825,6 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5985,7 +5850,7 @@ json3@^3.3.2:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
@@ -6234,7 +6099,7 @@ lodash@4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -6494,7 +6359,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6610,6 +6475,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 mz@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -6950,7 +6820,7 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optionator@^0.8.2:
+optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -7312,13 +7182,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 please-upgrade-node@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
@@ -7326,11 +7189,6 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
 pnp-webpack-plugin@^1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
@@ -7983,11 +7841,6 @@ regexp.prototype.flags@^1.2.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-  integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -8048,23 +7901,7 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
-  dependencies:
-    lodash "^4.17.15"
-
-request-promise-native@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
-  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
-  dependencies:
-    request-promise-core "1.1.3"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.87.0, request@^2.88.2:
+request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8105,14 +7942,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requireindex@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
@@ -8123,11 +7952,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-reselect@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -8143,11 +7967,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -8175,7 +7994,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -8190,6 +8009,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -8215,7 +8042,7 @@ right-pad@^1.0.1:
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
   integrity sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=
 
-rimraf@2.6.3, rimraf@~2.6.2:
+rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -8279,7 +8106,7 @@ rollup@^1.31.1:
     "@types/node" "*"
     acorn "^7.1.0"
 
-run-async@^2.2.0:
+run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -8310,7 +8137,7 @@ rxjs@^5.5.2:
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^6.4.0:
+rxjs@^6.4.0, rxjs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
   integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
@@ -8402,7 +8229,7 @@ semver-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
   integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8412,7 +8239,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8591,13 +8418,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -8828,11 +8648,6 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -8905,14 +8720,6 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.padstart@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz#b47c087540d0710be5a49375751a0a627bd4ff90"
-  integrity sha512-envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
 string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -9020,10 +8827,10 @@ strip-json-comments@3.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+strip-json-comments@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 stylehacks@^4.0.0:
   version "4.0.3"
@@ -9112,18 +8919,6 @@ symbol-observable@1.0.1:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
   integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
 table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -9192,7 +8987,7 @@ terser@^4.1.2, terser@^4.6.12, terser@^4.6.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -9309,7 +9104,7 @@ toposort@^1.0.0:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
   integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -9356,6 +9151,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
@@ -9366,6 +9166,11 @@ type-fest@^0.6.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -9600,6 +9405,11 @@ uuid@^8.2.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
   integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
 
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -9659,30 +9469,6 @@ vue-cli-plugin-vuetify@^2.0.5:
     semver "^7.1.2"
     shelljs "^0.8.3"
 
-vue-eslint-parser@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
-  integrity sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==
-  dependencies:
-    debug "^3.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
-    esquery "^1.0.0"
-    lodash "^4.17.4"
-
-vue-eslint-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"
-  integrity sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==
-  dependencies:
-    debug "^4.1.0"
-    eslint-scope "^4.0.0"
-    eslint-visitor-keys "^1.0.0"
-    espree "^4.1.0"
-    esquery "^1.0.1"
-    lodash "^4.17.11"
-
 vue-eslint-parser@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz#9cdbcc823e656b087507a1911732b867ac101e83"
@@ -9844,6 +9630,23 @@ webpack-chain@^6.4.0:
     deepmerge "^1.5.2"
     javascript-stringify "^2.0.1"
 
+webpack-cli@^3.3.12:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
+  integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
+  dependencies:
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.1"
+    findup-sync "^3.0.0"
+    global-modules "^2.0.0"
+    import-local "^2.0.0"
+    interpret "^1.4.0"
+    loader-utils "^1.4.0"
+    supports-color "^6.1.0"
+    v8-compile-cache "^2.1.1"
+    yargs "^13.3.2"
+
 webpack-dev-middleware@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
@@ -9982,7 +9785,7 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@^1.2.14, which@^1.2.9:
+which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10199,13 +10002,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^6.0.0, ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"

From 33173165623646f54a24f12dec4d98236fd003b7 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Sat, 25 Jul 2020 23:57:53 +0800
Subject: [PATCH 02/19] style(validator): unified usage of `has key in object`
 validation

---
 src/components/stats/DataTable.vue     | 3 ++-
 src/components/stats/StageSelector.vue | 3 ++-
 src/views/About/Changelog.vue          | 7 +++++++
 src/views/Report.vue                   | 9 ++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/stats/DataTable.vue b/src/components/stats/DataTable.vue
index 82bf97a4..29171668 100644
--- a/src/components/stats/DataTable.vue
+++ b/src/components/stats/DataTable.vue
@@ -395,6 +395,7 @@
   import Mirror from "@/mixins/Mirror";
   import TitledRow from "@/components/global/TitledRow";
   import existUtils from "@/utils/existUtils";
+  import validator from "@/utils/validator";
 
   export default {
     name: "DataTable",
@@ -564,7 +565,7 @@
             }
           }
         } else {
-          if (this.trends && props.item.stage.stageId in this.trends) {
+          if (this.trends && validator.have(this.trends, props.item.stage.stageId)) {
             return this.trends[props.item.stage.stageId]
           }
         }
diff --git a/src/components/stats/StageSelector.vue b/src/components/stats/StageSelector.vue
index 212e5d9b..552e0c66 100644
--- a/src/components/stats/StageSelector.vue
+++ b/src/components/stats/StageSelector.vue
@@ -201,6 +201,7 @@
   import {mapGetters} from "vuex";
   import CDN from "@/mixins/CDN";
   import existUtils from "@/utils/existUtils";
+  import validator from "@/utils/validator";
 
   export default {
     name: "StageSelector",
@@ -357,7 +358,7 @@
               })
             } else {
               zones = zones.map(el => {
-                if (el.zoneId in this.stageImages) {
+                if (validator.have(this.stageImages, el.zoneId)) {
                   return {
                     ...el,
                     image: this.stageImages[el.zoneId]
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index 4a075912..c8724f88 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -149,6 +149,13 @@ export default {
           changes: [
             "修复：Planner FAB 与标签层级细节问题",
             "优化：Planner 数据重置支持重置部分数据",
+          ],
+          hotfix: [
+            "修复：找回登录信息页面弹窗点击「关闭」按钮无反应的问题",
+            "优化：部分文案",
+            "优化：「正在加载」提示将优先使用用户设定的语言",
+            "内部优化：统一验证器引用",
+            "内部优化：升级若干依赖项"
           ]
         },
         {
diff --git a/src/views/Report.vue b/src/views/Report.vue
index 964f821a..7f6787b9 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -613,6 +613,7 @@ import Subheader from "@/components/global/Subheader";
 import Theme from "@/mixins/Theme";
 import ItemIcon from "@/components/global/ItemIcon";
 import config from "@/config";
+import validator from "@/utils/validator";
 
 // colors: [dark, light]
 const categories = [
@@ -744,7 +745,13 @@ export default {
         for (const itemDropInfo of this.dropInfos.item.filter(v => v["dropType"] === category)) {
           const dropType = itemDropInfo["dropType"]
           if (dropType === "FURNITURE") continue
-          if (!(dropType in items)) this.$set(items, dropType , [])
+          if (
+            !(
+              validator.have(items, dropType)
+            )
+          ) {
+            this.$set(items, dropType , [])
+          }
 
           categoryDrops.push(itemDropInfo)
         }

From 7f1357b6d5d76ff5d1b9855e1be57efcab0a4919 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Sun, 26 Jul 2020 00:22:15 +0800
Subject: [PATCH 03/19] improvement(changelog): add changelog entries

---
 src/locales/en.yml            | 6 +++---
 src/views/About/Changelog.vue | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/locales/en.yml b/src/locales/en.yml
index 1cdf19da..204f4c9a 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -296,13 +296,13 @@ planner:
       options:
         options:
           name: Planning Options
-          indicator: Will Reset all Options
+          indicator: Will reset all Options
         excludes:
           name: Exclude Stages
-          indicator: Will Reset all Excludes
+          indicator: Will reset all Excludes
         items:
           name: Item Data
-          indicator: Will Reset all Item Data
+          indicator: Will reset all Item Data
   actions:
     _name: Data
     import: Import
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index c8724f88..6cad34ad 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -143,10 +143,12 @@ export default {
           ]
         },
         {
-          future: true,
+          active: true,
           version: "v3.3.1",
-          date: "2020-07-31T08:00:00Z",
+          date: "2020-07-23T18:00:00Z",
           changes: [
+            "添加：PenguinID 找回功能（仅支持对 v3.3.1 及之后所登录的 PenguinID 进行找回）",
+
             "修复：Planner FAB 与标签层级细节问题",
             "优化：Planner 数据重置支持重置部分数据",
           ],

From 2b98874d278fcaa998c62c2757abf51d67f6116d Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Mon, 27 Jul 2020 18:00:35 +0800
Subject: [PATCH 04/19] improvement(sentry): add tracing options

---
 src/injections/sentry.js      | 7 ++-----
 src/views/About/Changelog.vue | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/injections/sentry.js b/src/injections/sentry.js
index 8e0bc0d1..d4097a2f 100644
--- a/src/injections/sentry.js
+++ b/src/injections/sentry.js
@@ -11,7 +11,8 @@ if (environment.production) {
     integrations: [
       new Integrations.Vue({
         Vue,
-        attachProps: true
+        attachProps: true,
+        tracing: true
       }),
       new ApmIntegrations.Tracing(),
     ],
@@ -42,12 +43,8 @@ if (environment.production) {
       //// END
 
       //// Those are our customized ones
-      // "QuotaExceededError",
       "vivoNewsDetailPage",
-      "Request aborted",
-      "Cannot read property 'style' of null",
       "removeAD",
-      "querySelectorAll"
     ],
     ignoreUrls: [
       // Facebook flakiness
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index 6cad34ad..e02fb043 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -124,7 +124,6 @@ export default {
           version: "v3.5.0",
           date: "2020-08-31T08:00:00Z",
           changes: [
-            "将添加：旧 PenguinID 找回功能",
             "将添加：社交平台账户功能",
 
             "将内部优化：错误信息报错统一化",

From cf4d9885b97f0c36e496f565357bc277ad7a2b2c Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Tue, 28 Jul 2020 15:54:13 +0800
Subject: [PATCH 05/19] feat(previewcard): add preview card for item stats

---
 src/components/drawer/Logo.vue             |  2 +-
 src/components/global/Footer.vue           |  2 +-
 src/components/global/Item.vue             | 10 ++-
 src/components/global/ItemIcon.vue         |  2 +-
 src/components/global/RandomBackground.vue |  4 +-
 src/components/stats/Charts.vue            |  2 +-
 src/components/stats/DataTable.vue         | 12 ++-
 src/components/stats/PreviewItemCard.vue   | 94 ++++++++++++++++++++++
 src/components/stats/StageSelector.vue     | 36 ++++-----
 src/mixins/CDN.js                          |  8 +-
 src/mixins/hooks/RandomizedLogo.js         |  2 +-
 src/styles/global.css                      |  3 +
 src/utils/getters.js                       | 28 ++++++-
 src/views/About/Intro.vue                  |  2 +-
 src/views/About/Members.vue                |  2 +-
 src/views/Report.vue                       |  5 +-
 16 files changed, 174 insertions(+), 40 deletions(-)
 create mode 100644 src/components/stats/PreviewItemCard.vue

diff --git a/src/components/drawer/Logo.vue b/src/components/drawer/Logo.vue
index b4410a17..d024a187 100644
--- a/src/components/drawer/Logo.vue
+++ b/src/components/drawer/Logo.vue
@@ -8,7 +8,7 @@
     }"
   >
     <v-img
-      :src="cdnResource('/logos/penguin_stats_logo.png')"
+      :src="cdnDeliver('/logos/penguin_stats_logo.png')"
       aspect-ratio="1"
       height="192px"
       contain
diff --git a/src/components/global/Footer.vue b/src/components/global/Footer.vue
index 29d1c6d4..e9de48bf 100644
--- a/src/components/global/Footer.vue
+++ b/src/components/global/Footer.vue
@@ -45,7 +45,7 @@
           <v-img
             style="transform: translateY(.275em)"
             alt="公安网备案图标"
-            :src="cdnResource('/logos/gonganwang.png')"
+            :src="cdnDeliver('/logos/gonganwang.png')"
             class="d-inline-block"
             height="12"
             width="12"
diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index 95caacc6..548c3a47 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -6,6 +6,7 @@
     :nudge-top="tooltipNudge"
 
     bottom
+    content-class="transparent o-100"
   >
     <template v-slot:activator="{ on, attrs }">
       <span
@@ -20,7 +21,11 @@
         />
       </span>
     </template>
-    <span class="force-lang-font">{{ name }}</span>
+    <!--    <span class="force-lang-font">{{ name }}</span>-->
+    <PreviewItemCard
+      :item-id="item.itemId"
+      :tooltip-nudge="5"
+    />
   </v-tooltip>
   <ItemIcon
     v-else-if="disableTooltip"
@@ -34,9 +39,10 @@
 <script>
   import ItemIcon from "@/components/global/ItemIcon";
   import strings from "@/utils/strings";
+  import PreviewItemCard from "@/components/stats/PreviewItemCard";
   export default {
     name: "Item",
-    components: {ItemIcon},
+    components: {PreviewItemCard, ItemIcon},
     props: {
       item: {
         type: Object,
diff --git a/src/components/global/ItemIcon.vue b/src/components/global/ItemIcon.vue
index 3a946c29..6a7fe18b 100644
--- a/src/components/global/ItemIcon.vue
+++ b/src/components/global/ItemIcon.vue
@@ -75,7 +75,7 @@ export default {
         height: `${this.ratio * this.originalIconSize}px`,
         width: `${this.ratio * this.originalIconSize}px`,
         backgroundSize: `${this.ratio * this.originalSpriteDimensions.x}px ${this.ratio * this.originalSpriteDimensions.y}px`,
-        backgroundImage: `url(${this.cdnResource('/sprite/sprite.202005140304.png')})`
+        backgroundImage: `url(${this.cdnDeliver('/sprite/sprite.202005140304.png')})`
       };
       if (this.item.spriteCoord) {
         style["backgroundPosition"] = this.transformCoordinate(this.item.spriteCoord)
diff --git a/src/components/global/RandomBackground.vue b/src/components/global/RandomBackground.vue
index 8122df4a..73b8dc24 100644
--- a/src/components/global/RandomBackground.vue
+++ b/src/components/global/RandomBackground.vue
@@ -72,7 +72,7 @@
     },
     methods: {
       getImageUrl (id) {
-        return this.cdnResource(`/backgrounds/${id}.${this.webpSupport ? 'webp' : 'optimized.png'}`)
+        return this.cdnDeliver(`/backgrounds/${id}.${this.webpSupport ? 'webp' : 'optimized.png'}`)
       },
       setBlur (flag) {
         Console.info("RandomBackground", "setting blur to", flag)
@@ -132,7 +132,7 @@
         if (this.isSpecialUrl(to)) {
           // yes we do have a special image for the CURRENT path. APPLY IT!
           const imageUrl = this.specialImageMap[to.params.stageId]
-          this.updateBackgroundByUrl(this.cdnResource(imageUrl))
+          this.updateBackgroundByUrl(this.cdnDeliver(imageUrl))
         } else if (this.isSpecialUrl(from)) {
           // we do not have a special image for the current path but we DO have a special image for the PREVIOUS path.
           // we need to restore the last background image
diff --git a/src/components/stats/Charts.vue b/src/components/stats/Charts.vue
index 402ec4c5..48a0329d 100644
--- a/src/components/stats/Charts.vue
+++ b/src/components/stats/Charts.vue
@@ -340,7 +340,7 @@ export default {
             style: {
               color: theme.text
             },
-            crosshairs: true,
+            crosshairs: [true, true]
           },
 
           credits: {
diff --git a/src/components/stats/DataTable.vue b/src/components/stats/DataTable.vue
index 29171668..8c7de890 100644
--- a/src/components/stats/DataTable.vue
+++ b/src/components/stats/DataTable.vue
@@ -276,9 +276,14 @@
               >
                 <v-icon>{{ props.item.zone.icon }}</v-icon>
                 <span
-                  class="ml-2"
+                  class="d-flex flex-column ml-2"
                 >
-                  {{ strings.translate(props.item.stage, "code") }}
+                  <span class="overline">
+                    {{ getZoneName(props.item.stage) }}
+                  </span>
+                  <span>
+                    {{ strings.translate(props.item.stage, "code") }}
+                  </span>
                 </span>
                 <v-icon
                   x-small
@@ -618,6 +623,9 @@
       },
       invalidApCost (apCost) {
         return apCost === 99 || apCost === null
+      },
+      getZoneName (stage) {
+        return strings.translate(get.zones.byZoneId(stage.zoneId), "zoneName")
       }
     },
   }
diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
new file mode 100644
index 00000000..736e9c85
--- /dev/null
+++ b/src/components/stats/PreviewItemCard.vue
@@ -0,0 +1,94 @@
+<template>
+  <v-card color="background">
+    <v-card-title class="pb-0">
+      <ItemIcon
+        :item="item"
+        :ratio="0.5"
+      />
+      <span class="title ml-2">
+        {{ item.name }}
+      </span>
+    </v-card-title>
+    <v-card-text>
+      <v-subheader class="ma-0 pa-0">
+        数据速览
+      </v-subheader>
+      <v-simple-table dense>
+        <table>
+          <thead>
+            <tr>
+              <th>
+                {{ $t('stats.headers.stage') }}
+              </th>
+              <th>
+                统计数据
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
+              v-for="stat in stats.data"
+              :key="stat.stageId"
+            >
+              <td>
+                {{ stat.stage.code }}
+              </td>
+              <td>
+                {{ stat.percentageText }}
+              </td>
+            </tr>
+            <tr
+              v-if="stats.more"
+              style="background: inherit !important;"
+            >
+              <td
+                colspan="2"
+                class="text-center"
+              >
+                <v-icon color="grey">
+                  mdi-dots-horizontal
+                </v-icon>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </v-simple-table>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script>
+  import get from '@/utils/getters'
+  import ItemIcon from "@/components/global/ItemIcon";
+
+  const pagination = 5;
+
+  export default {
+    name: "PreviewItemCard",
+    components: {ItemIcon},
+    props: {
+      itemId: {
+        type: String,
+        required: true
+      },
+    },
+    computed: {
+      item() {
+        return get.items.byItemId(this.itemId)
+      },
+      stats () {
+        const data = get.statistics.byItemId(this.itemId)
+        return {
+          data: data
+            .sort((a, b) => b.percentage - a.percentage)
+            .slice(0, pagination),
+          more: data.length > pagination
+        }
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/stats/StageSelector.vue b/src/components/stats/StageSelector.vue
index 552e0c66..36a8870b 100644
--- a/src/components/stats/StageSelector.vue
+++ b/src/components/stats/StageSelector.vue
@@ -236,24 +236,24 @@
           stage: null
         },
         stageImages: {
-          "act5d0_zone1": this.cdnResource('/backgrounds/zones/act5d0_zone1.jpg'),
-          "act6d5_zone1": this.cdnResource('/backgrounds/zones/act6d5_zone1.jpg'),
-          "act7d5_zone1": this.cdnResource('/backgrounds/zones/act7d5_zone1.jpg'),
-          "act9d0_zone1": this.cdnResource('/backgrounds/zones/act9d0_zone1.jpg'),
-          "act10d5_zone1": this.cdnResource('/backgrounds/zones/act10d5_zone1.jpg'),
-          "act11d0_zone1": this.cdnResource('/backgrounds/zones/act11d0_zone1.jpg'),
-          "1stact_zone1": this.cdnResource('/backgrounds/zones/A001_zone1.jpg'),
-          "act3d0_zone1": this.cdnResource('/backgrounds/zones/A003_zone1.jpg'),
-          "act4d0_zone1": this.cdnResource('/backgrounds/zones/main_e0.jpg'),
-          "main_0": this.cdnResource('/backgrounds/zones/main_0.jpg'),
-          "main_1": this.cdnResource('/backgrounds/zones/main_1.jpg'),
-          "main_2": this.cdnResource('/backgrounds/zones/main_2.jpg'),
-          "main_3": this.cdnResource('/backgrounds/zones/main_3.jpg'),
-          "main_4": this.cdnResource('/backgrounds/zones/main_4.jpg'),
-          "main_5": this.cdnResource('/backgrounds/zones/main_5.jpg'),
-          "main_6": this.cdnResource('/backgrounds/zones/main_6.jpg'),
-          "main_7": this.cdnResource('/backgrounds/zones/main_7.jpg'),
-          "gachabox": this.cdnResource('/backgrounds/zones/gachabox.jpg'),
+          "act5d0_zone1": this.cdnDeliver('/backgrounds/zones/act5d0_zone1.jpg'),
+          "act6d5_zone1": this.cdnDeliver('/backgrounds/zones/act6d5_zone1.jpg'),
+          "act7d5_zone1": this.cdnDeliver('/backgrounds/zones/act7d5_zone1.jpg'),
+          "act9d0_zone1": this.cdnDeliver('/backgrounds/zones/act9d0_zone1.jpg'),
+          "act10d5_zone1": this.cdnDeliver('/backgrounds/zones/act10d5_zone1.jpg'),
+          "act11d0_zone1": this.cdnDeliver('/backgrounds/zones/act11d0_zone1.jpg'),
+          "1stact_zone1": this.cdnDeliver('/backgrounds/zones/A001_zone1.jpg'),
+          "act3d0_zone1": this.cdnDeliver('/backgrounds/zones/A003_zone1.jpg'),
+          "act4d0_zone1": this.cdnDeliver('/backgrounds/zones/main_e0.jpg'),
+          "main_0": this.cdnDeliver('/backgrounds/zones/main_0.jpg'),
+          "main_1": this.cdnDeliver('/backgrounds/zones/main_1.jpg'),
+          "main_2": this.cdnDeliver('/backgrounds/zones/main_2.jpg'),
+          "main_3": this.cdnDeliver('/backgrounds/zones/main_3.jpg'),
+          "main_4": this.cdnDeliver('/backgrounds/zones/main_4.jpg'),
+          "main_5": this.cdnDeliver('/backgrounds/zones/main_5.jpg'),
+          "main_6": this.cdnDeliver('/backgrounds/zones/main_6.jpg'),
+          "main_7": this.cdnDeliver('/backgrounds/zones/main_7.jpg'),
+          "gachabox": this.cdnDeliver('/backgrounds/zones/gachabox.jpg'),
         }
       }
     },
diff --git a/src/mixins/CDN.js b/src/mixins/CDN.js
index c0ba2343..b43e81a6 100644
--- a/src/mixins/CDN.js
+++ b/src/mixins/CDN.js
@@ -3,11 +3,11 @@ import mirror from "@/utils/mirror";
 
 export default {
   methods: {
-    cdnResource (path) {
-      if (mirror.cn.isCurrent()) {
-        return config.cdn.cn + path
-      } else {
+    cdnDeliver (path) {
+      if (mirror.global.isCurrent()) {
         return config.cdn.global + path
+      } else {
+        return config.cdn.cn + path
       }
     }
   },
diff --git a/src/mixins/hooks/RandomizedLogo.js b/src/mixins/hooks/RandomizedLogo.js
index 1537e78a..ab7e1f96 100644
--- a/src/mixins/hooks/RandomizedLogo.js
+++ b/src/mixins/hooks/RandomizedLogo.js
@@ -18,7 +18,7 @@ export default {
       const random = Math.random();
       const self = this;
       function imageUrl (character) {
-        return self.cdnResource(`/logos/penguin_stats_logo_${character}.png`)
+        return self.cdnDeliver(`/logos/penguin_stats_logo_${character}.png`)
       }
       this.randomizedLogo = random < .25 ? imageUrl("exia")
         : random < .5 ? imageUrl("texas")
diff --git a/src/styles/global.css b/src/styles/global.css
index 13565bc5..04277284 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -535,3 +535,6 @@
     background: rgb(240, 240, 240) !important;
 }
 
+.o-100 {
+    opacity: 1;
+}
diff --git a/src/utils/getters.js b/src/utils/getters.js
index b719daaf..42d4ea0e 100644
--- a/src/utils/getters.js
+++ b/src/utils/getters.js
@@ -3,6 +3,23 @@ import formatter from "@/utils/timeFormatter";
 import existUtils from "@/utils/existUtils";
 // import Console from "@/utils/Console";
 
+function memorized(func, ctx) {
+  const memo = {};
+  const slice = Array.prototype.slice;
+
+  return function() {
+    const args = slice.call(arguments);
+
+    if (args in memo) {
+      console.log("serving cached copy ", memo[args])
+      return memo[args];
+    } else {
+      console.log("saving NON cached copy ", args)
+      return (memo[args] = func.apply(ctx, args));
+    }
+  }
+}
+
 const Getters = {};
 
 Getters.items = {
@@ -93,11 +110,16 @@ Getters.statistics = {
         item: Getters.items.byItemId(el.itemId)
       }
     });
-  },
+  }
+}
+
+Getters.cachedStatistics = {
+  byItemId: memorized(Getters.statistics.byItemId, Getters.statistics),
+  byStageId: memorized(Getters.statistics.byStageId, Getters.statistics)
 }
 
 Getters.stages = {
-  all(filter = true) {
+  all(filter = false) {
     let stages;
     if (filter) {
       stages = store.getters["data/content"]({id: "stages"})
@@ -121,7 +143,7 @@ Getters.stages = {
 }
 
 Getters.zones = {
-  all(filter = true) {
+  all(filter = false) {
     let zones = store.getters["data/content"]({id: "zones"})
     if (!zones) return []
 
diff --git a/src/views/About/Intro.vue b/src/views/About/Intro.vue
index 8ef091b1..2c7bab2d 100644
--- a/src/views/About/Intro.vue
+++ b/src/views/About/Intro.vue
@@ -45,7 +45,7 @@
         style="word-break:normal"
       >
         <v-img
-          :src="cdnResource('/logos/penguin_stats_logo.png')"
+          :src="cdnDeliver('/logos/penguin_stats_logo.png')"
           aspect-ratio="1"
           height="128px"
           width="128px"
diff --git a/src/views/About/Members.vue b/src/views/About/Members.vue
index 1d0a33b2..0f68c8f8 100644
--- a/src/views/About/Members.vue
+++ b/src/views/About/Members.vue
@@ -472,7 +472,7 @@
         return translated.join(this.$t('meta.separator'))
       },
       avatar(src) {
-        return this.cdnResource(`/avatars/${src}`)
+        return this.cdnDeliver(`/avatars/${src}`)
       }
     }
   }
diff --git a/src/views/Report.vue b/src/views/Report.vue
index 7f6787b9..0b038302 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -614,6 +614,7 @@ import Theme from "@/mixins/Theme";
 import ItemIcon from "@/components/global/ItemIcon";
 import config from "@/config";
 import validator from "@/utils/validator";
+import existUtils from "@/utils/existUtils";
 
 // colors: [dark, light]
 const categories = [
@@ -916,11 +917,11 @@ export default {
     invalidStage () {
       if (this.selected.zone && this.selected.stage) {
         const zone = get.zones.byZoneId(this.selected.zone);
-        if (!zone || !zone.zoneId) return "INVALID"
+        if (!existUtils.existence(zone, true)) return "INVALID"
         if (zone.isOutdated) return "EXPIRED"
 
         const stage = get.stages.byStageId(this.selected.stage);
-        if (!stage || !stage.stageId) return "INVALID"
+        if (!existUtils.existence(stage, true)) return "INVALID"
       } else {
         return "INVALID"
       }

From b57b1da02310d043f2f392caa556f271332b3d17 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Tue, 28 Jul 2020 16:33:11 +0800
Subject: [PATCH 06/19] improvement(previewcard): add previewcard to byStage
 statistics

---
 src/components/global/Item.vue           | 49 +++++++++++++++---------
 src/components/stats/DataTable.vue       |  7 ++--
 src/components/stats/PreviewItemCard.vue |  9 +++--
 src/styles/global.css                    | 10 +++--
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index 548c3a47..341219eb 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -1,23 +1,24 @@
 <template>
   <v-tooltip
     v-if="!disableTooltip"
-    transition="slide-y-transition"
-    :open-delay="5"
-    :nudge-top="tooltipNudge"
+    :open-delay="2"
 
-    bottom
-    content-class="transparent o-100"
+    :right="right"
+    :bottom="bottom"
+    v-bind="tooltipOptions"
+    content-class="transparent o-100 backdrop-blur pa-0"
   >
-    <template v-slot:activator="{ on, attrs }">
+    <template v-slot:activator="{ on }">
       <span
-        v-bind="attrs"
+        class="d-flex align-center"
         v-on="on"
       >
         <ItemIcon
           :item="item"
           :ratio="ratio"
-          :class="{'sticky-left': sticky === 'left'}"
+          :class="contentClass"
           :disable-tooltip="disableTooltip"
+          v-on="on"
         />
       </span>
     </template>
@@ -60,22 +61,28 @@
           return false;
         }
       },
-      disableLink: {
+      tooltipNudge: {
+        type: Number,
+        default () {
+          return 0
+        }
+      },
+      right: {
         type: Boolean,
-        default() {
-          return false;
+        default () {
+          return false
         }
       },
-      tooltipNudge: {
-        type: Number,
+      bottom: {
+        type: Boolean,
         default () {
-          return 10
+          return true
         }
       },
-      sticky: {
+      contentClass: {
         type: String,
         default () {
-          return "";
+          return ""
         }
       }
     },
@@ -87,6 +94,12 @@
     computed: {
       name() {
         return strings.translate(this.item, "name")
+      },
+      tooltipOptions () {
+        return {
+          [this.bottom ? 'nudgeTop' : 'nudgeLeft']: this.tooltipNudge,
+          transition: this.bottom ? "slide-y-transition" : "slide-x-transition"
+        }
       }
     },
   };
@@ -94,8 +107,6 @@
 
 <style scoped>
   .sticky-left {
-    position: -webkit-sticky;
-    position: sticky;
-    left: 0;
+    position: absolute;
   }
 </style>
diff --git a/src/components/stats/DataTable.vue b/src/components/stats/DataTable.vue
index 8c7de890..4559d5d9 100644
--- a/src/components/stats/DataTable.vue
+++ b/src/components/stats/DataTable.vue
@@ -239,10 +239,11 @@
                 <Item
                   :item="props.item.item"
                   :ratio="0.6"
-                  disable-tooltip
-                  disable-link
 
-                  class="item-icon"
+                  content-class="item-icon"
+                  right
+                  :bottom="false"
+                  :tooltip-nudge="-40"
                 />
                 <span
                   style="padding-left: 44px"
diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index 736e9c85..9d735176 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -1,6 +1,9 @@
 <template>
-  <v-card color="background">
-    <v-card-title class="pb-0">
+  <v-card
+    color="background"
+    elevation="6"
+  >
+    <v-card-title :class="{'pb-0': stats.data.length}">
       <ItemIcon
         :item="item"
         :ratio="0.5"
@@ -9,7 +12,7 @@
         {{ item.name }}
       </span>
     </v-card-title>
-    <v-card-text>
+    <v-card-text v-if="stats.data.length">
       <v-subheader class="ma-0 pa-0">
         数据速览
       </v-subheader>
diff --git a/src/styles/global.css b/src/styles/global.css
index 04277284..6d2eb6e7 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -473,8 +473,8 @@
 }
 
 .item-icon {
-    position: absolute;
-    z-index: 4
+    position: absolute !important;
+    z-index: 4 !important;
 }
 .item-icon.item-icon--special {
     position: absolute !important;
@@ -531,10 +531,14 @@
     position: relative !important;
 }
 
-.v-dialog .theme--light.v-list {
+.v-dialog .theme--light.v-list, .v-tooltip__content .theme--light.v-data-table {
     background: rgb(240, 240, 240) !important;
 }
 
 .o-100 {
     opacity: 1;
 }
+
+.backdrop-blur {
+    backdrop-filter: blur(5px);
+}
\ No newline at end of file

From 9c67974e2f10111d6508f9b9299d23e6783c8745 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Tue, 28 Jul 2020 17:37:03 +0800
Subject: [PATCH 07/19] improvement(datatable): add zonename to datatable

---
 src/components/global/Item.vue     |  1 -
 src/components/stats/DataTable.vue |  2 +-
 src/locales/en.yml                 |  2 +-
 src/locales/zh.yml                 |  2 +-
 src/utils/getters.js               | 20 +++++++-------------
 src/views/Report.vue               |  8 ++++----
 6 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index 341219eb..39e30c64 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -32,7 +32,6 @@
     v-else-if="disableTooltip"
     :item="item"
     :ratio="ratio"
-    :class="{'sticky-left': sticky === 'left'}"
     :disable-tooltip="disableTooltip"
   />
 </template>
diff --git a/src/components/stats/DataTable.vue b/src/components/stats/DataTable.vue
index 4559d5d9..f90b6881 100644
--- a/src/components/stats/DataTable.vue
+++ b/src/components/stats/DataTable.vue
@@ -626,7 +626,7 @@
         return apCost === 99 || apCost === null
       },
       getZoneName (stage) {
-        return strings.translate(get.zones.byZoneId(stage.zoneId), "zoneName")
+        return strings.translate(get.zones.byZoneId(stage.zoneId, false), "zoneName")
       }
     },
   }
diff --git a/src/locales/en.yml b/src/locales/en.yml
index 204f4c9a..6ef13e97 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -198,7 +198,7 @@ report:
   clear: Clear
   closedReason:
     INVALID: 'Stage Not Found: The stage does not exist in the server you have selected.'
-    EXPIRED: 'Stage Report Closed: This activity stage has already been closed.'
+    EXPIRED: 'Stage Report Closed: This activity stage has not yet been opened or has already been closed.'
   furniture: 'Furniture Drop: {state}'
   name: Report
   submit: Submit
diff --git a/src/locales/zh.yml b/src/locales/zh.yml
index 20939db9..16910931 100644
--- a/src/locales/zh.yml
+++ b/src/locales/zh.yml
@@ -187,7 +187,7 @@ report:
       not: "“{stage}” 内的物品数量应总计不为 {should}"
   clear: 清空
   closedReason:
-    EXPIRED: 关卡汇报已关闭：活动关卡已结束
+    EXPIRED: 不可进行关卡汇报：活动关卡暂未开启或已结束
     INVALID: 关卡不存在：此关卡未在所选服务器上提供
   furniture: 家具掉落：{state}
   name: 上报结果
diff --git a/src/utils/getters.js b/src/utils/getters.js
index 42d4ea0e..ce7e65c7 100644
--- a/src/utils/getters.js
+++ b/src/utils/getters.js
@@ -119,31 +119,25 @@ Getters.cachedStatistics = {
 }
 
 Getters.stages = {
-  all(filter = false) {
-    let stages;
-    if (filter) {
-      stages = store.getters["data/content"]({id: "stages"})
-    } else {
-      stages = store.getters["data/content"]({id: "stages", server: "CN"})
-    }
-
+  all() {
+    let stages = store.getters["data/content"]({id: "stages"});
     if (!stages) return []
     return stages
   },
-  byStageId(stageId, ...options) {
-    return this.all(...options).find(el => {
+  byStageId(stageId, options) {
+    return this.all(options).find(el => {
       return el.stageId === stageId
     }) || {}
   },
-  byParentZoneId(zoneId, ...options) {
-    return this.all(...options).filter(el => {
+  byParentZoneId(zoneId, options) {
+    return this.all(options).filter(el => {
       return el.zoneId === zoneId
     }) || {}
   },
 }
 
 Getters.zones = {
-  all(filter = false) {
+  all(filter = true) {
     let zones = store.getters["data/content"]({id: "zones"})
     if (!zones) return []
 
diff --git a/src/views/Report.vue b/src/views/Report.vue
index 0b038302..18229dbf 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -685,7 +685,7 @@ export default {
     },
     selectedZone () {
       if (!this.selected.zone) return {};
-      return get.zones.byZoneId(this.selected.zone);
+      return get.zones.byZoneId(this.selected.zone, false);
     },
     selectedStage () {
       if (!this.selected.stage) return {};
@@ -916,12 +916,12 @@ export default {
     },
     invalidStage () {
       if (this.selected.zone && this.selected.stage) {
-        const zone = get.zones.byZoneId(this.selected.zone);
-        if (!existUtils.existence(zone, true)) return "INVALID"
+        const zone = get.zones.byZoneId(this.selected.zone, false);
+        if (!zone || !zone.zoneId || !existUtils.existence(zone)) return "INVALID"
         if (zone.isOutdated) return "EXPIRED"
 
         const stage = get.stages.byStageId(this.selected.stage);
-        if (!existUtils.existence(stage, true)) return "INVALID"
+        if (!stage || !stage.stageId || !existUtils.existence(stage)) return "INVALID"
       } else {
         return "INVALID"
       }

From db5785eb0e6413d928c3a6485c1db1984f8e3989 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Wed, 29 Jul 2020 12:47:00 +0800
Subject: [PATCH 08/19] improvement(multiple): add i18n, add changelog, add
 icon to previewcard, remove cachedstatistics

---
 src/components/global/Item.vue           |  2 +-
 src/components/stats/PreviewItemCard.vue | 67 ++++++++++++++++++++----
 src/locales/en.yml                       |  2 +
 src/locales/zh.yml                       |  2 +
 src/styles/global.css                    |  1 +
 src/utils/getters.js                     | 22 --------
 src/views/About/Changelog.vue            | 11 ++++
 7 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index 39e30c64..60ec41fa 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -6,7 +6,7 @@
     :right="right"
     :bottom="bottom"
     v-bind="tooltipOptions"
-    content-class="transparent o-100 backdrop-blur pa-0"
+    content-class="transparent backdrop-blur o-100 pa-0"
   >
     <template v-slot:activator="{ on }">
       <span
diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index 9d735176..9c4c94cb 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card
     color="background"
-    elevation="6"
+    elevation="9"
   >
     <v-card-title :class="{'pb-0': stats.data.length}">
       <ItemIcon
@@ -14,7 +14,7 @@
     </v-card-title>
     <v-card-text v-if="stats.data.length">
       <v-subheader class="ma-0 pa-0">
-        数据速览
+        {{ $t('stats.preview.title') }}
       </v-subheader>
       <v-simple-table dense>
         <table>
@@ -23,8 +23,16 @@
               <th>
                 {{ $t('stats.headers.stage') }}
               </th>
+              <th class="font-weight-bold">
+                {{ $t('stats.headers.percentage') }}
+                <v-icon small>
+                  mdi-sort-descending
+                </v-icon>
+              </th>
               <th>
-                统计数据
+                {{ $t('stats.headers.quantity') }}
+                /
+                {{ $t('stats.headers.times') }}
               </th>
             </tr>
           </thead>
@@ -32,13 +40,33 @@
             <tr
               v-for="stat in stats.data"
               :key="stat.stageId"
+              class="monospace"
+              :class="{'orange--text font-weight-bold': highlight === stat.stageId}"
             >
-              <td>
-                {{ stat.stage.code }}
+              <td class="d-flex align-center">
+                <v-icon
+                  v-if="highlight === stat.stageId"
+                  color="orange"
+                  small
+                  class="mr-1"
+                >
+                  mdi-arrow-right-circle
+                </v-icon>
+                <v-icon
+                  :color="highlight === stat.stageId ? 'orange' : ''"
+                  small
+                  class="mr-1"
+                >
+                  {{ stat.zone.icon }}
+                </v-icon>
+                {{ stat.stageCode }}
               </td>
               <td>
                 {{ stat.percentageText }}
               </td>
+              <td>
+                {{ stat.quantity }} / {{ stat.times }}
+              </td>
             </tr>
             <tr
               v-if="stats.more"
@@ -63,6 +91,8 @@
 <script>
   import get from '@/utils/getters'
   import ItemIcon from "@/components/global/ItemIcon";
+  import existUtils from "@/utils/existUtils";
+  import strings from "@/utils/strings";
 
   const pagination = 5;
 
@@ -77,16 +107,35 @@
     },
     computed: {
       item() {
-        return get.items.byItemId(this.itemId)
+        const item = get.items.byItemId(this.itemId)
+        return {
+          ...item,
+          name: strings.translate(item, "name")
+        }
       },
       stats () {
         const data = get.statistics.byItemId(this.itemId)
+          // filter out stages that have too less samples
+          .filter(el => el.times > 100)
+          // only open stages
+          .filter(el => existUtils.existence(el, true))
+
+          .sort((a, b) => b.percentage - a.percentage)
+          .slice(0, pagination)
+          .map(el => {
+            return {
+              ...el,
+              stageCode: strings.translate(el.stage, "code")
+            }
+          })
+
         return {
-          data: data
-            .sort((a, b) => b.percentage - a.percentage)
-            .slice(0, pagination),
+          data,
           more: data.length > pagination
         }
+      },
+      highlight () {
+        return this.$route.params.stageId
       }
     },
   }
diff --git a/src/locales/en.yml b/src/locales/en.yml
index 6ef13e97..b358fa59 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -85,6 +85,8 @@ stats:
     apPPR: Sanity Required Per Item
     clearTime: Shortest Clear Time
     timeRange: Time Range
+  preview:
+    title: Drop Rate Preview
   headerDesc:
     apCost: The Sanity required for the stage
     quantity: The sum of all drops in this stage
diff --git a/src/locales/zh.yml b/src/locales/zh.yml
index 16910931..66804f66 100644
--- a/src/locales/zh.yml
+++ b/src/locales/zh.yml
@@ -82,6 +82,8 @@ stats:
     apPPR: 单件估算理智
     clearTime: 最短通关用时
     timeRange: 统计区间
+  preview:
+    title: 数据速览
   headerDesc:
     apCost: 该作战所需要的理智
     quantity: 在该作战中，所有提交到企鹅物流数据统计的掉落数之和
diff --git a/src/styles/global.css b/src/styles/global.css
index 6d2eb6e7..88e6638e 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -540,5 +540,6 @@
 }
 
 .backdrop-blur {
+    -webkit-backdrop-filter: blur(5px);
     backdrop-filter: blur(5px);
 }
\ No newline at end of file
diff --git a/src/utils/getters.js b/src/utils/getters.js
index ce7e65c7..2408119f 100644
--- a/src/utils/getters.js
+++ b/src/utils/getters.js
@@ -3,23 +3,6 @@ import formatter from "@/utils/timeFormatter";
 import existUtils from "@/utils/existUtils";
 // import Console from "@/utils/Console";
 
-function memorized(func, ctx) {
-  const memo = {};
-  const slice = Array.prototype.slice;
-
-  return function() {
-    const args = slice.call(arguments);
-
-    if (args in memo) {
-      console.log("serving cached copy ", memo[args])
-      return memo[args];
-    } else {
-      console.log("saving NON cached copy ", args)
-      return (memo[args] = func.apply(ctx, args));
-    }
-  }
-}
-
 const Getters = {};
 
 Getters.items = {
@@ -113,11 +96,6 @@ Getters.statistics = {
   }
 }
 
-Getters.cachedStatistics = {
-  byItemId: memorized(Getters.statistics.byItemId, Getters.statistics),
-  byStageId: memorized(Getters.statistics.byStageId, Getters.statistics)
-}
-
 Getters.stages = {
   all() {
     let stages = store.getters["data/content"]({id: "stages"});
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index e02fb043..f37ab0d7 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -143,6 +143,17 @@ export default {
         },
         {
           active: true,
+          version: "v3.3.2",
+          date: "2020-07-29T14:00:00+0800",
+          changes: [
+            "添加：物品数据速览",
+            "添加：按作战查看数据增加 Zone 名称显示",
+
+            "修复：Report 对部分无效关卡的错误禁止上传提示",
+            "优化：部分数据 Existence 判断",
+          ]
+        },
+        {
           version: "v3.3.1",
           date: "2020-07-23T18:00:00Z",
           changes: [

From 0f4eaadbd1d9aa57ce4bb05f6dc7557af1a5f6fa Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Wed, 29 Jul 2020 23:07:09 +0800
Subject: [PATCH 09/19] improvement(previewcard): remove subheader

---
 src/components/stats/PreviewItemCard.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index 9c4c94cb..7249baad 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -13,9 +13,6 @@
       </span>
     </v-card-title>
     <v-card-text v-if="stats.data.length">
-      <v-subheader class="ma-0 pa-0">
-        {{ $t('stats.preview.title') }}
-      </v-subheader>
       <v-simple-table dense>
         <table>
           <thead>

From d8c4a3a878ae8f8883ef475bb59373ffc291ba71 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Wed, 29 Jul 2020 23:59:22 +0800
Subject: [PATCH 10/19] improvement(previewcard): fix layout issue when
 displaying on small device

---
 src/components/stats/PreviewItemCard.vue | 146 +++++++++++------------
 1 file changed, 72 insertions(+), 74 deletions(-)

diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index 7249baad..f37cfbf8 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -3,7 +3,7 @@
     color="background"
     elevation="9"
   >
-    <v-card-title :class="{'pb-0': stats.data.length}">
+    <v-card-title>
       <ItemIcon
         :item="item"
         :ratio="0.5"
@@ -14,72 +14,70 @@
     </v-card-title>
     <v-card-text v-if="stats.data.length">
       <v-simple-table dense>
-        <table>
-          <thead>
-            <tr>
-              <th>
-                {{ $t('stats.headers.stage') }}
-              </th>
-              <th class="font-weight-bold">
-                {{ $t('stats.headers.percentage') }}
-                <v-icon small>
-                  mdi-sort-descending
-                </v-icon>
-              </th>
-              <th>
-                {{ $t('stats.headers.quantity') }}
-                /
-                {{ $t('stats.headers.times') }}
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              v-for="stat in stats.data"
-              :key="stat.stageId"
-              class="monospace"
-              :class="{'orange--text font-weight-bold': highlight === stat.stageId}"
-            >
-              <td class="d-flex align-center">
-                <v-icon
-                  v-if="highlight === stat.stageId"
-                  color="orange"
-                  small
-                  class="mr-1"
-                >
-                  mdi-arrow-right-circle
-                </v-icon>
-                <v-icon
-                  :color="highlight === stat.stageId ? 'orange' : ''"
-                  small
-                  class="mr-1"
-                >
-                  {{ stat.zone.icon }}
-                </v-icon>
-                {{ stat.stageCode }}
-              </td>
-              <td>
-                {{ stat.percentageText }}
-              </td>
-              <td>
-                {{ stat.quantity }} / {{ stat.times }}
-              </td>
-            </tr>
-            <tr
-              v-if="stats.more"
-              style="background: inherit !important;"
-            >
-              <td
-                colspan="2"
-                class="text-center"
+        <thead>
+          <tr>
+            <th>
+              {{ $t('stats.headers.stage') }}
+            </th>
+            <th class="font-weight-bold">
+              {{ $t('stats.headers.percentage') }}
+              <v-icon small>
+                mdi-sort-descending
+              </v-icon>
+            </th>
+            <th>
+              {{ $t('stats.headers.quantity') }}
+              /
+              {{ $t('stats.headers.times') }}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr
+            v-for="stat in stats.data"
+            :key="stat.stageId"
+            class="monospace"
+            :class="{'orange--text font-weight-bold': highlight === stat.stageId}"
+          >
+            <td>
+              <v-icon
+                v-if="highlight === stat.stageId"
+                color="orange"
+                small
+                class="mr-1"
               >
-                <v-icon color="grey">
-                  mdi-dots-horizontal
-                </v-icon>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+                mdi-arrow-right-circle
+              </v-icon>
+              <v-icon
+                :color="highlight === stat.stageId ? 'orange' : ''"
+                small
+                class="mr-1"
+              >
+                {{ stat.zone.icon }}
+              </v-icon>
+              {{ stat.stageCode }}
+            </td>
+            <td>
+              {{ stat.percentageText }}
+            </td>
+            <td>
+              {{ stat.quantity }} / {{ stat.times }}
+            </td>
+          </tr>
+          <tr
+            v-if="stats.more"
+            style="background: inherit !important;"
+          >
+            <td
+              colspan="3"
+              class="text-center"
+            >
+              <v-icon color="grey">
+                mdi-dots-horizontal
+              </v-icon>
+            </td>
+          </tr>
+        </tbody>
       </v-simple-table>
     </v-card-text>
   </v-card>
@@ -118,16 +116,16 @@
           .filter(el => existUtils.existence(el, true))
 
           .sort((a, b) => b.percentage - a.percentage)
-          .slice(0, pagination)
-          .map(el => {
-            return {
-              ...el,
-              stageCode: strings.translate(el.stage, "code")
-            }
-          })
 
         return {
-          data,
+          data: data
+            .slice(0, pagination)
+            .map(el => {
+              return {
+                ...el,
+                stageCode: strings.translate(el.stage, "code")
+              }
+            }),
           more: data.length > pagination
         }
       },

From 683762d73507e1a25fde1247a056f4cfa9720d10 Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 09:06:43 +0800
Subject: [PATCH 11/19] fix(i18n): fix spelling mistake

fix #377
---
 src/components/toolbar/AccountManager.vue | 2 +-
 src/components/toolbar/ForgotAccount.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/toolbar/AccountManager.vue b/src/components/toolbar/AccountManager.vue
index a71ba1db..f72d2b8a 100644
--- a/src/components/toolbar/AccountManager.vue
+++ b/src/components/toolbar/AccountManager.vue
@@ -3,7 +3,7 @@
 	"en": {
 		"failed": {
 			"message": "Failed to log in: {message}",
-			"notfound": "This User ID cannot be found. Please not that this is not the ID in the game. You will get one after your first drop report."
+			"notfound": "This User ID cannot be found. Please note that this is not the ID in the game. You will get one after your first drop report."
 		},
 		"loggedOut": "Logged out",
 		"login": "Login",
diff --git a/src/components/toolbar/ForgotAccount.vue b/src/components/toolbar/ForgotAccount.vue
index fdfb3cbe..5c13b41d 100644
--- a/src/components/toolbar/ForgotAccount.vue
+++ b/src/components/toolbar/ForgotAccount.vue
@@ -3,7 +3,7 @@
     "en": {
       "failed": {
         "message": "Failed to log in: {message}",
-        "notfound": "This User ID cannot be found. Please not that this is not the ID in the game. You will get one after your first drop report."
+        "notfound": "This User ID cannot be found. Please note that this is not the ID in the game. You will get one after your first drop report."
       }
     },
     "ja": {

From d7d82f081776804967d371a996b964d452190566 Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 09:10:27 +0800
Subject: [PATCH 12/19] fix(preview): fix the bug that stages in preview card
 are not filtered correctly

---
 src/components/stats/PreviewItemCard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index f37cfbf8..471356d3 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -113,7 +113,7 @@
           // filter out stages that have too less samples
           .filter(el => el.times > 100)
           // only open stages
-          .filter(el => existUtils.existence(el, true))
+          .filter(el => existUtils.existence(el.stage, true))
 
           .sort((a, b) => b.percentage - a.percentage)
 
@@ -126,7 +126,7 @@
                 stageCode: strings.translate(el.stage, "code")
               }
             }),
-          more: data.length > pagination
+          more: data.length >= pagination
         }
       },
       highlight () {

From 6ccc16878179703d5a6bd74b311b72a3883d4d73 Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 09:11:26 +0800
Subject: [PATCH 13/19] fix(preview): should not be gte

---
 src/components/stats/PreviewItemCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/stats/PreviewItemCard.vue b/src/components/stats/PreviewItemCard.vue
index 471356d3..ef2394cf 100644
--- a/src/components/stats/PreviewItemCard.vue
+++ b/src/components/stats/PreviewItemCard.vue
@@ -126,7 +126,7 @@
                 stageCode: strings.translate(el.stage, "code")
               }
             }),
-          more: data.length >= pagination
+          more: data.length > pagination
         }
       },
       highlight () {

From c627241bb7d21cde2ae821d048e63c11ec8d9e94 Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 09:22:49 +0800
Subject: [PATCH 14/19] fix(links): fix wrong link for kkdy

---
 src/views/About/Links.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/About/Links.vue b/src/views/About/Links.vue
index 39a58a74..5af43051 100644
--- a/src/views/About/Links.vue
+++ b/src/views/About/Links.vue
@@ -297,7 +297,7 @@ export default {
               color: "teal"
             }
           ],
-          url: "https://ark-nights.com"
+          url: "https://kokodayo.fun/"
         },
         {
           title: "ANWiki",

From 4216ec1a0b249f1c6b631b8a3f3566047c8c8a5e Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 09:45:10 +0800
Subject: [PATCH 15/19] fix(version): fix version number and add some
 changelogs

---
 package.json                  | 2 +-
 src/config/index.js           | 2 +-
 src/views/About/Changelog.vue | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 2e995ba5..adb23710 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "private": true,
   "author": "Penguin Statistics Contributors <contributors@penguin-stats.io> (https://github.com/orgs/penguin-statistics/people)",
   "scripts": {
diff --git a/src/config/index.js b/src/config/index.js
index b0d6270f..9ea8e83f 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,4 +1,4 @@
-const version = "v3.3.1";
+const version = "v3.3.2";
 
 module.exports = {
   version,
diff --git a/src/views/About/Changelog.vue b/src/views/About/Changelog.vue
index f37ab0d7..73b37469 100644
--- a/src/views/About/Changelog.vue
+++ b/src/views/About/Changelog.vue
@@ -144,12 +144,14 @@ export default {
         {
           active: true,
           version: "v3.3.2",
-          date: "2020-07-29T14:00:00+0800",
+          date: "2020-07-31T00:00:00+0800",
           changes: [
             "添加：物品数据速览",
             "添加：按作战查看数据增加 Zone 名称显示",
 
             "修复：Report 对部分无效关卡的错误禁止上传提示",
+            "修复：友情链接kkdy数据站链接地址错误",
+            "修复：英文翻译的若干错误",
             "优化：部分数据 Existence 判断",
           ]
         },

From c077fc77393cb42b0e030c53e224caf141f645fa Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Thu, 30 Jul 2020 09:55:52 +0800
Subject: [PATCH 16/19] improvement(previewcard): hide on touch device click

---
 src/components/global/Item.vue            | 15 +++++++++++----
 src/components/toolbar/AccountManager.vue |  3 ++-
 src/mixins/hooks/Theme.js                 |  3 ++-
 src/utils/environment.js                  |  5 +++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index 60ec41fa..dda076e9 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -1,6 +1,6 @@
 <template>
   <v-tooltip
-    v-if="!disableTooltip"
+    v-if="!disableTooltipCalculated"
     :open-delay="2"
 
     :right="right"
@@ -17,7 +17,7 @@
           :item="item"
           :ratio="ratio"
           :class="contentClass"
-          :disable-tooltip="disableTooltip"
+          :disable-tooltip="disableTooltipCalculated"
           v-on="on"
         />
       </span>
@@ -29,10 +29,12 @@
     />
   </v-tooltip>
   <ItemIcon
-    v-else-if="disableTooltip"
+    v-else-if="disableTooltipCalculated"
+
     :item="item"
     :ratio="ratio"
-    :disable-tooltip="disableTooltip"
+    :class="contentClass"
+    :disable-tooltip="disableTooltipCalculated"
   />
 </template>
 
@@ -40,6 +42,7 @@
   import ItemIcon from "@/components/global/ItemIcon";
   import strings from "@/utils/strings";
   import PreviewItemCard from "@/components/stats/PreviewItemCard";
+  import environment from "@/utils/environment";
   export default {
     name: "Item",
     components: {PreviewItemCard, ItemIcon},
@@ -99,6 +102,10 @@
           [this.bottom ? 'nudgeTop' : 'nudgeLeft']: this.tooltipNudge,
           transition: this.bottom ? "slide-y-transition" : "slide-x-transition"
         }
+      },
+      disableTooltipCalculated () {
+        // always disable tooltip on touch screen
+        return environment.isTouchScreen || this.disableTooltip
       }
     },
   };
diff --git a/src/components/toolbar/AccountManager.vue b/src/components/toolbar/AccountManager.vue
index f72d2b8a..4ea58e82 100644
--- a/src/components/toolbar/AccountManager.vue
+++ b/src/components/toolbar/AccountManager.vue
@@ -221,6 +221,7 @@
   import ForgotAccount from "@/components/toolbar/ForgotAccount";
   import TooltipBtn from "@/components/global/TooltipBtn";
   import config from "@/config"
+  import environment from "@/utils/environment";
 
   export default {
     name: "AccountManager",
@@ -245,7 +246,7 @@
     },
     computed: {
       mobile() {
-        return !!("ontouchstart" in window) || window.navigator.maxTouchPoints > 0;
+        return environment.isTouchScreen
       }
     },
     created () {
diff --git a/src/mixins/hooks/Theme.js b/src/mixins/hooks/Theme.js
index ac4feaf4..88d608e2 100644
--- a/src/mixins/hooks/Theme.js
+++ b/src/mixins/hooks/Theme.js
@@ -1,5 +1,6 @@
 import {mapGetters} from "vuex";
 import Console from "@/utils/Console";
+import environment from "@/utils/environment";
 
 export default {
   watch: {
@@ -13,7 +14,7 @@ export default {
   },
   methods: {
     themeToggle (isDark) {
-      const windowsIndicator = navigator.platform.indexOf('Win') > -1 ? "platform--windows" : "platform--not-windows";
+      const windowsIndicator = environment.isWindows ? "platform--windows" : "platform--not-windows";
       this.$vuetify.theme.dark = isDark
       if (isDark) {
         document.documentElement.classList.add("vuetify-theme--dark", windowsIndicator)
diff --git a/src/utils/environment.js b/src/utils/environment.js
index 07197ab1..3dbfd0e7 100644
--- a/src/utils/environment.js
+++ b/src/utils/environment.js
@@ -13,6 +13,11 @@ function boolean(key) {
 
 export default {
   get production () {return process.env.NODE_ENV === 'production'},
+  get isTouchScreen () {
+    if (window.matchMedia) return window.matchMedia("(pointer: coarse)").matches
+    return "ontouchstart" in window || window.navigator.maxTouchPoints > 0
+  },
+  get isWindows () {return navigator.platform.indexOf('Win') > -1},
   debug: {
     get performance() {return boolean("performance")},
     get devtools() {return boolean("devtools")},

From 81c49ae855e91e2d74e9a9c63ac9104fda5f5794 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Thu, 30 Jul 2020 09:56:43 +0800
Subject: [PATCH 17/19] style(eslint): fix eslint

---
 .eslintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 7496fa34..50d62d90 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -15,7 +15,8 @@
     "vuetify/no-deprecated-classes": "error",
     "vuetify/grid-unknown-attributes": "error",
     "vuetify/no-legacy-grid": "error",
-    "vue/no-v-html": "off"
+    "vue/no-v-html": "off",
+    "vue/no-template-shadow": "off"
   },
   "parserOptions": {
     "parser": "babel-eslint"

From 47df0357bff069f11588ee04d5b6f998330b1965 Mon Sep 17 00:00:00 2001
From: GalvinGao <galvingaoper@gmail.com>
Date: Thu, 30 Jul 2020 10:09:50 +0800
Subject: [PATCH 18/19] improvement(item): allow overflow and automatically
 flip sides

---
 src/components/global/Item.vue        | 10 +++++-----
 src/components/global/ItemStepper.vue |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/global/Item.vue b/src/components/global/Item.vue
index dda076e9..6cd79305 100644
--- a/src/components/global/Item.vue
+++ b/src/components/global/Item.vue
@@ -1,7 +1,9 @@
 <template>
   <v-tooltip
     v-if="!disableTooltipCalculated"
-    :open-delay="2"
+    allow-overflow
+    offset-overflow
+    :open-delay="-1"
 
     :right="right"
     :bottom="bottom"
@@ -23,10 +25,7 @@
       </span>
     </template>
     <!--    <span class="force-lang-font">{{ name }}</span>-->
-    <PreviewItemCard
-      :item-id="item.itemId"
-      :tooltip-nudge="5"
-    />
+    <PreviewItemCard :item-id="item.itemId" />
   </v-tooltip>
   <ItemIcon
     v-else-if="disableTooltipCalculated"
@@ -100,6 +99,7 @@
       tooltipOptions () {
         return {
           [this.bottom ? 'nudgeTop' : 'nudgeLeft']: this.tooltipNudge,
+          [this.bottom ? 'nudgeBottom' : 'nudgeRight']: this.tooltipNudge,
           transition: this.bottom ? "slide-y-transition" : "slide-x-transition"
         }
       },
diff --git a/src/components/global/ItemStepper.vue b/src/components/global/ItemStepper.vue
index 0202af58..b95c2d97 100644
--- a/src/components/global/ItemStepper.vue
+++ b/src/components/global/ItemStepper.vue
@@ -37,7 +37,6 @@
             :item="item"
             :ratio="1"
             disable-link
-            tooltip-position="bottom"
             :tooltip-nudge="0"
           />
         </div>

From 7af2c05e745d7aa2fc6ac237d7692f69e89666b8 Mon Sep 17 00:00:00 2001
From: AlvISsReimu <alvissreimu@gmail.com>
Date: Thu, 30 Jul 2020 10:36:38 +0800
Subject: [PATCH 19/19] fix(i18n): remove unused terms

---
 src/locales/en.yml | 2 --
 src/locales/zh.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/locales/en.yml b/src/locales/en.yml
index b358fa59..6ef13e97 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -85,8 +85,6 @@ stats:
     apPPR: Sanity Required Per Item
     clearTime: Shortest Clear Time
     timeRange: Time Range
-  preview:
-    title: Drop Rate Preview
   headerDesc:
     apCost: The Sanity required for the stage
     quantity: The sum of all drops in this stage
diff --git a/src/locales/zh.yml b/src/locales/zh.yml
index 66804f66..16910931 100644
--- a/src/locales/zh.yml
+++ b/src/locales/zh.yml
@@ -82,8 +82,6 @@ stats:
     apPPR: 单件估算理智
     clearTime: 最短通关用时
     timeRange: 统计区间
-  preview:
-    title: 数据速览
   headerDesc:
     apCost: 该作战所需要的理智
     quantity: 在该作战中，所有提交到企鹅物流数据统计的掉落数之和