From 1ca0e2b1dfd17512d0726db7855c5284dea0cb64 Mon Sep 17 00:00:00 2001 From: Jeferson Oliveira Date: Tue, 27 Oct 2015 09:15:30 -0200 Subject: [PATCH 1/2] * Using built-in Elixir error notification * Notifying succesful TypeScript compilaton * Remove custom Laravel Elixir Reporter --- index.js | 13 +++++++------ reporter.js | 17 ----------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 reporter.js diff --git a/index.js b/index.js index 44bedee..8fdfb8f 100644 --- a/index.js +++ b/index.js @@ -4,9 +4,6 @@ var ts = require('gulp-typescript'); var concat = require('gulp-concat'); var _ = require('underscore'); -// Laravel Elixir Reporter -var _laravelReporter = require('./reporter'); - var Task = elixir.Task; elixir.extend('typescript', function (output, dest, options) { @@ -21,10 +18,14 @@ elixir.extend('typescript', function (output, dest, options) { new Task(pluginName, function () { var tsResult = gulp.src(assetPath + '/**/*.ts') - .pipe(ts(options, undefined, _laravelReporter.ElixirMessage())); + .pipe(ts(options, undefined)).on('error', function(e) { + new elixir.Notification().error(e, 'TypeScript Compilation Failed!'); + this.emit('end'); + }); return tsResult .pipe(concat(output)) - .pipe(gulp.dest(dest || './public/js/app.js')); + .pipe(gulp.dest(dest || './public/js/app.js')) + .pipe(new elixir.Notification('TypeScript Compiled!')); }) .watch(assetPath + '/typescript/**'); -}); \ No newline at end of file +}); diff --git a/reporter.js b/reporter.js deleted file mode 100644 index 02f98b3..0000000 --- a/reporter.js +++ /dev/null @@ -1,17 +0,0 @@ -/// -var gutil = require('gulp-util'); -var notifier = require('node-notifier'); -function ElixirMessage(fullFilename) { - return { - error: function (error) { - console.log(error.message); - - notifier.notify({ - 'title': 'Laravel Elixir Typescript Error', - icon: __dirname + '/../laravel-elixir/icons/fail.png', - 'message': 'Compile Error, check console log for details' - }); - } - }; -} -exports.ElixirMessage = ElixirMessage; \ No newline at end of file From 44987e7fb0aacddab937943db845720251dd9767 Mon Sep 17 00:00:00 2001 From: Jeferson Oliveira Date: Tue, 27 Oct 2015 09:23:22 -0200 Subject: [PATCH 2/2] Removed no longer used "filter" parameter. --- index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 8fdfb8f..88720b2 100644 --- a/index.js +++ b/index.js @@ -18,10 +18,11 @@ elixir.extend('typescript', function (output, dest, options) { new Task(pluginName, function () { var tsResult = gulp.src(assetPath + '/**/*.ts') - .pipe(ts(options, undefined)).on('error', function(e) { - new elixir.Notification().error(e, 'TypeScript Compilation Failed!'); - this.emit('end'); - }); + .pipe(ts(options)) + .on('error', function(e) { + new elixir.Notification().error(e, 'TypeScript Compilation Failed!'); + this.emit('end'); + }); return tsResult .pipe(concat(output)) .pipe(gulp.dest(dest || './public/js/app.js'))