1
1
var gulp = require ( 'gulp' ) ;
2
2
var elixir = require ( 'laravel-elixir' ) ;
3
- //var Notification = require('laravel-elixir/ingredients/commands/Notification');
4
3
var ts = require ( 'gulp-typescript' ) ;
5
4
var concat = require ( 'gulp-concat' ) ;
6
5
var _ = require ( 'underscore' ) ;
@@ -10,25 +9,22 @@ var _laravelReporter = require('./reporter');
10
9
11
10
var Task = elixir . Task ;
12
11
13
- elixir . extend ( 'typescript' , function ( output , dest , options ) {
12
+ elixir . extend ( 'typescript' , function ( output , dest , options ) {
14
13
15
14
var pluginName = 'typescript' ;
16
15
var search = '**/*.+(ts)' ;
16
+ var assetPath = './' + elixir . config . assetsPath ;
17
17
18
18
options = _ . extend ( {
19
19
sortOutput : true
20
20
} , options ) ;
21
21
22
- new Task ( pluginName , function ( ) {
23
- var tsResult = gulp . src ( './resources/assets/typescript /**/*.ts')
22
+ new Task ( pluginName , function ( ) {
23
+ var tsResult = gulp . src ( assetPath + ' /**/*.ts')
24
24
. pipe ( ts ( options , undefined , _laravelReporter . ElixirMessage ( ) ) ) ;
25
25
return tsResult
26
26
. pipe ( concat ( output ) )
27
27
. pipe ( gulp . dest ( dest || './public/js/app.js' ) ) ;
28
28
} )
29
- . watch (
30
- pluginName ,
31
- elixir . config . assetsDir + 'typescript' + '/' + search
32
- ) ;
33
- //return elixir.config.queueTask(pluginName);
29
+ . watch ( assetPath + '/' + search ) ;
34
30
} ) ;
0 commit comments