Merge branch 'SynchronizedUpdates' of https://github.com/umbrella22/electron-vue…

…-template into SynchronizedUpdates

Merge branch 'SynchronizedUpdates' of https://github.com/umbrella22/electron-vue…
…-template into SynchronizedUpdates
umbrella22
package-lock.json
package.json
--- a/package-lock.json
查看文件 @627d449
+++ b/package-lock.json
查看文件 @627d449
@@ -3370,79 +3370,13 @@
       }
     },
     "cfonts": {
-      "version": "2.4.5",
+      "version": "2.4.8",
-      "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.4.5.tgz",
+      "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.4.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcfonts%2Fdownload%2Fcfonts-2.4.8.tgz",
-      "integrity": "sha1-/n5hUrUEL161tQ+pNdqE1AZMZ9c=",
+      "integrity": "sha1-Q/lWt80/QUgODqSVqjMOZS/7HVY=",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.1.0",
+        "chalk": "^3.0.0",
-        "chalk": "^2.4.2",
-        "change-case": "^3.1.0",
         "window-size": "^1.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.2.0.tgz?cache=0&sync_timestamp=1573557628456&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.2.0.tgz",
-          "integrity": "sha1-VoHw3PeuWICnhB2IMcRyTtnMAXI=",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
-          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1573557628456&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz",
-              "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
-              "dev": true,
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "color-convert": {
-              "version": "1.9.3",
-              "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz?cache=0&sync_timestamp=1566248870121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolor-convert%2Fdownload%2Fcolor-convert-1.9.3.tgz",
-              "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
-              "dev": true,
-              "requires": {
-                "color-name": "1.1.3"
-              }
-            },
-            "color-name": {
-              "version": "1.1.3",
-              "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
-              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-              "dev": true
-            }
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz?cache=0&sync_timestamp=1566248870121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolor-convert%2Fdownload%2Fcolor-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true
-        }
       }
     },
     "chalk": {
@@ -3497,32 +3431,6 @@
         }
       }
     },
-    "change-case": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/change-case/download/change-case-3.1.0.tgz?cache=0&sync_timestamp=1576721536235&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchange-case%2Fdownload%2Fchange-case-3.1.0.tgz",
-      "integrity": "sha1-DmEbftyZUt8uhROye0LecmR90X4=",
-      "dev": true,
-      "requires": {
-        "camel-case": "^3.0.0",
-        "constant-case": "^2.0.0",
-        "dot-case": "^2.1.0",
-        "header-case": "^1.0.0",
-        "is-lower-case": "^1.1.0",
-        "is-upper-case": "^1.1.0",
-        "lower-case": "^1.1.1",
-        "lower-case-first": "^1.0.0",
-        "no-case": "^2.3.2",
-        "param-case": "^2.1.0",
-        "pascal-case": "^2.0.0",
-        "path-case": "^2.1.0",
-        "sentence-case": "^2.1.0",
-        "snake-case": "^2.1.0",
-        "swap-case": "^1.1.0",
-        "title-case": "^2.1.0",
-        "upper-case": "^1.1.1",
-        "upper-case-first": "^1.1.0"
-      }
-    },
     "chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz",
@@ -6575,14 +6483,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6602,8 +6508,7 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -6751,7 +6656,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -14503,9 +14407,9 @@
       }
     },
     "webpack": {
-      "version": "4.41.4",
+      "version": "4.41.5",
-      "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.4.tgz?cache=0&sync_timestamp=1576740705108&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.41.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.5.tgz",
-      "integrity": "sha1-S+xBJSJL31DvqL5iJsGQR1mc0DQ=",
+      "integrity": "sha1-MhDxiGvOUxDmK7lyBNGMJjNBt3w=",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
--- a/package.json
查看文件 @627d449
+++ b/package.json
查看文件 @627d449
@@ -109,7 +109,7 @@
     "babel-eslint": "^9.0.0",
     "babel-loader": "^8.0.6",
     "babel-minify-webpack-plugin": "^0.3.1",
-    "cfonts": "^2.4.5",
+    "cfonts": "^2.4.8",
     "chalk": "^3.0.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
@@ -146,7 +146,7 @@
     "vue-loader": "^15.8.3",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.11",
-    "webpack": "^4.41.4",
+    "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",
     "webpack-dev-server": "^3.10.1",
     "webpack-hot-middleware": "^2.25.0",