Commit 0f5effef authored by Vadym Gidulian's avatar Vadym Gidulian

Fixed exiting with an error in watch mode (#1)

parent 5891a364
...@@ -8,6 +8,14 @@ var replace = require('gulp-html-replace'); ...@@ -8,6 +8,14 @@ var replace = require('gulp-html-replace');
var htmlMin = require('gulp-htmlmin'); var htmlMin = require('gulp-htmlmin');
var del = require('del'); var del = require('del');
var failSafe = false;
function shallow(done) {
return function (error) {
done(error);
};
}
var paths = new function() { var paths = new function() {
this.htmlDir = '.'; this.htmlDir = '.';
this.html = this.htmlDir + '/*.html'; this.html = this.htmlDir + '/*.html';
...@@ -34,18 +42,18 @@ var paths = new function() { ...@@ -34,18 +42,18 @@ var paths = new function() {
this.lessOut = this.lessDir; this.lessOut = this.lessDir;
}; };
gulp.task('compile-less', function () { gulp.task('compile-less', function (done) {
return gulp.src(paths.less) return gulp.src(paths.less)
.pipe(less()) .pipe(less().on(failSafe ? 'error' : 'none', shallow(done)))
.pipe(nano()) .pipe(nano().on(failSafe ? 'error' : 'none', shallow(done)))
.pipe(rename({ .pipe(rename({
suffix: '.min' suffix: '.min'
})) }))
.pipe(gulp.dest(paths.lessOut)); .pipe(gulp.dest(paths.lessOut));
}); });
gulp.task('min-css', function () { gulp.task('min-css', function (done) {
return gulp.src(paths.css) return gulp.src(paths.css)
.pipe(nano()) .pipe(nano().on(failSafe ? 'error' : 'none', shallow(done)))
.pipe(rename({ .pipe(rename({
suffix: '.min' suffix: '.min'
})) }))
...@@ -57,9 +65,9 @@ gulp.task('concat-css', ['compile-less', 'min-css'], function () { ...@@ -57,9 +65,9 @@ gulp.task('concat-css', ['compile-less', 'min-css'], function () {
.pipe(gulp.dest(paths.cssOut)); .pipe(gulp.dest(paths.cssOut));
}); });
gulp.task('min-js', function() { gulp.task('min-js', function (done) {
return gulp.src(paths.js) return gulp.src(paths.js)
.pipe(uglify()) .pipe(uglify().on(failSafe ? 'error' : 'none', shallow(done)))
.pipe(rename({ .pipe(rename({
suffix: '.min' suffix: '.min'
})) }))
...@@ -91,6 +99,7 @@ gulp.task('min-html', ['html-replace'], function () { ...@@ -91,6 +99,7 @@ gulp.task('min-html', ['html-replace'], function () {
gulp.task('test', ['concat-css', 'concat-js']); gulp.task('test', ['concat-css', 'concat-js']);
gulp.task('watch', function () { gulp.task('watch', function () {
failSafe = true;
gulp.watch([paths.css, paths.less], ['concat-css']); gulp.watch([paths.css, paths.less], ['concat-css']);
gulp.watch(paths.js, ['concat-js']); gulp.watch(paths.js, ['concat-js']);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment