diff --git a/gulpfile.js b/gulpfile.js index b800325..ca34cb5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,11 +17,15 @@ var namedLog = require("gulp-named-log"); var runProcess = rfr("src/gulp/run-process"); var patchLivereloadLogger = rfr("src/gulp/patch-livereload-logger"); -var babelLogger = namedLog("babel"); -var jadeLogger = namedLog("jade"); -var sassLogger = namedLog("sass"); -var electronLogger = namedLog("electron"); -var livereloadLogger = namedLog("livereload"); +var loggerOptions = { + basePath: __dirname +} + +var babelLogger = namedLog("babel", loggerOptions); +var jadeLogger = namedLog("jade", loggerOptions); +var sassLogger = namedLog("sass", loggerOptions); +var electronLogger = namedLog("electron", loggerOptions); +var livereloadLogger = namedLog("livereload", loggerOptions); patchLivereloadLogger(livereload, livereloadLogger); @@ -51,42 +55,42 @@ gulp.task("electron", ['babel-lib', 'babel-main', 'jade-views', 'sass-main'], fu gulp.task('babel-main', function() { return gulp.src(sources["babel-main"]) - .pipe(plumber()) + .pipe(plumber(babelLogger.error)) .pipe(cache("babel-main")) - .pipe(babel({presets: ["es2015"]}).on('error', babelLogger.error)).on('data', babelLogger.log) + .pipe(babel({presets: ["es2015"]})) + .pipe(babelLogger.stream()) .pipe(getLiveReloadStream()) - .pipe(remember("babel-main")) .pipe(rename("app.es5.js")) .pipe(gulp.dest("./")); }); gulp.task('babel-lib', function() { return gulp.src(sources["babel-lib"]) - .pipe(plumber()) + .pipe(plumber(babelLogger.error)) .pipe(cache("babel-lib")) - .pipe(babel({presets: ["es2015"]}).on('error', babelLogger.error)).on('data', babelLogger.log) + .pipe(babel({presets: ["es2015"]})) + .pipe(babelLogger.stream()) .pipe(getLiveReloadStream()) - .pipe(remember("babel-lib")) .pipe(gulp.dest("lib/")); }); gulp.task("jade-views", function() { return gulp.src(sources["jade-views"]) - .pipe(plumber()) + .pipe(plumber(jadeLogger.error)) .pipe(cache("jade-views")) - .pipe(jade().on('error', jadeLogger.error)).on('data', jadeLogger.log) + .pipe(jade()) + .pipe(jadeLogger.stream()) .pipe(getLiveReloadStream()) - .pipe(remember("jade-views")) .pipe(gulp.dest("lib/views/")); }); gulp.task("sass-main", function() { return gulp.src(sources["sass-main"]) - .pipe(plumber()) + .pipe(plumber(sassLogger.error)) .pipe(cache("sass-main")) - .pipe(sass().on('error', sassLogger.error)).on('data', sassLogger.log) + .pipe(sass()) + .pipe(sassLogger.stream()) .pipe(getLiveReloadStream()) - .pipe(remember("sass-main")) .pipe(gulp.dest("lib/stylesheets/")); });