From 8d4b4de69132dda79f4a8896629a31b194f93207 Mon Sep 17 00:00:00 2001
From: Joe Maller <joe@joemaller.com>
Date: Wed, 6 May 2015 09:52:34 -0400
Subject: [PATCH 1/2] update BrowserSync to latest

---
 gulpfile.js  | 8 +++-----
 package.json | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 824439fc72..ea4f7f72e4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,7 @@
 // ## Globals
 var argv         = require('minimist')(process.argv.slice(2));
 var autoprefixer = require('gulp-autoprefixer');
-var browserSync  = require('browser-sync');
+var browserSync  = require('browser-sync').create();
 var changed      = require('gulp-changed');
 var concat       = require('gulp-concat');
 var flatten      = require('gulp-flatten');
@@ -143,9 +143,7 @@ var jsTasks = function(filename) {
 var writeToManifest = function(directory) {
   return lazypipe()
     .pipe(gulp.dest, path.dist + directory)
-    .pipe(function() {
-      return gulpif('**/*.{js,css}', browserSync.reload({stream:true}));
-    })
+    .pipe(browserSync.stream, {match: '**/*.{js,css}'})
     .pipe(rev.manifest, revManifest, {
       base: path.dist,
       merge: true
@@ -235,7 +233,7 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
 // build step for that asset and inject the changes into the page.
 // See: http://www.browsersync.io
 gulp.task('watch', function() {
-  browserSync({
+  browserSync.init({
     files: [path.dist, '{lib,templates}/**/*.php', '*.php'],
     proxy: config.devUrl,
     snippetOptions: {
diff --git a/package.json b/package.json
index 0dc492f488..10c17a0058 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "asset-builder": "^1.0.2",
-    "browser-sync": "2.5.0",
+    "browser-sync": "^2.7.1",
     "del": "^1.1.1",
     "gulp": "^3.8.11",
     "gulp-autoprefixer": "^2.1.0",

From e0cce8ff9de936e78cade784be3c9a17f1cfae8d Mon Sep 17 00:00:00 2001
From: Joe Maller <joe@joemaller.com>
Date: Wed, 6 May 2015 21:39:30 -0400
Subject: [PATCH 2/2] BrowserSync task stream reloading

See https://github.com/roots/sage/pull/1457#issuecomment-99560449
This is option 2.
---
 gulpfile.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index ea4f7f72e4..613d101e92 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -196,7 +196,8 @@ gulp.task('scripts', ['jshint'], function() {
 gulp.task('fonts', function() {
   return gulp.src(globs.fonts)
     .pipe(flatten())
-    .pipe(gulp.dest(path.dist + 'fonts'));
+    .pipe(gulp.dest(path.dist + 'fonts'))
+    .pipe(browserSync.stream());
 });
 
 // ### Images
@@ -208,7 +209,8 @@ gulp.task('images', function() {
       interlaced: true,
       svgoPlugins: [{removeUnknownsAndDefaults: false}]
     }))
-    .pipe(gulp.dest(path.dist + 'images'));
+    .pipe(gulp.dest(path.dist + 'images'))
+    .pipe(browserSync.stream());
 });
 
 // ### JSHint
@@ -234,7 +236,7 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
 // See: http://www.browsersync.io
 gulp.task('watch', function() {
   browserSync.init({
-    files: [path.dist, '{lib,templates}/**/*.php', '*.php'],
+    files: ['{lib,templates}/**/*.php', '*.php'],
     proxy: config.devUrl,
     snippetOptions: {
       whitelist: ['/wp-admin/admin-ajax.php'],