升级依赖，修正dev时，丢失当前状态的问题

umbrella22
.electron-vue/dev-runner.js
package.json
yarn.lock
--- a/.electron-vue/dev-runner.js
查看文件 @37c097c
+++ b/.electron-vue/dev-runner.js
查看文件 @37c097c
 'use strict'
+process.env.NODE_ENV = 'development'
 const chalk = require('chalk')
 const electron = require('electron')
 const path = require('path')
--- a/package.json
查看文件 @37c097c
+++ b/package.json
查看文件 @37c097c
@@ -73,8 +73,8 @@
   },
   "dependencies": {
     "axios": "^0.20.0",
-    "date-fns": "^2.15.0",
+    "date-fns": "^2.16.0",
-    "electron-updater": "^4.3.1",
+    "electron-updater": "^4.3.4",
     "element-ui": "^2.13.2",
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
@@ -108,7 +108,7 @@
     "@babel/register": "^7.10.5",
     "@babel/runtime": "^7.11.2",
     "@types/fs-extra": "^9.0.1",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.6.2",
     "ajv": "^6.12.4",
     "babel-eslint": "^9.0.0",
     "babel-loader": "^8.1.0",
@@ -116,11 +116,11 @@
     "cache-loader": "^4.1.0",
     "cfonts": "^2.8.6",
     "chalk": "^4.0.0",
-    "copy-webpack-plugin": "^6.0.3",
+    "copy-webpack-plugin": "^6.0.4",
     "cross-env": "^7.0.2",
-    "css-loader": "^4.2.1",
+    "css-loader": "^4.2.2",
     "del": "^5.1.0",
-    "electron": "^9.2.1",
+    "electron": "^10.1.0",
     "electron-builder": "^22.8.0",
     "electron-devtools-installer": "^3.1.1",
     "eslint": "^6.8.0",
@@ -134,19 +134,19 @@
     "eslint-plugin-standard": "^4.0.0",
     "file-loader": "^6.0.0",
     "happypack": "^5.0.1",
-    "html-webpack-plugin": "^4.3.0",
+    "html-webpack-plugin": "^4.4.1",
-    "mini-css-extract-plugin": "0.10.0",
+    "mini-css-extract-plugin": "0.11.0",
     "multispinner": "^0.2.1",
     "node-loader": "^1.0.1",
     "portfinder": "^1.0.28",
     "sass": "^1.26.10",
-    "sass-loader": "^9.0.3",
+    "sass-loader": "^10.0.1",
     "split2": "^3.2.2",
     "style-loader": "^1.2.1",
     "svg-sprite-loader": "^5.0.0",
     "terser-webpack-plugin": "^4.1.0",
     "through2-filter": "^3.0.0",
-    "ts-loader": "^8.0.2",
+    "ts-loader": "^8.0.3",
     "typescript": "^4.0.2",
     "url-loader": "^4.1.0",
     "vue-html-loader": "^1.2.4",
@@ -157,6 +157,6 @@
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^5.1.2"
+    "webpack-merge": "^5.1.3"
   }
 }
--- a/yarn.lock
查看文件 @37c097c
+++ b/yarn.lock
查看文件 @37c097c
@@ -1228,17 +1228,15 @@
   resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.48.tgz?cache=0&sync_timestamp=1594068001359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.48.tgz#4135f064eeed9fcfb4756deea5ba2caa11603391"
   integrity sha1-QTXwZO7tn8+0dW3upbosqhFgM5E=
-"@types/node@^14.6.0":
+"@types/node@^14.6.2":
-  version "14.6.0"
+  version "14.6.2"
-  resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
+  resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.6.2.tgz?cache=0&sync_timestamp=1598656851627&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.6.2.tgz#264b44c5a28dfa80198fc2f7b6d3c8a054b9491f"
-  integrity sha1-fUQRv1FXM5M318/4ZNn/RfF3tJk=
+  integrity sha1-JktExaKN+oAZj8L3ttPIoFS5SR8=
-"@types/semver@^7.1.0":
+"@types/semver@^7.3.1":
-  version "7.3.1"
+  version "7.3.3"
-  resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.3.1.tgz#7a9a5d595b6d873f338c867dcef64df289468cfa"
+  resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.3.3.tgz?cache=0&sync_timestamp=1598396644558&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fsemver%2Fdownload%2F%40types%2Fsemver-7.3.3.tgz#3ad6ed949e7487e7bda6f886b4a2434a2c3d7b1a"
-  integrity sha1-eppdWVtthz8zjIZ9zvZN8olGjPo=
+  integrity sha1-OtbtlJ50h+e9pviGtKJDSiw9exo=
-  dependencies:
-    "@types/node" "*"
 "@types/source-list-map@*":
   version "0.1.2"
@@ -2461,14 +2459,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
-builder-util-runtime@8.7.0:
-  version "8.7.0"
-  resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d"
-  integrity sha1-5IrQBINcgoRmLo6vR6U0aMZujo0=
-  dependencies:
-    debug "^4.1.1"
-    sax "^1.2.4"
-
 builder-util-runtime@8.7.2:
   version "8.7.2"
   resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.2.tgz?cache=0&sync_timestamp=1594883084352&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
@@ -2533,29 +2523,6 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
-cacache@^15.0.4:
-  version "15.0.4"
-  resolved "https://registry.npm.taobao.org/cacache/download/cacache-15.0.4.tgz#b2c23cf4ac4f5ead004fb15a0efb0a20340741f1"
-  integrity sha1-ssI89KxPXq0AT7FaDvsKIDQHQfE=
-  dependencies:
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.0"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
 cacache@^15.0.5:
   version "15.0.5"
   resolved "https://registry.npm.taobao.org/cacache/download/cacache-15.0.5.tgz?cache=0&sync_timestamp=1594429684526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
@@ -3144,19 +3111,19 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-copy-webpack-plugin@^6.0.3:
+copy-webpack-plugin@^6.0.4:
-  version "6.0.3"
+  version "6.0.4"
-  resolved "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
+  resolved "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.0.4.tgz#7b7d7f7f290aa21b3411d02525859b89988a200b"
-  integrity sha1-Kz0r/GhhuWQypl8BSXIK29kCBAs=
+  integrity sha1-e31/fykKohs0EdAlJYWbiZiKIAs=
   dependencies:
-    cacache "^15.0.4"
+    cacache "^15.0.5"
     fast-glob "^3.2.4"
     find-cache-dir "^3.3.1"
     glob-parent "^5.1.1"
     globby "^11.0.1"
     loader-utils "^2.0.0"
     normalize-path "^3.0.0"
-    p-limit "^3.0.1"
+    p-limit "^3.0.2"
     schema-utils "^2.7.0"
     serialize-javascript "^4.0.0"
     webpack-sources "^1.4.3"
@@ -3269,16 +3236,15 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1583560482221&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU=
-css-loader@^4.2.1:
+css-loader@^4.2.2:
-  version "4.2.1"
+  version "4.2.2"
-  resolved "https://registry.npm.taobao.org/css-loader/download/css-loader-4.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-4.2.1.tgz#9f48fd7eae1219d629a3f085ba9a9102ca1141a7"
+  resolved "https://registry.npm.taobao.org/css-loader/download/css-loader-4.2.2.tgz#b668b3488d566dc22ebcf9425c5f254a05808c89"
-  integrity sha1-n0j9fq4SGdYpo/CFupqRAsoRQac=
+  integrity sha1-tmizSI1WbcIuvPlCXF8lSgWAjIk=
   dependencies:
     camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
     loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
     postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
     postcss-modules-local-by-default "^3.0.3"
@@ -3313,10 +3279,10 @@ cyclist@^1.0.1:
   resolved "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-date-fns@^2.15.0:
+date-fns@^2.16.0:
-  version "2.15.0"
+  version "2.16.0"
-  resolved "https://registry.npm.taobao.org/date-fns/download/date-fns-2.15.0.tgz?cache=0&sync_timestamp=1594999045988&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
+  resolved "https://registry.npm.taobao.org/date-fns/download/date-fns-2.16.0.tgz?cache=0&sync_timestamp=1598534799277&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.16.0.tgz#d34f0f5f2fd498c984513042e8f7247ea86c4cb7"
-  integrity sha1-Qk3ms3eOTmnT/ycEbsE2r1iuXV8=
+  integrity sha1-008PXy/UmMmEUTBC6PckfqhsTLc=
 de-indent@^1.0.2:
   version "1.0.2"
@@ -3748,23 +3714,23 @@ electron-to-chromium@^1.3.488:
   resolved "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.488.tgz?cache=0&sync_timestamp=1593913107832&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.488.tgz#9226229f5fbc825959210e81e0bb3e63035d1c06"
   integrity sha1-kiYin1+8gllZIQ6B4Ls+YwNdHAY=
-electron-updater@^4.3.1:
+electron-updater@^4.3.4:
-  version "4.3.1"
+  version "4.3.4"
-  resolved "https://registry.npm.taobao.org/electron-updater/download/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7"
+  resolved "https://registry.npm.taobao.org/electron-updater/download/electron-updater-4.3.4.tgz#6003f88be9004d7834e4dd757167033d0fc2d29a"
-  integrity sha1-nUhbYmK8Vvz37mKx3Bs7EFo+lqc=
+  integrity sha1-YAP4i+kATXg05N11cWcDPQ/C0po=
   dependencies:
-    "@types/semver" "^7.1.0"
+    "@types/semver" "^7.3.1"
-    builder-util-runtime "8.7.0"
+    builder-util-runtime "8.7.2"
-    fs-extra "^9.0.0"
+    fs-extra "^9.0.1"
-    js-yaml "^3.13.1"
+    js-yaml "^3.14.0"
     lazy-val "^1.0.4"
     lodash.isequal "^4.5.0"
-    semver "^7.1.3"
+    semver "^7.3.2"
-electron@^9.2.1:
+electron@^10.1.0:
-  version "9.2.1"
+  version "10.1.0"
-  resolved "https://registry.npm.taobao.org/electron/download/electron-9.2.1.tgz?cache=0&sync_timestamp=1598082365672&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-9.2.1.tgz#54ef574e1af4ae967b5efa94312f1b6458d44a02"
+  resolved "https://registry.npm.taobao.org/electron/download/electron-10.1.0.tgz?cache=0&sync_timestamp=1598575707749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-10.1.0.tgz#3559182545dc76e20d9764d183d555415d55c250"
-  integrity sha1-VO9XThr0rpZ7XvqUMS8bZFjUSgI=
+  integrity sha1-NVkYJUXcduINl2TRg9VVQV1VwlA=
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -4597,7 +4563,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.1:
   version "9.0.1"
   resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
   integrity sha1-kQ2gBiQ3ukw5/t2GPxZ1zP78ufw=
@@ -5090,10 +5056,10 @@ html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
-html-webpack-plugin@^4.3.0:
+html-webpack-plugin@^4.4.1:
-  version "4.3.0"
+  version "4.4.1"
-  resolved "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-4.3.0.tgz#53bf8f6d696c4637d5b656d3d9863d89ce8174fd"
+  resolved "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-4.4.1.tgz#61ab85aa1a84ba181443345ebaead51abbb84149"
-  integrity sha1-U7+PbWlsRjfVtlbT2YY9ic6BdP0=
+  integrity sha1-YauFqhqEuhgUQzReuurVGru4QUk=
   dependencies:
     "@types/html-minifier-terser" "^5.0.0"
     "@types/tapable" "^1.0.5"
@@ -5846,10 +5812,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=
-klona@^1.1.2:
+klona@^2.0.3:
-  version "1.1.2"
+  version "2.0.3"
-  resolved "https://registry.npm.taobao.org/klona/download/klona-1.1.2.tgz?cache=0&sync_timestamp=1594031499693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-1.1.2.tgz#a79e292518a5a5412ec8d097964bff1571a64db0"
+  resolved "https://registry.npm.taobao.org/klona/download/klona-2.0.3.tgz?cache=0&sync_timestamp=1597811502396&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-2.0.3.tgz#98274552c513583ad7a01456a789a2a0b4a2a538"
-  integrity sha1-p54pJRilpUEuyNCXlkv/FXGmTbA=
+  integrity sha1-mCdFUsUTWDrXoBRWp4mioLSipTg=
 latest-version@^5.0.0:
   version "5.1.0"
@@ -6406,10 +6372,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=
-mini-css-extract-plugin@0.10.0:
+mini-css-extract-plugin@0.11.0:
-  version "0.10.0"
+  version "0.11.0"
-  resolved "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.10.0.tgz?cache=0&sync_timestamp=1597072255332&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d"
+  resolved "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.11.0.tgz?cache=0&sync_timestamp=1598544766983&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.11.0.tgz#3918953075109d4ca204bf1e8a393a78d3cc821f"
-  integrity sha1-oOa/ytIqnHP2yIKjx1V6mOLT0n0=
+  integrity sha1-ORiVMHUQnUyiBL8eijk6eNPMgh8=
   dependencies:
     loader-utils "^1.1.0"
     normalize-url "1.9.1"
@@ -6942,13 +6908,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
-p-limit@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839"
-  integrity sha1-WEeErAci0a7Qnxn5DtKZmvbOKDk=
-  dependencies:
-    p-try "^2.0.0"
-
 p-limit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-3.0.2.tgz?cache=0&sync_timestamp=1594559856635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
@@ -8003,12 +7962,12 @@ sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
-sass-loader@^9.0.3:
+sass-loader@^10.0.1:
-  version "9.0.3"
+  version "10.0.1"
-  resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-9.0.3.tgz?cache=0&sync_timestamp=1596633419455&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-9.0.3.tgz#086adcf0bfdcc9d920413e2cdc3ba3321373d547"
+  resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-10.0.1.tgz?cache=0&sync_timestamp=1598355740663&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-10.0.1.tgz#10c0364d8034f22fee25ddcc9eded20f99bbe3b4"
-  integrity sha1-CGrc8L/cydkgQT4s3DujMhNz1Uc=
+  integrity sha1-EMA2TYA08i/uJd3Mnt7SD5m747Q=
   dependencies:
-    klona "^1.1.2"
+    klona "^2.0.3"
     loader-utils "^2.0.0"
     neo-async "^2.6.2"
     schema-utils "^2.7.0"
@@ -8083,7 +8042,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
-semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
+semver@^7.2.1, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha1-YElisFK4HtB4aq6EOJ/7pw/9OTg=
@@ -8947,10 +8906,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
-ts-loader@^8.0.2:
+ts-loader@^8.0.3:
-  version "8.0.2"
+  version "8.0.3"
-  resolved "https://registry.npm.taobao.org/ts-loader/download/ts-loader-8.0.2.tgz?cache=0&sync_timestamp=1596283653966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fts-loader%2Fdownload%2Fts-loader-8.0.2.tgz#ee73ca9350f745799396fff8578ba29b1e95616b"
+  resolved "https://registry.npm.taobao.org/ts-loader/download/ts-loader-8.0.3.tgz?cache=0&sync_timestamp=1598257216292&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fts-loader%2Fdownload%2Fts-loader-8.0.3.tgz#56858f4296edf1ed55e01f8520552984d3f0911c"
-  integrity sha1-7nPKk1D3RXmTlv/4V4uimx6VYWs=
+  integrity sha1-VoWPQpbt8e1V4B+FIFUphNPwkRw=
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -9484,10 +9443,10 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
-webpack-merge@^5.1.2:
+webpack-merge@^5.1.3:
-  version "5.1.2"
+  version "5.1.3"
-  resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-5.1.2.tgz?cache=0&sync_timestamp=1597767024911&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.1.2.tgz#21dc1ed0e860c305cf5a07a48750f53a99750855"
+  resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-5.1.3.tgz#e5570b0bfa654915340f1e348c93a6fd16d7a820"
-  integrity sha1-Idwe0OhgwwXPWgekh1D1Opl1CFU=
+  integrity sha1-5VcLC/plSRU0Dx40jJOm/RbXqCA=
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"