Update dependencies

Update dependencies to bring theme up to date with Sage 8.5 (minus
Bootstrap 4).

Should enable use of Node versions >= v6 and eliminate
issues with deployments via deploybot

* Update gulp-imagemin options
* ([roots#1839](roots#1839))
* Add error handling to `scripts` and `styles` gulp tasks
* ([roots#1832](roots#1832))
* Update dependencies

.gitignore

@@ -5,3 +5,4 @@ bower_components
 node_modules
 npm-debug.log
 vendor
+.DS_Store

.travis.yml

@@ -7,6 +7,9 @@ php:
   - 5.4
   - hhvm
 
+env:
+  - TRAVIS_NODE_VERSION="4"
+
 matrix:
   allow_failures:
     - php: nightly
@@ -17,6 +20,8 @@ cache:
     - node_modules
 
 install:
+  - nvm install $TRAVIS_NODE_VERSION
+  - nvm use $TRAVIS_NODE_VERSION
   - npm install -g npm@latest
   - npm install -g bower gulp jscs
   - npm install

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 8.4.2.1: March 7th, 2017
+* Update gulp-imagemin options ([#1839](https://github.com/roots/sage/pull/1839))
+* Add error handling to `scripts` and `styles` gulp tasks ([#1832](https://github.com/roots/sage/pull/1832))
+* Update dependencies
+
 ### 8.4.2: February 19th, 2016
 * Add Composer vendor directory to gitignore ([#1618](https://github.com/roots/sage/issues/1618))
 * Fix build test by removing trailing space ([#1617](https://github.com/roots/sage/issues/1617))

bower.json

@@ -7,7 +7,7 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "bootstrap-sass": "3.3.6",
+    "bootstrap-sass": "3.3.7",
     "slick-carousel": "^1.6.0",
     "font-awesome": "^4.7.0",
     "fitvids": "^1.2.0"

gulpfile.js

@@ -67,6 +67,12 @@ var enabled = {
 // Path to the compiled assets manifest in the dist directory
 var revManifest = path.dist + 'assets.json';
 
+// Error checking; produce an error rather than crashing.
+var onError = function(err) {
+  console.log(err.toString());
+  this.emit('end');
+};
+
 // ## Reusable Pipelines
 // See https://github.com/OverZealous/lazypipe
 
@@ -177,6 +183,7 @@ gulp.task('styles', ['wiredep'], function() {
       });
     }
     merged.add(gulp.src(dep.globs, {base: 'styles'})
+      .pipe(plumber({errorHandler: onError}))
       .pipe(cssTasksInstance));
   });
   return merged
@@ -191,6 +198,7 @@ gulp.task('scripts', ['jshint'], function() {
   manifest.forEachDependency('js', function(dep) {
     merged.add(
       gulp.src(dep.globs, {base: 'scripts'})
+        .pipe(plumber({errorHandler: onError}))
         .pipe(jsTasks(dep.name))
     );
   });
@@ -212,11 +220,11 @@ gulp.task('fonts', function() {
 // `gulp images` - Run lossless compression on all the images.
 gulp.task('images', function() {
   return gulp.src(globs.images)
-    .pipe(imagemin({
-      progressive: true,
-      interlaced: true,
-      svgoPlugins: [{removeUnknownsAndDefaults: false}, {cleanupIDs: false}]
-    }))
+    .pipe(imagemin([
+      imagemin.jpegtran({progressive: true}),
+      imagemin.gifsicle({interlaced: true}),
+      imagemin.svgo({plugins: [{removeUnknownsAndDefaults: false}, {cleanupIDs: false}]})
+    ]))
     .pipe(gulp.dest(path.dist + 'images'))
     .pipe(browserSync.stream());
 });
@@ -263,9 +271,9 @@ gulp.task('watch', function() {
 // Generally you should be running `gulp` instead of `gulp build`.
 gulp.task('build', function(callback) {
   runSequence('styles',
-              'scripts',
-              ['fonts', 'images'],
-              callback);
+    'scripts',
+    ['fonts', 'images'],
+    callback);
 });
 
 // ### Wiredep

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sage",
-  "version": "8.4.2",
+  "version": "8.5.1",
   "author": "Ben Word <ben@benword.com>",
   "homepage": "https://roots.io/sage/",
   "private": true,