提升electron版本至6.1.0

张恒
package-lock.json
package.json
--- a/package-lock.json
查看文件 @aa0b89b
+++ b/package-lock.json
查看文件 @aa0b89b
@@ -5270,9 +5270,9 @@
       "dev": true
     },
     "electron": {
-      "version": "5.0.11",
+      "version": "6.1.0",
-      "resolved": "https://registry.npm.taobao.org/electron/download/electron-5.0.11.tgz",
+      "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",
-      "integrity": "sha1-dk60YKqE+/yz3DA4X1+VCctyR1E=",
+      "integrity": "sha1-+BY0fMCyHLIxuCmkulEz+/u74QA=",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",
@@ -5281,9 +5281,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "10.14.19",
+          "version": "10.14.22",
-          "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.19.tgz?cache=0&sync_timestamp=1569481053118&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.19.tgz",
+          "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",
-          "integrity": "sha1-9SdCx4NKgV3t9m7fyKUVR+Kmc0I=",
+          "integrity": "sha1-NLzfa2y1/A2zPSSBatnT7OIv7qQ=",
           "dev": true
         }
       }
@@ -16976,7 +16976,7 @@
     },
     "watchpack": {
       "version": "1.6.0",
-      "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz?cache=0&sync_timestamp=1571664775955&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.6.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.6.0.tgz",
       "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=",
       "dev": true,
       "requires": {
@@ -17092,7 +17092,7 @@
       "dependencies": {
         "acorn": {
           "version": "6.3.0",
-          "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz",
           "integrity": "sha1-AIdQkRn/pPwKAEHR6TpBfmjLhW4=",
           "dev": true
         },
@@ -17139,7 +17139,7 @@
         },
         "cacache": {
           "version": "12.0.3",
-          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.3.tgz",
           "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=",
           "dev": true,
           "requires": {
@@ -17517,7 +17517,7 @@
         },
         "schema-utils": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1571141316329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1569583621807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
           "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
           "dev": true,
           "requires": {
--- a/package.json
查看文件 @aa0b89b
+++ b/package.json
查看文件 @aa0b89b
@@ -6,22 +6,26 @@
   "license": "MIT",
   "main": "./dist/electron/main.js",
   "scripts": {
+    "dev": "node .electron-vue/dev-runner.js",
     "build": "node .electron-vue/build.js && electron-builder",
     "build:win32": "node .electron-vue/build.js && electron-builder --win  --ia32",
     "build:win64": "node .electron-vue/build.js && electron-builder --win  --x64",
-    "build:mac": "node .electron-vue/build.js && electron-builder --platform=mac",
+    "build:mac": "node .electron-vue/build.js && electron-builder --mac",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
     "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
-    "dev": "node .electron-vue/dev-runner.js",
-    "e2e": "npm run pack && mocha test/e2e",
     "pack": "npm run pack:main && npm run pack:renderer",
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
+    "e2e": "npm run pack && mocha test/e2e",
     "test": "npm run unit && npm run e2e",
     "unit": "karma start test/unit/karma.conf.js"
   },
   "build": {
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true
+    },
     "productName": "electron-vue-admin",
     "appId": "org.simulatedgreg.electron-vue",
     "directories": {
@@ -90,10 +94,10 @@
     "css-loader": "^3.1.0",
     "del": "^5.0.0",
     "devtron": "^1.4.0",
-    "electron": "^5.0.11",
+    "electron": "^6.1.0",
-    "electron-builder": "^21.1.1",
+    "electron-builder": "^21.2.0",
-    "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
+    "electron-debug": "^3.0.1",
     "eslint": "^4.19.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-friendly-formatter": "^4.0.1",
@@ -134,6 +138,6 @@
     "webpack-cli": "^3.3.9",
     "webpack-dev-server": "^3.8.2",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.1"
+    "webpack-merge": "^4.2.2"
   }
 }