chore(gulpfile, css): Simplify build and comb css as part of the scss task.

Reduce the number of tasks by adding combing and linting to the scss task. Also generated new css.

Author: dalelotts

.csscomb.json

@@ -3,7 +3,7 @@
   "always-semicolon": true,
   "color-case": "lower",
   "block-indent": "  ",
-  "color-shorthand": false,
+  "color-shorthand": true,
   "element-case": "lower",
   "eof-newline": true,
   "leading-zero": true,
@@ -22,5 +22,5 @@
   "strip-spaces": true,
   "tab-size": true,
   "unitless-zero": true,
-  "vendor-prefix-align": true
+  "vendor-prefix-align": false
 }

.csslintrc

@@ -1,4 +1,6 @@
 {
   "extends": "stylelint-config-standard",
-
+  "rules": {
+    "rule-non-nested-empty-line-before": "never"
+  }
 }

.stylelintrc

@@ -4,7 +4,6 @@
 
 var gulp = require('gulp')
 var gulpStylelint = require('gulp-stylelint')
-var jshint = require('gulp-jshint')
 var lodash = require('lodash')
 var path = require('path')
 var paths = require('./paths')
@@ -14,11 +13,14 @@ var standard = require('gulp-standard')
 
 var karmaConfig = path.join(__dirname, 'karma.conf.js')
 
-gulp.task('build-css', ['scss'], function () {
-  var Comb = require('csscomb')
-  var config = require('./.csscomb.json')
-  var comb = new Comb(config)
-  comb.processPath('./src/css/')
+gulp.task('css-lint', function () {
+  return gulp.src(paths.css)
+    .pipe(gulpStylelint({
+      failAfterError: true,
+      reporters: [
+        {formatter: 'string', console: true}
+      ]
+    }))
 })
 
 gulp.task('clean', function () {
@@ -28,26 +30,15 @@ gulp.task('clean', function () {
   ])
 })
 
-gulp.task('default', ['clean:mobile'])
-
 gulp.task('complexity', function (done) {
   function callback () {
     done()
   }
-  plato.inspect(paths.lint, 'build/complexity', {title: 'prerender', recurse: true}, callback)
-})
 
-gulp.task('csslint', function () {
-  return gulp.src(paths.css)
-    .pipe(gulpStylelint({
-      failAfterError: true,
-      reporters: [
-        {formatter: 'string', console: true}
-      ]
-    }))
+  plato.inspect(paths.lint, 'build/complexity', {title: 'prerender', recurse: true}, callback)
 })
 
-gulp.task('standard', function () {
+gulp.task('lint', function () {
   return gulp
     .src(paths.lint)
     .pipe(standard())
@@ -57,47 +48,25 @@ gulp.task('standard', function () {
     }))
 })
 
-gulp.task('lint', function () {
-  return gulp
-    .src(paths.lint)
-    .pipe(jshint('.jshintrc'))
-    .pipe(jshint.reporter('default', {verbose: true}))
-    .pipe(jshint.reporter('jshint-stylish'))
-    .pipe(jshint.reporter('fail'))
-})
-
-gulp.task('scss', ['scss-lint'], function () {
-  var scss = require('gulp-sass')
+gulp.task('scss', function () {
+  var autoprefixer = require('autoprefixer')
+  var csscomb = require('gulp-csscomb')
   var postcss = require('gulp-postcss')
+  var scss = require('gulp-sass')
+  var scssLint = require('gulp-scss-lint')
+  var scssLintStylish = require('gulp-scss-lint-stylish')
   var sourcemaps = require('gulp-sourcemaps')
-  var autoprefixer = require('autoprefixer')
 
   return gulp.src(paths.scss)
+    .pipe(scssLint({customReport: scssLintStylish}))
     .pipe(scss())
     .pipe(sourcemaps.init())
     .pipe(postcss([autoprefixer({browsers: ['last 2 versions']})]))
     .pipe(sourcemaps.write('.'))
+    .pipe(csscomb())
     .pipe(gulp.dest('./src/css'))
 })
 
-gulp.task('scss-lint', function () {
-  var scssLint = require('gulp-scss-lint')
-  var scssLintStylish = require('gulp-scss-lint-stylish')
-  return gulp.src('./src/scss/*.scss')
-    .pipe(scssLint({customReport: scssLintStylish}))
-})
-
-function testConfig (options) {
-  var travisDefaultOptions = {
-    browsers: ['Firefox'],
-    reporters: ['dots', 'coverage', 'threshold']
-  }
-
-  var travisOptions = process.env.TRAVIS && travisDefaultOptions
-
-  return lodash.assign(options, travisOptions)
-}
-
 gulp.task('templatecache', function () {
   var templateCache = require('gulp-angular-templatecache')
   var htmlMin = require('gulp-htmlmin')
@@ -128,7 +97,7 @@ gulp.task('tdd', function (done) {
   server.start()
 })
 
-gulp.task('test', ['standard', 'lint', 'csslint'], function (done) {
+gulp.task('test', ['lint', 'css-lint'], function (done) {
   var config = testConfig(
     {
       configFile: karmaConfig,
@@ -142,3 +111,16 @@ gulp.task('test', ['standard', 'lint', 'csslint'], function (done) {
 })
 
 gulp.task('default', ['complexity', 'test'])
+gulp.task('css-build', ['scss', 'css-lint'])
+
+function testConfig (options) {
+  var travisDefaultOptions = {
+    browsers: ['Firefox'],
+    reporters: ['dots', 'coverage', 'threshold']
+  }
+
+  var travisOptions = process.env.TRAVIS && travisDefaultOptions
+
+  return lodash.assign(options, travisOptions)
+}
+

gulpfile.js

@@ -37,6 +37,7 @@
     "eslint": "^3.5.0",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.0.0",
+    "gulp-csscomb": "^3.0.8",
     "gulp-csslint": "^1.0.0",
     "gulp-htmlmin": "^2.0.0",
     "gulp-jscs": "^4.0.0",