Merge branch 'master' of github.com:wakatime/chrome-wakatime

This commit is contained in:
Mario Basic
2015-07-13 09:47:10 +02:00
2 changed files with 22 additions and 3 deletions

View File

@@ -1,5 +1,22 @@
var del = require('del');
var gulp = require('gulp');
var elixir = require('laravel-elixir'); var elixir = require('laravel-elixir');
/*
|--------------------------------------------------------------------------
| Pre-defined Gulp Tasks
|--------------------------------------------------------------------------
|
| Tasks outside the scope of Elixir can be predefined before setting it up.
|
*/
gulp.task('postinstall', function (cb) {
// .pem files cause Chrome to show a bunch of warnings
//so we remove them on postinstall
del('node_modules/**/*.pem', cb);
});
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Elixir Asset Management | Elixir Asset Management

View File

@@ -1,10 +1,11 @@
{ {
"scripts": { "scripts": {
"test": "jest && mocha --compilers js:mocha-traceur tests/**/*.spec.js", "test": "jest --verbose --coverage && mocha --compilers js:mocha-traceur tests/**/*.spec.js",
"test-react": "jest", "test-react": "jest --verbose --coverage",
"test-js": "mocha --compilers js:mocha-traceur tests/**/*.spec.js", "test-js": "mocha --compilers js:mocha-traceur tests/**/*.spec.js",
"start": "npm install && bower install && gulp", "start": "npm install && bower install && gulp",
"lint": "jsxhint --jsx-only ." "lint": "jsxhint --jsx-only .",
"postinstall": "gulp postinstall"
}, },
"pre-commit": [ "pre-commit": [
"lint" "lint"
@@ -22,6 +23,7 @@
"devDependencies": { "devDependencies": {
"bower": "^1.4.1", "bower": "^1.4.1",
"chai": "^3.0.0", "chai": "^3.0.0",
"del": "^1.2.0",
"gulp": "^3.8.8", "gulp": "^3.8.8",
"jest-cli": "^0.4.12", "jest-cli": "^0.4.12",
"jshint": "^2.8.0", "jshint": "^2.8.0",