Skip to content

Commit 7245ffd

Browse files
committed
Merge branch 'master' of https://github.com/jfoliveira/laravel-elixir-typescript into jfoliveira-master
2 parents 679c58e + 44987e7 commit 7245ffd

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ var ts = require('gulp-typescript');
44
var concat = require('gulp-concat');
55
var _ = require('underscore');
66

7-
// Laravel Elixir Reporter
8-
var _laravelReporter = require('./reporter');
9-
107
var Task = elixir.Task;
118

129
elixir.extend('typescript', function (outputFileName, outputFolder, search, options) {
@@ -22,11 +19,16 @@ elixir.extend('typescript', function (outputFileName, outputFolder, search, opti
2219
}, options);
2320

2421
new Task(pluginName, function () {
25-
var tsResult = gulp.src(assetPath + search)
26-
.pipe(ts(options, undefined, _laravelReporter.ElixirMessage()));
22+
var tsResult = gulp.src(assetPath + '/**/*.ts')
23+
.pipe(ts(options))
24+
.on('error', function(e) {
25+
new elixir.Notification().error(e, 'TypeScript Compilation Failed!');
26+
this.emit('end');
27+
});
2728
return tsResult
2829
.pipe(concat(outputFileName))
2930
.pipe(gulp.dest(outputFolder));
31+
.pipe(new elixir.Notification('TypeScript Compiled!'));
3032
})
3133
.watch(assetPath + '/typescript/**');
32-
});
34+
});

reporter.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)