张恒

更新electron和webpack

...@@ -2999,7 +2999,7 @@ ...@@ -2999,7 +2999,7 @@
2999 }, 2999 },
3000 "qs": { 3000 "qs": {
3001 "version": "6.7.0", 3001 "version": "6.7.0",
3002 - "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1569207136481&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz", 3002 + "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1566009952956&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz",
3003 "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=", 3003 "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
3004 "dev": true 3004 "dev": true
3005 } 3005 }
...@@ -4902,9 +4902,9 @@ ...@@ -4902,9 +4902,9 @@
4902 "dev": true 4902 "dev": true
4903 }, 4903 },
4904 "electron": { 4904 "electron": {
4905 - "version": "6.0.12", 4905 + "version": "6.1.0",
4906 - "resolved": "https://registry.npm.taobao.org/electron/download/electron-6.0.12.tgz", 4906 + "resolved": "https://registry.npm.taobao.org/electron/download/electron-6.1.0.tgz?cache=0&sync_timestamp=1571709934231&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-6.1.0.tgz",
4907 - "integrity": "sha1-hb8AYeMvZgJWz96VSI8ct1JTvJQ=", 4907 + "integrity": "sha1-+BY0fMCyHLIxuCmkulEz+/u74QA=",
4908 "dev": true, 4908 "dev": true,
4909 "requires": { 4909 "requires": {
4910 "@types/node": "^10.12.18", 4910 "@types/node": "^10.12.18",
...@@ -4913,9 +4913,9 @@ ...@@ -4913,9 +4913,9 @@
4913 }, 4913 },
4914 "dependencies": { 4914 "dependencies": {
4915 "@types/node": { 4915 "@types/node": {
4916 - "version": "10.14.21", 4916 + "version": "10.14.22",
4917 - "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.21.tgz", 4917 + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.22.tgz",
4918 - "integrity": "sha1-Sp237x0WccABXmMsX6PUbIbFjB4=", 4918 + "integrity": "sha1-NLzfa2y1/A2zPSSBatnT7OIv7qQ=",
4919 "dev": true 4919 "dev": true
4920 } 4920 }
4921 } 4921 }
...@@ -14191,9 +14191,9 @@ ...@@ -14191,9 +14191,9 @@
14191 } 14191 }
14192 }, 14192 },
14193 "webpack": { 14193 "webpack": {
14194 - "version": "4.41.1", 14194 + "version": "4.41.2",
14195 - "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.1.tgz", 14195 + "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.2.tgz",
14196 - "integrity": "sha1-U4jdMEfWgNXTgqhCSf1HUOhzcv0=", 14196 + "integrity": "sha1-w07Hbao6hGjJthpQM22OMwPc504=",
14197 "dev": true, 14197 "dev": true,
14198 "requires": { 14198 "requires": {
14199 "@webassemblyjs/ast": "1.8.5", 14199 "@webassemblyjs/ast": "1.8.5",
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 "pack": "npm run pack:main && npm run pack:renderer", 17 "pack": "npm run pack:main && npm run pack:renderer",
18 "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js", 18 "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
19 "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js", 19 "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
20 - "update:serve":"node server/index.js" 20 + "update:serve": "node server/index.js"
21 }, 21 },
22 "build": { 22 "build": {
23 "publish": [ 23 "publish": [
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 "cross-env": "^6.0.3", 111 "cross-env": "^6.0.3",
112 "css-loader": "^3.1.0", 112 "css-loader": "^3.1.0",
113 "del": "^5.0.0", 113 "del": "^5.0.0",
114 - "electron": "^6.0.12", 114 + "electron": "^6.1.0",
115 "electron-builder": "^21.2.0", 115 "electron-builder": "^21.2.0",
116 "electron-devtools-installer": "^2.2.4", 116 "electron-devtools-installer": "^2.2.4",
117 "eslint": "^6.5.1", 117 "eslint": "^6.5.1",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 "vue-loader": "^15.7.1", 141 "vue-loader": "^15.7.1",
142 "vue-style-loader": "^4.1.2", 142 "vue-style-loader": "^4.1.2",
143 "vue-template-compiler": "^2.6.10", 143 "vue-template-compiler": "^2.6.10",
144 - "webpack": "^4.41.1", 144 + "webpack": "^4.41.2",
145 "webpack-cli": "^3.3.9", 145 "webpack-cli": "^3.3.9",
146 "webpack-dev-server": "^3.8.2", 146 "webpack-dev-server": "^3.8.2",
147 "webpack-hot-middleware": "^2.25.0", 147 "webpack-hot-middleware": "^2.25.0",
......