diff --git a/templates/common/root/_gulpfile.js b/templates/common/root/_gulpfile.js index 8e6783ee9..b0ec98c12 100644 --- a/templates/common/root/_gulpfile.js +++ b/templates/common/root/_gulpfile.js @@ -168,18 +168,18 @@ gulp.task('clean:dist', function (cb) { }); gulp.task('client:build', ['html', 'styles'], function () { - var jsFilter = $.filter('**/*.js'); - var cssFilter = $.filter('**/*.css'); + var jsFilter = $.filter('**/*.js', {restore: true}); + var cssFilter = $.filter('**/*.css', {restore: true}); return gulp.src(paths.views.main) .pipe($.useref({searchPath: [yeoman.app, '.tmp']})) .pipe(jsFilter) .pipe($.ngAnnotate()) .pipe($.uglify()) - .pipe(jsFilter.restore()) + .pipe(jsFilter.restore) .pipe(cssFilter) .pipe($.minifyCss({cache: true})) - .pipe(cssFilter.restore()) + .pipe(cssFilter.restore) .pipe($.rev()) .pipe($.revReplace()) .pipe(gulp.dest(yeoman.dist)); diff --git a/templates/common/root/_package.json b/templates/common/root/_package.json index 24e2dcf7e..a95df2c61 100644 --- a/templates/common/root/_package.json +++ b/templates/common/root/_package.json @@ -4,25 +4,25 @@ "devDependencies": {<% if (gulp) { %> "gulp": "^3.9.0", "gulp-connect": "^2.2.0", - "gulp-autoprefixer": "2.3.1", - "gulp-cache": "^0.2.10", + "gulp-autoprefixer": "3.1.1", + "gulp-cache": "^0.4.5", "rimraf": "^2.4.0", - "gulp-filter": "^2.0.2", - "gulp-imagemin": "^2.3.0", - "gulp-jshint": "^1.11.1", - "gulp-karma": "0.0.4", - "gulp-load-plugins": "^0.10.0", + "gulp-filter": "^4.0.0", + "gulp-imagemin": "^3.0.3", + "gulp-jshint": "^2.0.1", + "gulp-karma": "0.0.5", + "gulp-load-plugins": "^1.2.4", "gulp-plumber": "^1.0.1", "gulp-minify-css": "^1.2.0", - "gulp-rev": "^5.0.1", + "gulp-rev": "^7.1.2", "gulp-rev-replace": "^0.4.2", - "gulp-uglify": "^1.2.0", + "gulp-uglify": "^2.0.0", "gulp-useref": "^3.0.0", "gulp-util": "^3.0.6", "gulp-watch": "^4.2.4", "run-sequence": "^1.1.1", - "wiredep": "^2.2.2", - "lazypipe": "^0.2.4", + "wiredep": "^4.0.0", + "lazypipe": "^1.0.1", "gulp-ng-annotate": "^1.0.0", "open": "0.0.5"<% if (sass) { %>, "gulp-sass": "^2.0.4"<% } %><% if (coffee) { %>, @@ -57,7 +57,8 @@ "grunt-wiredep": "^2.0.0", "jit-grunt": "^0.9.1", "time-grunt": "^1.0.0"<% } %>, - "jshint-stylish": "^1.0.0" + "jshint-stylish": "^2.2.1", + "jshint": "^2.9.3" }, "engines": { "node": ">=0.10.0"