aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into update-dependencies

Browse source
This commit is contained in:
Yuya Ochiai 2016-12-22 23:01:04 +09:00 committed by GitHub
parent 13308f294c 77e9ba0a32
commit 4376618ef8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1,2 +0,0 @@
# All text files should have LF regardless of core.autocrlf
* text eol=lf

8
package.json
View file

@ -19,15 +19,16 @@
"scripts": {
"install": "cd src && npm install",
"postinstall": "npm run build",
"build": "npm run build:main && npm run build:renderer && gulp build",
"build": "npm-run-all build:*",
"build:main": "cross-env NODE_ENV=production webpack --config webpack.config.main.js",
"build:renderer": "cross-env NODE_ENV=production webpack --config webpack.config.renderer.js",
"build:others": "gulp build",
"start": "electron dist",
"watch": "gulp watch",
"serve": "gulp watch",
"test": "npm run build && npm run test:app && npm run lint:js",
"test": "npm-run-all build test:* lint:*",
"test:app": "mocha --reporter mocha-circleci-reporter --recursive test/specs",
"package:all": "npm run package:windows && npm run package:mac && npm run package:linux",
"package:all": "npm-run-all package:windows package:mac package:linux",
"package:windows": "build --win --x64 --ia32 --em.name=mattermost && npm run manipulate-windows-zip",
"package:mac": "build --mac --x64 --ia32",
"package:linux": "build --linux --x64 --ia32 --em.name=mattermost-desktop",
@ -55,6 +56,7 @@
"json-loader": "^0.5.4",
"mocha": "^3.2.0",
"mocha-circleci-reporter": "0.0.2",
"npm-run-all": "^3.1.2",
"spectron": "~3.4.1",
"webpack": "^1.14.0",
"webpack-merge": "^1.1.2"