Use pull request #11444 from aorinevo/I-11443_develop_AN_gulp_fix for v6.5.0

d0f405400 fix: i11443 gulp watch
c90c048cc fix: prevent "test:reload" task to block future reloads

Co-Authored-By: Nicolas Coden <nicolas@ncoden.fr>
Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index 4b0940e37dc0dc9c90f6dab165b22ec8ddefe9af..dfa89c0b27530012c47be215f9f4464cc3241025 100644 (file)
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -24,8 +24,9 @@ gulp.task('test:watch', function () {
   gulp.watch(['test/visual/**/*'], gulp.series('test:reload'));
 });
 
-gulp.task('test:reload', function() {
+gulp.task('test:reload', function(done) {
   browser.reload();
+  done();
 });
 
 gulp.task('test:transpile-js', gulp.series('javascript:foundation', 'javascript:deps', function () {

diff --git a/gulpfile.js b/gulpfile.js
index 319e1fe35c28137d70effaa2596a60232ca6a9ef..e8dee1bd2b12163672dfd3c0f65cdd9404c1cb7e 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,22 +9,28 @@ gulp.registry(forwardReference());
 
 requireDir('./gulp/tasks');
 
+function browserReloadSync(done) {
+  browser.reload();
+  done();
+}
+
 // Builds the documentation and framework files
 gulp.task('build', gulp.series('clean', 'copy', 'sass', 'javascript', 'docs:all'));
 
 // Starts a BrowerSync instance
-gulp.task('serve', gulp.series('build', function(){
+gulp.task('serve', gulp.series('build', function(done){
   browser.init({server: './_build', port: port});
+  done();
 }));
 
 // Watch files for changes
 gulp.task('watch', function() {
-  gulp.watch('docs/**/*', gulp.series('docs', browser.reload));
-  gulp.watch(['docs/layout/*.html', 'docs/partials/*{html,hbs}', 'docs/assets/partials/*{html,hbs}', 'node_modules/foundation-docs/templates/*{html,hbs}'], gulp.series('docs:all', browser.reload));
-  gulp.watch('scss/**/*', gulp.series('sass', browser.reload));
-  gulp.watch(['docs/assets/scss/**/*', 'node_modules/foundation-docs/scss/**/*'], gulp.series('sass:docs', browser.reload));
-  gulp.watch('js/**/*', gulp.series('javascript:foundation', browser.reload));
-  gulp.watch(['docs/assets/js/**/*', 'node_modules/foundation-docs/js/**/*'], gulp.series('javascript:docs', browser.reload));
+  gulp.watch('docs/**/*', gulp.series('docs', browserReloadSync));
+  gulp.watch(['docs/layout/*.html', 'docs/partials/*{html,hbs}', 'docs/assets/partials/*{html,hbs}', 'node_modules/foundation-docs/templates/*{html,hbs}'], gulp.series('docs:all', browserReloadSync));
+  gulp.watch('scss/**/*', gulp.series('sass', browserReloadSync));
+  gulp.watch(['docs/assets/scss/**/*', 'node_modules/foundation-docs/scss/**/*'], gulp.series('sass:docs', browserReloadSync));
+  gulp.watch('js/**/*', gulp.series('javascript:foundation', browserReloadSync));
+  gulp.watch(['docs/assets/js/**/*', 'node_modules/foundation-docs/js/**/*'], gulp.series('javascript:docs', browserReloadSync));
 });
 
 // Runs all of the above tasks and then waits for files to change