Merge branch 'master' of github.com:phanan/koel

This commit is contained in:
An Phan 2017-03-21 12:15:58 +08:00
commit 1b1d7adc50
No known key found for this signature in database
GPG key ID: 05536BB4BCDC02A2

View file

@ -48,7 +48,7 @@
"babel-runtime": "^6.22.0", "babel-runtime": "^6.22.0",
"chai": "^3.4.1", "chai": "^3.4.1",
"chalk": "^1.1.3", "chalk": "^1.1.3",
"cross-env": "^3.1.4", "cross-env": "^3.2.3",
"eslint": "^3.10.2", "eslint": "^3.10.2",
"eslint-config-vue": "^2.0.1", "eslint-config-vue": "^2.0.1",
"eslint-plugin-vue": "^1.0.0", "eslint-plugin-vue": "^1.0.0",
@ -62,9 +62,9 @@
"scripts": { "scripts": {
"postinstall": "yarn build", "postinstall": "yarn build",
"test": "eslint resources/assets/js --ext=js,vue && mocha --compilers js:babel-register --require resources/assets/js/tests/helper.js resources/assets/js/tests/**/*Test.js", "test": "eslint resources/assets/js --ext=js,vue && mocha --compilers js:babel-register --require resources/assets/js/tests/helper.js resources/assets/js/tests/**/*Test.js",
"dev": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules", "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules",
"watch": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules", "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules",
"hot": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot",
"build": "node node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules" "build": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules"
} }
} }