From 88f8a2a3754e6ab72dc4a9b99c8882663059fd96 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 19:09:51 -0600 Subject: [PATCH 1/6] Swap out gulp-clean for rimraf --- package.json | 2 +- tasks/gulp-sprites.js | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a3fc0957cc..5334ea64c5 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "grunt-hashres": "~0.4.1", "grunt-karma": "~0.6.2", "gulp": "^3.9.0", - "gulp-clean": "^0.3.1", "gulp-eslint": "^1.0.0", "gulp-grunt": "^0.5.2", "gulp-imagemin": "^2.3.0", @@ -122,6 +121,7 @@ "mongoskin": "~0.6.1", "protractor": "~2.0.0", "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'], () => { From 05ae419d7eca762078a37779e96431f18911ee92 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 19:56:09 -0600 Subject: [PATCH 2/6] Update karma dependencies and remove unused packages. --- package.json | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 5334ea64c5..fef3d58251 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "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-eslint": "^1.0.0", "gulp-grunt": "^0.5.2", @@ -101,20 +101,12 @@ "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", "mocha": "^2.3.3", "mongodb": "^2.0.46", From b6a1414e1c923625ce0940ba18e0bcbad916ec88 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 20:09:36 -0600 Subject: [PATCH 3/6] Update npm to v2 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdbbc2c781..a92e4b8468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - '0.10' before_install: + - "npm install -g npm@2" - "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 +13,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" From f137e0d41da824a0f076be5a4d1950424670c3b6 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 20:16:32 -0600 Subject: [PATCH 4/6] Add gulp to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a92e4b8468..a5ff61b605 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ node_js: - '0.10' 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" From a6c7e3b885b82f8023c39f0719998978ab8b68d9 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 20:31:28 -0600 Subject: [PATCH 5/6] Update protractor dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fef3d58251..c6047b400d 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "mocha": "^2.3.3", "mongodb": "^2.0.46", "mongoskin": "~0.6.1", - "protractor": "~2.0.0", + "protractor": "~2.5.1", "rewire": "^2.3.3", "rimraf": "^2.4.3", "shelljs": "^0.4.0", From 598d25dc48e5374b81cf8ad2f3b9d92a58cffdac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 7 Nov 2015 20:56:56 -0600 Subject: [PATCH 6/6] Update browserify package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6047b400d..edacdb51bd 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "babel": "^5.5.4", "gulp-babel": "^5.2.1", "bower": "~1.3.12", - "browserify": "~3.30.2", + "browserify": "~12.0.1", "coffee-script": "1.6.x", "coffeeify": "0.6.0", "connect-ratelimit": "0.0.7",