Merge pull request #911 from GitAngel/fix/909

Fix for bugs #909 and #660

Author: Swiip

docs/recipes/environment-specific-build.md

@@ -54,7 +54,7 @@ module.exports = function(options) {
     return gulp.src(options.src + '/app/**/*.js')
       .pipe($.eslint())
       .pipe($.eslint.format())
-      .pipe(browserSync.reload({ stream: true }))
+      .pipe(browserSync.stream())
       .pipe($.size());
   });
 };

generators/app/templates/gulp/_inject.js

@@ -9,6 +9,8 @@ var $ = require('gulp-load-plugins')();
 var wiredep = require('wiredep').stream;
 var _ = require('lodash');
 
+var browserSync = require('browser-sync');
+
 gulp.task('inject-reload', ['inject'], function() {
   browserSync.reload();
 });

generators/app/templates/gulp/_markups.js

@@ -23,5 +23,5 @@ gulp.task('markups', function() {
 <% } -%>
     .pipe($.rename(renameToHtml))
     .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/')))
-    .pipe(browserSync.reload({ stream: true }));
+    .pipe(browserSync.stream());
 });

generators/app/templates/gulp/_scripts.js

@@ -11,12 +11,18 @@ var webpack = require('webpack-stream');
 
 var $ = require('gulp-load-plugins')();
 
-gulp.task('scripts-reload', ['scripts'], function() {
-  browserSync.reload();
-});
 
 <% if (props.jsPreprocessor.srcExtension !== 'es6' && props.jsPreprocessor.key !== 'typescript') { -%>
-gulp.task('scripts', function () {
+gulp.task('scripts-reload', function() {
+  return buildScripts()
+    .pipe(browserSync.stream());
+});
+
+gulp.task('scripts', function() {
+  return buildScripts();
+});
+
+function buildScripts() {
   return gulp.src(path.join(conf.paths.src, '/app/**/*.<%- props.jsPreprocessor.extension %>'))
 <%   if (props.jsPreprocessor.extension === 'js') { -%>
     .pipe($.eslint())
@@ -32,7 +38,7 @@ gulp.task('scripts', function () {
     .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app')))
 <%   } -%>
     .pipe($.size())
-});
+};
 <% } else { -%>
 function webpackWrapper(watch, test, callback) {
   var webpackOptions = {

generators/app/templates/gulp/_styles.js

@@ -12,10 +12,15 @@ var wiredep = require('wiredep').stream;
 var _ = require('lodash');
 
 gulp.task('styles-reload', ['styles'], function() {
-  browserSync.reload();
+  return buildStyles()
+    .pipe(browserSync.stream());
 });
 
-gulp.task('styles', function () {
+gulp.task('styles', function() {
+  return buildStyles();
+});
+
+var buildStyles = function() {
 <% if (props.cssPreprocessor.key === 'less') { -%>
   var lessOptions = {
     options: [
@@ -72,4 +77,4 @@ gulp.task('styles', function () {
     .pipe(cssFilter.restore)
 <% } -%>
     .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/')));
-});
+};