From 45a00cec0e96e8546239ad9e39fb84438830e204 Mon Sep 17 00:00:00 2001 From: Austin Pray Date: Thu, 11 Sep 2014 22:15:45 -0500 Subject: [PATCH] Use gulp-load-plugins https://www.npmjs.org/package/gulp-load-plugins --- gulpfile.js | 59 ++++++++++++++++++++++------------------------------ package.json | 7 ++++--- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5b36c79..9f5dd1d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,16 +1,6 @@ -var gulp = require('gulp'), - less = require('gulp-less'), - autoprefix = require('gulp-autoprefixer'), - sourcemaps = require('gulp-sourcemaps'), - rename = require('gulp-rename'), - concat = require('gulp-concat'), - minifyCSS = require('gulp-minify-css'), - jshint = require('gulp-jshint'), - uglify = require('gulp-uglify'), - livereload = require('gulp-livereload'), - stylish = require('jshint-stylish'), - rev = require('gulp-rev'); - modernizr = require('gulp-modernizr'); +/*global $:true*/ +var gulp = require('gulp'); +var $ = require('gulp-load-plugins')(); var paths = { scripts: [ @@ -48,34 +38,35 @@ var destination = { gulp.task('less', function() { return gulp.src(paths.less) - .pipe(sourcemaps.init()) - .pipe(less()).on('error', function(err) { + .pipe($.sourcemaps.init()) + .pipe($.less()).on('error', function(err) { console.warn(err.message); }) - .pipe(autoprefix('last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12')) - .pipe(rename('./main.css')) - .pipe(sourcemaps.write()) + .pipe($.autoprefixer('last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12')) + .pipe($.rename('./main.css')) + .pipe($.sourcemaps.write()) .pipe(gulp.dest(destination.css)) - .pipe(minifyCSS()) - .pipe(rename('./main.min.css')) + .pipe($.minifyCss()) + .pipe($.rename('./main.min.css')) .pipe(gulp.dest(destination.css)) - .pipe(livereload({ auto: false })); + .pipe($.livereload({ auto: false })); }); gulp.task('jshint', function() { return gulp.src(paths.jshint) - .pipe(jshint()) - .pipe(jshint.reporter(stylish)); + .pipe($.jshint()) + .pipe($.jshint.reporter('jshint-stylish')) + .pipe($.jshint.reporter('fail')); }); gulp.task('js', ['jshint'], function() { return gulp.src(paths.scripts) - .pipe(concat('./scripts.js')) + .pipe($.concat('./scripts.js')) .pipe(gulp.dest(destination.scripts)) - .pipe(uglify()) - .pipe(rename('./scripts.min.js')) + .pipe($.uglify()) + .pipe($.rename('./scripts.min.js')) .pipe(gulp.dest(destination.scripts)) - .pipe(livereload({ auto: false })); + .pipe($.livereload({ auto: false })); }); gulp.task('modernizr', function() { @@ -83,27 +74,27 @@ gulp.task('modernizr', function() { ['assets/js/scripts.min.js'], ['assets/css/main.min.css'] ) - .pipe(modernizr()) + .pipe($.modernizr()) .pipe(gulp.dest(destination.modernizr)) - .pipe(uglify()) - .pipe(rename('./modernizr.min.js')) + .pipe($.uglify()) + .pipe($.rename('./modernizr.min.js')) .pipe(gulp.dest(destination.vendor)); }); gulp.task('version', function() { return gulp.src(['assets/css/main.min.css', 'assets/js/scripts.min.js'], { base: 'assets' }) - .pipe(rev()) + .pipe($.rev()) .pipe(gulp.dest('assets')) - .pipe(rev.manifest()) + .pipe($.rev.manifest()) .pipe(gulp.dest('assets')); }); gulp.task('watch', function() { - livereload.listen(); + $.livereload.listen(); gulp.watch('assets/less/**/*.less', ['less']); gulp.watch('assets/js/**/*.js', ['jshint', 'js']); gulp.watch('**/*.php').on('change', function(file) { - livereload.changed(file.path); + $.livereload.changed(file.path); }); }); diff --git a/package.json b/package.json index aea817a..a819593 100644 --- a/package.json +++ b/package.json @@ -25,18 +25,19 @@ "devDependencies": { "bower": ">=1.3.9", "gulp": "^3.8.7", - "gulp-autoprefixer": "0.0.8", + "gulp-autoprefixer": "^0.0.7", "gulp-concat": "^2.3.4", "gulp-grunt": "^0.5.2", "gulp-jshint": "^1.8.4", - "jshint-stylish": "^0.4.0", "gulp-less": "^1.3.3", "gulp-livereload": "^2.1.0", + "gulp-load-plugins": "^0.5.0", "gulp-minify-css": "^0.3.7", "gulp-modernizr": "https://github.com/doctyper/gulp-modernizr/tarball/develop", "gulp-rename": "^1.2.0", + "gulp-rev": "^1.1.0", "gulp-sourcemaps": "^1.1.1", "gulp-uglify": "^0.3.1", - "gulp-rev": "^1.1.0" + "jshint-stylish": "^0.4.0" } }