Skip to content
This repository has been archived by the owner on Feb 2, 2019. It is now read-only.

Commit

Permalink
CS fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose Robinson committed Nov 7, 2018
1 parent 4a7f2bd commit e5c7d84
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 47 deletions.
4 changes: 2 additions & 2 deletions gulp/libs/error-handler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const gutil = require('./utils');
const notifier = require('node-notifier');
const gutil = require('./utils');

module.exports = function (errObj) {
module.exports = (errObj) => {
let message = gutil.colors.red('Error');

if ('plugin' in errObj) {
Expand Down
1 change: 0 additions & 1 deletion gulp/tasks/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [
`${globalConfig.srcDir}/*.*` // Only copy top-level files
Expand Down
4 changes: 0 additions & 4 deletions gulp/tasks/images.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
/**
* Compress images.
*
* Install:
* yarn add -D gulp-imagemin gul-newer
*/

const imagemin = require('gulp-imagemin');
const newer = require('gulp-newer');

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [`${globalConfig.srcDir}/images/**/*`]
};
Expand Down
14 changes: 6 additions & 8 deletions gulp/tasks/scripts.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
/**
* Parse and minify JavaScript
*
* Install:
* yarn add -D babel-preset-es2015 babelify gulp-eslint gulp-if vinyl-source-stream browserify vinyl-buffer gulp-uglify gulp-sourcemaps
*/

const eslint = require('gulp-eslint');
const eslintOptions = require('../../.eslintrc.js');
const gulpif = require('gulp-if');
const source = require('vinyl-source-stream');
const browserify = require('browserify');
const uglify = require('gulp-uglify');
const sourcemaps = require('gulp-sourcemaps');
const buffer = require('vinyl-buffer');
const errorHandler = require('../libs/error-handler');
const eslintOptions = require('../../.eslintrc.js');

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [`${globalConfig.srcDir}/js/**/*`]
};

gulp.task('scripts-lint', () => {
taskConfig.watch.push('gulpfile.js');
taskConfig.watch.push('tasks/*.js');
if (globalConfig.dev) {
taskConfig.watch.push('*.js');
taskConfig.watch.push('gulp/**/*.js');
}

return gulp.src(taskConfig.watch)
.pipe(eslint(eslintOptions))
Expand All @@ -44,7 +42,7 @@ module.exports = (gulp, globalConfig) => {
.pipe(source('main.js'))
.pipe(buffer())
.pipe(gulpif(globalConfig.dev, sourcemaps.init({
loadMaps: true // loads map from browserify file
loadMaps: true // Loads map from browserify file
})))
.pipe(uglify(gulpif(globalConfig.dev, {
mangle: false,
Expand Down
22 changes: 14 additions & 8 deletions gulp/tasks/sprites.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
/**
* Create sprites of images.
*
* Install:
* yarn add -D gulp.spritesmith gulp-imagemin vinyl-buffer glob path fs
*/

const spritesmith = require('gulp.spritesmith');
const buffer = require('vinyl-buffer');
const imagemin = require('gulp-imagemin');
const errorHandler = require('../libs/error-handler');
const path = require('path');
const glob = require('glob');
const fs = require('fs');
const errorHandler = require('../libs/error-handler');

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [`${globalConfig.srcDir}/images/sprites/*/*.png`]
};

gulp.task('sprites', (done) => {
glob(`${globalConfig.srcDir}/images/sprites/*`, {}, (err, nodesList) => {
if (err) {
errorHandler(err.stack);
return;
}

const spritesDirs = [];

for (let i = 0, len = nodesList.length; i < len; i++) {
for (let i = 0, len = nodesList.length; i < len; i += 1) {
const nodePath = nodesList[i];
const isDir = fs.statSync(nodePath).isDirectory();

Expand All @@ -38,6 +38,12 @@ module.exports = (gulp, globalConfig) => {
const numSprites = spritesDirs.length;
let workDone = 0;

/**
* Helps to identify when the task is done by counting if
* all the sprites are done.
*
* @return {null}
*/
const checkFinish = () => {
workDone += 0.5;

Expand All @@ -46,7 +52,7 @@ module.exports = (gulp, globalConfig) => {
}
};

for (let i = 0; i < numSprites; i++) {
for (let i = 0; i < numSprites; i += 49) {
const dir = spritesDirs[i];
const name = path.basename(dir);

Expand All @@ -55,7 +61,7 @@ module.exports = (gulp, globalConfig) => {
imgName: `${name}.png`,
cssName: `${name}.scss`,
cssSpritesheetName: name,
cssVarMap: function (sprite) {
cssVarMap: (sprite) => {
sprite.name = `${name}-image-${sprite.name}`;
},
cssOpts: {
Expand Down
5 changes: 0 additions & 5 deletions gulp/tasks/styles.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/**
* Parse and minify JavaScript
*
* Install:
* yarn add -D gulp-sass-lint gulp-sass gulp-if gulp-sourcemaps gulp-postcss cssnano autoprefixer
*/

const sassLint = require('gulp-sass-lint');
Expand All @@ -15,7 +12,6 @@ const autoprefixer = require('autoprefixer');
const errorHandler = require('../libs/error-handler');

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [`${globalConfig.srcDir}/css/**/*`]
};
Expand Down Expand Up @@ -51,7 +47,6 @@ module.exports = (gulp, globalConfig) => {
.pipe(postcss(postcssPlugins))
.pipe(gulpif(globalConfig.dev, sourcemaps.write('./')))
.pipe(gulp.dest(`${globalConfig.destDir}/css/`));

});

return taskConfig;
Expand Down
8 changes: 1 addition & 7 deletions gulp/tasks/views.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
/**
* Compress images.
*
* Install:
* yarn add -D gulp-pug
*/

const pug = require('gulp-pug');
const errorHandler = require('../libs/error-handler');
const htmlmin = require('gulp-htmlmin');
const errorHandler = require('../libs/error-handler');

module.exports = (gulp, globalConfig) => {

const taskConfig = {
watch: [
`${globalConfig.srcDir}/views/**/*`
Expand All @@ -30,5 +26,3 @@ module.exports = (gulp, globalConfig) => {

return taskConfig;
};


18 changes: 6 additions & 12 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
/**
* Install
* yarn add -D gulp gulp-util run-sequence del browser-sync
*/

const gulp = require('gulp');
const gutil = require('./gulp/libs/utils');
const runSequence = require('run-sequence');
const del = require('del');
const browserSync = require('browser-sync').create();
const gutil = require('./gulp/libs/utils');

const config = {
dev: gutil.env.dev === true,
Expand Down Expand Up @@ -39,10 +34,9 @@ gulp.task('clean', () => {

/* istanbul ignore next */
gulp.task('build', ['clean'], (done) => {

tasksSequence.push(done);

runSequence.apply(null, tasksSequence);
runSequence(...tasksSequence);
});

/* istanbul ignore next */
Expand All @@ -58,7 +52,7 @@ gulp.task('serve', ['build'], () => {
notify: false
});

for (let i = 0, len = tasksConfigList.length; i < len; i++) {
for (let i = 0, len = tasksConfigList.length; i < len; i += 1) {
const task = tasksConfigList[i];

gulp.watch(task.watch, [task.name, browserSync.reload]);
Expand All @@ -75,7 +69,7 @@ gulp.task('default', () => {
*/
const tasksConfigList = [];

for (let i = 0, len = tasksSequence.length; i < len; i++) {
for (let i = 0, len = tasksSequence.length; i < len; i += 1) {
const taskName = tasksSequence[i];
const taskConfig = require(`./gulp/tasks/${taskName}`)(gulp, config);

Expand All @@ -85,6 +79,6 @@ for (let i = 0, len = tasksSequence.length; i < len; i++) {
}

module.exports = {
gulp: gulp,
config: config
gulp,
config
};

0 comments on commit e5c7d84

Please sign in to comment.