@@ -7,26 +7,15 @@ var gulp = require('gulp'),
7
7
concat = require ( 'gulp-concat-util' ) ,
8
8
prefix = require ( 'gulp-autoprefixer' ) ,
9
9
groupMQ = require ( 'gulp-group-css-media-queries' ) ,
10
- jade = require ( 'gulp-jade' ) ;
10
+ jade = require ( 'gulp-jade' ) ,
11
+ babel = require ( 'gulp-babel' ) ;
11
12
12
13
var paths = {
13
14
styles : 'styles/**/*.scss' ,
14
15
scripts : [
15
- 'scripts/globals.js' ,
16
- 'scripts/templates.js' ,
17
- 'scripts/model.js' ,
18
- 'scripts/view.js' ,
19
- 'scripts/controller.js' ,
20
- 'scripts/functions.js' ,
21
- 'scripts/actions.js' ,
22
- 'scripts/listeners.js' ,
23
- 'scripts/modules.js' ,
16
+ 'scripts/modules/**/*.js' ,
24
17
'scripts/init.js'
25
18
] ,
26
- scriptModules : {
27
- root : 'scripts/modules/**/*.js' ,
28
- dest : 'scripts'
29
- } ,
30
19
templates : {
31
20
root : 'templates/index.jade'
32
21
} ,
@@ -55,21 +44,14 @@ gulp.task('styles', function() {
55
44
. pipe ( gulp . dest ( paths . distribution ) ) ;
56
45
} ) ;
57
46
58
- gulp . task ( 'scripts-modules' , function ( ) {
59
- return gulp . src ( paths . scriptModules . root )
60
- . pipe ( jshint ( ) )
61
- . pipe ( jshint . reporter ( 'default' ) )
62
- . pipe ( concat ( 'modules.js' ) )
63
- . pipe ( gulp . dest ( paths . scriptModules . dest ) ) ;
64
- } ) ;
65
-
66
- gulp . task ( 'scripts' , [ 'scripts-modules' ] , function ( ) {
47
+ gulp . task ( 'scripts' , function ( ) {
67
48
return gulp . src ( paths . scripts )
68
49
. pipe ( jshint ( ) )
69
50
. pipe ( jshint . reporter ( 'default' ) )
70
- . pipe ( concat ( 'app.js' ) )
71
- . pipe ( concat . header ( '(function(win) {\n\'use strict\';\n\n' ) )
72
- . pipe ( concat . footer ( '\n})(window);' ) )
51
+ . pipe ( babel ( ) )
52
+ . pipe ( concat ( 'app.js' , { process : function ( src ) { return ( src . trim ( ) + '\n' ) . replace ( / ( ^ | \n ) [ \t ] * ( ' u s e s t r i c t ' | " u s e s t r i c t " ) ; ? \s * / g, '$1' ) ; } } ) )
53
+ . pipe ( concat . header ( '(function() {\n\'use strict\';\n' ) )
54
+ . pipe ( concat . footer ( '\n})();' ) )
73
55
. pipe ( gulp . dest ( paths . distribution ) )
74
56
. pipe ( uglify ( {
75
57
mangle : false ,
0 commit comments