diff --git a/.travis.yml b/.travis.yml index 833c5834aa..8419a792f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: node_js node_js: - '4.2' before_install: + - "npm install -g npm@2" + - "npm install -g gulp" - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10" - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list" - "sudo apt-get update" @@ -12,4 +14,4 @@ before_script: - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done" - "export DISPLAY=:99" after_script: - - "./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js" \ No newline at end of file + - "./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js" diff --git a/package.json b/package.json index ba6d1d5edf..53b5620478 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "babel": "^5.5.4", "body-parser": "^1.14.1", "bower": "~1.3.12", - "browserify": "~3.30.2", + "browserify": "~12.0.1", "coffee-script": "1.6.x", "coffeeify": "0.6.0", "compression": "^1.6.0", @@ -37,10 +37,9 @@ "grunt-contrib-uglify": "~0.6.0", "grunt-contrib-watch": "~0.6.1", "grunt-hashres": "~0.4.1", - "grunt-karma": "~0.6.2", + "grunt-karma": "~0.12.1", "gulp": "^3.9.0", "gulp-babel": "^5.2.1", - "gulp-clean": "^0.3.1", "gulp-eslint": "^1.0.0", "gulp-grunt": "^0.5.2", "gulp-imagemin": "^2.3.0", @@ -108,28 +107,20 @@ "event-stream": "^3.2.2", "expect.js": "~0.2.0", "istanbul": "^0.3.14", - "karma": "~0.10.2", - "karma-chai-plugins": "~0.1.0", - "karma-chrome-launcher": "~0.1.0", - "karma-coffee-preprocessor": "~0.1.0", - "karma-coverage": "^0.3.1", - "karma-firefox-launcher": "~0.1.0", - "karma-html2js-preprocessor": "~0.1.0", - "karma-jasmine": "~0.1.3", + "karma": "~0.13.15", + "karma-chai-plugins": "~0.6.0", + "karma-coverage": "^0.5.3", "karma-mocha": "^0.2.0", "karma-mocha-reporter": "^1.1.1", - "karma-ng-html2js-preprocessor": "~0.1.0", - "karma-phantomjs-launcher": "~0.1.0", - "karma-requirejs": "~0.2.0", - "karma-script-launcher": "~0.1.0", + "karma-phantomjs-launcher": "~0.2.1", "lcov-result-merger": "^1.0.2", "lodash.defaultsdeep": "^3.10.0", "mocha": "^2.3.3", "mongodb": "^2.0.46", "mongoskin": "~0.6.1", - "protractor": "~2.0.0", - "requirejs": "~2.1", + "protractor": "~2.5.1", "rewire": "^2.3.3", + "rimraf": "^2.4.3", "shelljs": "^0.4.0", "sinon": "^1.17.2", "sinon-chai": "^2.8.0", diff --git a/tasks/gulp-sprites.js b/tasks/gulp-sprites.js index a5777af9ce..18c289f47c 100644 --- a/tasks/gulp-sprites.js +++ b/tasks/gulp-sprites.js @@ -1,7 +1,7 @@ import gulp from 'gulp'; import imagemin from 'gulp-imagemin'; import spritesmith from 'gulp.spritesmith'; -import clean from 'gulp-clean'; +import clean from 'rimraf'; import sizeOf from 'image-size'; import mergeStream from 'merge-stream'; import {basename} from 'path'; @@ -25,10 +25,7 @@ gulp.task('sprites:largeSprites', () => { }); gulp.task('sprites:clean', (done) => { - gulp.src(`${DIST_PATH}spritesmith*`) - .pipe(clean()); - - done(); + clean(`${DIST_PATH}spritesmith*`, done); }); gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSprites'], () => {