Fix conflict

README.md

@@ -77,6 +77,7 @@ When completed, you'll be able to run the various Gulp commands provided from th
 * `gulp dev` — Compile LESS to CSS, concatenate and validate JS
 * `gulp watch` — Compile assets when file changes are made
 * `gulp build` — Create minified assets that are used on non-development environments
+* `gulp images` — Lossless compression of PNG, JPEG, GIF and SVG images
 
 ## Documentation
 

bower.json

@@ -17,5 +17,23 @@
     "jquery": "1.11.1",
     "bootstrap": "3.2.0",
     "respond": "1.4.2"
+  },
+  "overrides": {
+    "bootstrap": {
+      "main": [
+        "./js/transition.js",
+        "./js/alert.js",
+        "./js/button.js",
+        "./js/carousel.js",
+        "./js/collapse.js",
+        "./js/dropdown.js",
+        "./js/modal.js",
+        "./js/tooltip.js",
+        "./js/popover.js",
+        "./js/scrollspy.js",
+        "./js/tab.js",
+        "./js/affix.js"
+      ]
+    }
   }
 }

gulpfile.js

@@ -1,42 +1,25 @@
-var gulp = require('gulp'),
+/*global $:true*/
-  less = require('gulp-less'),
+var gulp = require('gulp');
-  autoprefix = require('gulp-autoprefixer'),
+var $ = require('gulp-load-plugins')();
-  sourcemaps = require('gulp-sourcemaps'),
+var pngcrush = require('imagemin-pngcrush');
-  rename = require('gulp-rename'),
+var mainBowerFiles = require('main-bower-files');
-  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');
 
 var paths = {
   scripts: [
-    'assets/vendor/bootstrap/js/transition.js',
+    'assets/js/**/*.js',
-    'assets/vendor/bootstrap/js/alert.js',
+    '!assets/js/vendor/**/*',
-    'assets/vendor/bootstrap/js/button.js',
+    '!assets/js/scripts*.js'
-    'assets/vendor/bootstrap/js/carousel.js',
-    'assets/vendor/bootstrap/js/collapse.js',
-    'assets/vendor/bootstrap/js/dropdown.js',
-    'assets/vendor/bootstrap/js/modal.js',
-    'assets/vendor/bootstrap/js/tooltip.js',
-    'assets/vendor/bootstrap/js/popover.js',
-    'assets/vendor/bootstrap/js/scrollspy.js',
-    'assets/vendor/bootstrap/js/tab.js',
-    'assets/vendor/bootstrap/js/affix.js',
-    'assets/js/plugins/*.js',
-    'assets/js/_*.js'
   ],
   jshint: [
     'gulpfile.js',
     'assets/js/*.js',
     '!assets/js/scripts.js',
     '!assets/js/scripts.min.js',
+    '!assets/js/vendor/**/*',
     '!assets/**/*.min-*'
   ],
-  less: 'assets/less/main.less'
+  less: 'assets/less/main.less',
+  bower: mainBowerFiles()
 };
 
 var destination = {
@@ -48,34 +31,37 @@ var destination = {
 
 gulp.task('less', function() {
   return gulp.src(paths.less)
-    .pipe(sourcemaps.init())
+    .pipe($.plumber())
-      .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($.autoprefixer('last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12'))
-      .pipe(rename('./main.css'))
+      .pipe($.rename('./main.css'))
-    .pipe(sourcemaps.write())
+    .pipe($.sourcemaps.write())
     .pipe(gulp.dest(destination.css))
-    .pipe(minifyCSS())
+    .pipe($.minifyCss())
-    .pipe(rename('./main.min.css'))
+    .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())
-    .pipe(jshint.reporter(stylish));
+    .pipe($.jshint.reporter('jshint-stylish'))
+    .pipe($.jshint.reporter('fail'));
 });
 
 gulp.task('js', ['jshint'], function() {
-  return gulp.src(paths.scripts)
+  return gulp.src(paths.bower.concat(paths.scripts))
-    .pipe(concat('./scripts.js'))
+    .pipe($.filter(['**/*.js', '!jquery.js', '!modernizr.js']))
+    .pipe($.concat('./scripts.js'))
     .pipe(gulp.dest(destination.scripts))
-    .pipe(uglify())
+    .pipe($.uglify())
-    .pipe(rename('./scripts.min.js'))
+    .pipe($.rename('./scripts.min.js'))
     .pipe(gulp.dest(destination.scripts))
-    .pipe(livereload({ auto: false }));
+    .pipe($.livereload({ auto: false }));
 });
 
 gulp.task('modernizr', function() {
@@ -83,27 +69,41 @@ 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($.uglify())
-    .pipe(rename('./modernizr.min.js'))
+    .pipe($.rename('./modernizr.min.js'))
     .pipe(gulp.dest(destination.vendor));
 });
 
+gulp.task('images', function () {
+  return gulp.src('assets/img/**/*')
+    .pipe($.imagemin({
+      progressive: true,
+      interlaced: true,
+      use: [pngcrush()]
+    }))
+    .pipe(gulp.dest('assets/img'));
+});
+
+gulp.task('bust', function () {
+  $.cache.clearAll();
+});
+
 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);
   });
 });
 

package.json

@@ -25,18 +25,24 @@
   "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-filter": "^0.5.0",
     "gulp-grunt": "^0.5.2",
+    "gulp-imagemin": "^0.6.0",
     "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-plumber": "^0.6.3",
     "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"
+    "imagemin-pngcrush": "^1.0.0",
+    "jshint-stylish": "^0.4.0",
+    "main-bower-files": "^1.0.1"
   }
 }