Merge branch 'master' into remove-npm
This commit is contained in:
commit
1598704df7
3 changed files with 679 additions and 874 deletions
|
@ -64,6 +64,6 @@
|
|||
"nsis": {
|
||||
"perMachine": true
|
||||
},
|
||||
"artifactName": "${productName}_${version}",
|
||||
"artifactName": "${productName}_${version}.${ext}",
|
||||
"beforeBuild": "./build/checkDaemonPlatform.js"
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
"bluebird": "^3.5.1",
|
||||
"classnames": "^2.2.5",
|
||||
"country-data": "^0.0.31",
|
||||
"electron-dl": "^1.6.0",
|
||||
"electron-dl": "^1.11.0",
|
||||
"electron-is-dev": "^0.3.0",
|
||||
"electron-log": "^2.2.12",
|
||||
"electron-publisher-s3": "^20.2.0",
|
||||
|
@ -44,7 +44,6 @@
|
|||
"formik": "^0.10.4",
|
||||
"from2": "^2.3.0",
|
||||
"install": "^0.10.2",
|
||||
"jayson": "^2.0.2",
|
||||
"jshashes": "^1.0.7",
|
||||
"keytar-prebuild": "4.0.4",
|
||||
"localforage": "^1.5.0",
|
||||
|
@ -60,7 +59,6 @@
|
|||
"react-redux": "^5.0.3",
|
||||
"react-simplemde-editor": "^3.6.11",
|
||||
"redux": "^3.6.0",
|
||||
"redux-action-buffer": "^1.1.0",
|
||||
"redux-logger": "^3.0.1",
|
||||
"redux-persist": "^4.8.0",
|
||||
"redux-persist-transform-compress": "^4.2.0",
|
||||
|
@ -99,7 +97,7 @@
|
|||
"eslint-plugin-prettier": "^2.6.0",
|
||||
"eslint-plugin-react": "^7.7.0",
|
||||
"flow-babel-webpack-plugin": "^1.1.1",
|
||||
"flow-bin": "^0.66.0",
|
||||
"flow-bin": "^0.68.0",
|
||||
"flow-typed": "^2.3.0",
|
||||
"husky": "^0.14.3",
|
||||
"i18n-extract": "^0.5.1",
|
||||
|
|
Loading…
Reference in a new issue