Skip to content

Commit c9a8735

Browse files
committedSep 11, 2015
reintroduce uglify flag which can be configured in the environment, closes #22
1 parent 245ec0b commit c9a8735

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed
 

‎index.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ module.exports = function(gulp, tasks, config) {
6262
}
6363

6464
if (tasks.indexOf('bowerFonts') !== -1) {
65-
require('./tasks/bowerFonts')(gulp, tasks, config.debug, config.dist.fonts, config.env.rev);
65+
require('./tasks/bowerFonts')(gulp, tasks, config.dist.fonts, config.debug, config.env.rev);
6666
}
6767

6868
if (tasks.indexOf('bowerScripts') !== -1) {
69-
require('./tasks/bowerScripts')(gulp, tasks, config.dist.js, config.sourceMapsPath, config.debug, config.env.rev);
69+
require('./tasks/bowerScripts')(gulp, tasks, config.dist.js, config.sourceMapsPath, config.debug, config.env.rev, config.env.uglify);
7070
}
7171

7272
if (tasks.indexOf('bowerStyles') !== -1) {
@@ -79,4 +79,8 @@ module.exports = function(gulp, tasks, config) {
7979

8080
require('./tasks/build')(gulp, tasks);
8181

82+
require('./tasks/serve')(gulp, tasks);
83+
84+
require('./tasks/default')(gulp, tasks);
85+
8286
};

‎tasks/bowerFonts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var fontsFilter = {
1010
filter: /\.(otf|eot|svg|ttf|woff)/i
1111
};
1212

13-
module.exports = function(gulp, tasks, debugFlag, dest, revFlag) {
13+
module.exports = function(gulp, tasks, dest, debugFlag, revFlag) {
1414
var mergedTasks = _.intersection(tasks, ['bower:install', 'bower:prune']);
1515
gulp.task('bowerFonts', mergedTasks, function() {
1616
return gulp.src(bowerFiles(fontsFilter))

‎tasks/bowerScripts.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ var jsFilter = {
1717
filter: /\.js$/i
1818
};
1919

20-
module.exports = function(gulp, tasks, dest, sourceMapPath, debugFlag, revFlag) {
20+
module.exports = function(gulp, tasks, dest, sourceMapPath, debugFlag, revFlag, uglifyFlag) {
2121
var mergedTasks = _.intersection(tasks, ['bower:install', 'bower:prune']);
2222
gulp.task('bowerScripts', mergedTasks, function() {
2323
var result = gulp.src(bowerFiles(jsFilter))
2424
.pipe(gulpif(debugFlag, debug()))
2525
.pipe(sourceMaps.init())
2626
.pipe(gulpif(isFirstRun, newer(dest + vendorFile)))
2727
.pipe(concat(vendorFile))
28-
.pipe(uglify())
28+
.pipe(gulpif(uglifyFlag, uglify()))
2929
.pipe(gulpif(revFlag, rev()))
3030
.pipe(sourceMaps.write(sourceMapPath))
3131
.pipe(gulp.dest(dest));

‎tasks/scripts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = function(gulp, tasks, config) {
5454
.pipe(ngAnnotate())
5555
.pipe(ngFilesort())
5656
.pipe(concat(scriptsFile))
57-
.pipe(uglify())
57+
.pipe(gulpif(config.env.uglify, uglify()))
5858
.pipe(gulpif(config.env.rev, rev()))
5959
.pipe(sourceMaps.write(config.sourceMapsPath))
6060
.pipe(gulp.dest(config.dist.js));

0 commit comments

Comments
 (0)
Please sign in to comment.