fix: conflict

This commit is contained in:
kunkka 2020-10-27 01:33:39 +08:00
commit 3904670fae
3 changed files with 123 additions and 1 deletions

View file

@ -10,7 +10,11 @@
"electron:serve": "vue-cli-service electron:serve",
"postinstall": "electron-builder install-app-deps",
"postuninstall": "electron-builder install-app-deps",
"prettier": "npx prettier --write ./src"
"prettier": "npx prettier --write ./src",
"napi_run": "cd ./NeteaseCloudMusicApi-master && npm run start",
"napi_pull": "node script/setup.js v3.45.1",
"napi_install": "cd ./NeteaseCloudMusicApi-master && npm install",
"setup": "npm run napi_pull && npm run napi_install"
},
"main": "background.js",
"dependencies": {
@ -24,6 +28,7 @@
"electron-is-dev": "^1.2.0",
"electron-log": "^4.2.4",
"electron-updater": "^4.3.5",
"extract-zip": "^2.0.1",
"howler": "^2.2.0",
"js-cookie": "^2.2.1",
"nprogress": "^0.2.0",