Merge pull request #169 from jakemmarsh/eslint-gulp-tasks

Add gulp tasks to eslint

Author: jakemmarsh

gulp/config.js

@@ -18,7 +18,8 @@ export default {
   scripts: {
     src: 'app/js/**/*.js',
     dest: 'build/js',
-    test: 'test/**/*.js'
+    test: 'test/**/*.js',
+    gulp: 'gulp/**/*.js'
   },
 
   images: {

gulp/tasks/browserify.js

@@ -23,7 +23,7 @@ function createSourcemap() {
 
 // Based on: http://blog.avisi.nl/2014/04/25/how-to-keep-a-fast-build-with-browserify-and-reactjs/
 function buildScript(file) {
-  
+
   let bundler = browserify({
     entries: [config.sourceDir + 'js/' + file],
     debug: createSourcemap(),
@@ -62,7 +62,7 @@ function buildScript(file) {
       .pipe(gulpif(createSourcemap(), buffer()))
       .pipe(gulpif(createSourcemap(), sourcemaps.init({ loadMaps: true })))
       .pipe(gulpif(global.isProd, streamify(uglify({
-        compress: { drop_console: true }
+        compress: { drop_console: true } // eslint-disable-line camelcase
       }))))
       .pipe(gulpif(createSourcemap(), sourcemaps.write(sourceMapLocation)))
       .pipe(gulp.dest(config.scripts.dest))

gulp/tasks/eslint.js

@@ -5,16 +5,8 @@ import gulp   from 'gulp';
 import eslint from 'gulp-eslint';
 
 gulp.task('eslint', () => {
-  // Be sure to return the stream from the task;
-  // Otherwise, the task may end before the stream has finished.
-  return gulp.src([config.scripts.src, '!app/js/templates.js', config.scripts.test])
-    // eslint() attaches the lint output to the "eslint" property
-    // of the file object so it can be used by other modules.
+  return gulp.src([config.scripts.src, '!app/js/templates.js', config.scripts.test, config.scripts.gulp])
     .pipe(eslint())
-    // eslint.format() outputs the lint results to the console.
-    // Alternatively use eslint.formatEach() (see Docs).
     .pipe(eslint.format())
-    // To have the process exit with an error code (1) on
-    // lint error, return the stream and pipe to failAfterError last.
     .pipe(eslint.failAfterError());
 });

gulp/tasks/protractor.js

@@ -1,9 +1,8 @@
 'use strict';
 
-import config       from '../config';
-import testServer   from '../util/testServer';
-import express      from 'express';
-import gulp         from 'gulp';
+import config     from '../config';
+import testServer from '../util/testServer';
+import gulp       from 'gulp';
 import {
   protractor,
   webdriver

gulp/util/bundleLogger.js

@@ -14,13 +14,13 @@ export default {
 
   start() {
     startTime = process.hrtime();
-    gutil.log('Running', gutil.colors.green(`'bundle'`) + '...');
+    gutil.log('Running', gutil.colors.green('\'bundle\'') + '...');
   },
 
   end() {
     var taskTime = process.hrtime(startTime);
     var prettyTime = prettyHrtime(taskTime);
-    gutil.log('Finished', gutil.colors.green(`'bundle'`), 'in', gutil.colors.magenta(prettyTime));
+    gutil.log('Finished', gutil.colors.green('\'bundle\''), 'in', gutil.colors.magenta(prettyTime));
   }
 
 };

gulp/util/testServer.js

@@ -8,8 +8,10 @@ export default function testServer({port, dir}) {
 
   app.use(express.static(dir));
 
-  return new Promise((res, rej) => {
-    const server = app.listen(port, () => res(server));
+  return new Promise((resolve) => {
+    const server = app.listen(port, () => {
+      resolve(server);
+    });
   });
 
 }