Merge branch 'gulp-watch-bower.json' into gulp

This commit is contained in:
Michael Silber
2014-11-13 15:27:39 -05:00

View File

@@ -14,12 +14,12 @@ var paths = {
'assets/src/js/**/*' 'assets/src/js/**/*'
], ],
jshint: [ jshint: [
'bower.json',
'gulpfile.js', 'gulpfile.js',
'assets/src/js/**/*' 'assets/src/js/**/*'
], ],
less: 'assets/src/less/main.less', less: 'assets/src/less/main.less',
editorStyle: 'assets/src/less/editor-style.less', editorStyle: 'assets/src/less/editor-style.less'
bower: mainBowerFiles()
}; };
gulp.task('less:dev', function() { gulp.task('less:dev', function() {
@@ -67,14 +67,14 @@ gulp.task('jshint', function() {
}); });
gulp.task('js:dev', ['jshint'], function() { gulp.task('js:dev', ['jshint'], function() {
return gulp.src(paths.bower.concat(paths.scripts)) return gulp.src(mainBowerFiles().concat(paths.scripts))
.pipe($.concat('./scripts.js')) .pipe($.concat('./scripts.js'))
.pipe(gulp.dest('assets/dist/js')) .pipe(gulp.dest('assets/dist/js'))
.pipe($.livereload({ auto: false })); .pipe($.livereload({ auto: false }));
}); });
gulp.task('js:build', ['jshint'], function() { gulp.task('js:build', ['jshint'], function() {
return gulp.src(paths.bower.concat(paths.scripts)) return gulp.src(mainBowerFiles().concat(paths.scripts))
.pipe($.concat('./scripts.min.js')) .pipe($.concat('./scripts.min.js'))
.pipe($.uglify()) .pipe($.uglify())
.pipe(gulp.dest('assets/dist/js')); .pipe(gulp.dest('assets/dist/js'));
@@ -119,8 +119,8 @@ gulp.task('version', function() {
gulp.task('watch', function() { gulp.task('watch', function() {
$.livereload.listen(); $.livereload.listen();
gulp.watch('assets/src/less/**/*', ['less:dev']); gulp.watch(['assets/src/less/**/*', 'bower.json'], ['less:dev']);
gulp.watch('assets/src/js/**/*', ['jshint', 'js:dev']); gulp.watch(['assets/src/js/**/*', 'bower.json'], ['jshint', 'js:dev']);
gulp.watch('**/*.php').on('change', function(file) { gulp.watch('**/*.php').on('change', function(file) {
$.livereload.changed(file.path); $.livereload.changed(file.path);
}); });