From e1207c6678f12ba5c270ed6847329dcad1645edb Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 29 Mar 2016 14:44:16 -0300
Subject: [PATCH] Allow themes to override templates

---
 gulp/build.js  |  9 +++++----
 gulp/server.js |  6 +++++-
 gulp/watch.js  |  6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gulp/build.js b/gulp/build.js
index 4d7e466..ea7ec80 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -10,10 +10,11 @@ var $ = require('gulp-load-plugins')({
 });
 
 gulp.task('partials', function () {
-  return gulp.src([
-    path.join(conf.paths.src, '/app/**/*.html'),
-    path.join(conf.paths.tmp, '/serve/app/**/*.html')
-  ])
+  var srcPaths = [path.join(conf.paths.tmp, '/serve/app/**/*.html')];
+  conf.paths.allSources.forEach(function(src) {
+    srcPaths.push(path.join(src, '/app/**/*.html'));
+  });
+  return gulp.src(srcPaths)
     .pipe($.minifyHtml({
       empty: true,
       spare: true,
diff --git a/gulp/server.js b/gulp/server.js
index 58045a0..2ff6495 100644
--- a/gulp/server.js
+++ b/gulp/server.js
@@ -46,7 +46,11 @@ browserSync.use(browserSyncSpa({
 }));
 
 gulp.task('serve', ['watch'], function () {
-  browserSyncInit([path.join(conf.paths.tmp, '/serve'), conf.paths.src]);
+  var srcPaths = [path.join(conf.paths.tmp, '/serve')];
+  conf.paths.allSources.reverse().forEach(function(src) {
+    srcPaths.push(src);
+  });
+  browserSyncInit(srcPaths);
 });
 
 gulp.task('serve:dist', ['build'], function () {
diff --git a/gulp/watch.js b/gulp/watch.js
index ba33712..174ed07 100644
--- a/gulp/watch.js
+++ b/gulp/watch.js
@@ -33,7 +33,11 @@ gulp.task('watch', ['inject'], function () {
     }
   });
 
-  gulp.watch(path.join(conf.paths.src, '/app/**/*.html'), function(event) {
+  var watchPaths = [];
+  conf.paths.allSources.forEach(function(src) {
+    watchPaths.push(path.join(src, '/app/**/*.html'));
+  });
+  gulp.watch(watchPaths, function(event) {
     browserSync.reload(event.path);
   });
 });
--
libgit2 0.21.2