From d6d2c2e698bd1414d7f89a407f83dcbb0c4b4435 Mon Sep 17 00:00:00 2001 From: Geoff Doty Date: Fri, 9 Nov 2018 19:57:18 -0500 Subject: [PATCH] replace jscs with eslint --- .eslintrc.json | 34 +++++++++++++++ .jscsrc | 3 -- gulpfile.js | 112 ++++++++++++++++++++++++------------------------- 3 files changed, 90 insertions(+), 59 deletions(-) create mode 100644 .eslintrc.json delete mode 100644 .jscsrc diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..85c7e29 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,34 @@ +{ + "env": { + "browser": true, + "commonjs": true, + "es6": true, + "node": true + }, + "globals": { + "riot": true, + "route": true + }, + "extends": "eslint:recommended", + "rules": { + "no-console": [ + "warn" + ], + "indent": [ + "error", + 4 + ], + "linebreak-style": [ + "error", + "unix" + ], + "quotes": [ + "error", + "single" + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index f6d2511..0000000 --- a/.jscsrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "preset": "crockford" -} \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 481c1fe..4cca6b5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,56 +1,56 @@ -'use strict'; - -const gulp = require('gulp'), - riot = require('gulp-riot'), - concat = require('gulp-concat'), - minify = require('gulp-minify'), - cssmin = require('gulp-clean-css'), - ref = require('gulp-useref'); - -// build riotjs tags (components) -gulp.task('tags', () => { - return gulp.src('./src/public/views/**/*.tag.html') - .pipe(concat('tags.js')) - .pipe(riot({compact: true, whitespace: false})) - .pipe(minify()) - .pipe(gulp.dest('./dist/js')) -}); - -// combine javascript files -gulp.task('javascript', () => { - return gulp.src('./src/public/js/**/*.js') - .pipe(concat('combined.js')) - .pipe(minify()) - .pipe(gulp.dest('./dist/js')) -}); - -// move fonts -gulp.task('fonts', () => { - return gulp.src('./src/public/fonts/**/*.ttf') - .pipe(gulp.dest('./dist/fonts')) -}); - -// move images -// TODO: minimize -gulp.task('images', () => { - return gulp.src('./src/public/images/**/*') - .pipe(gulp.dest('./dist/img')) -}); - -// combine css -gulp.task('css', () => { - return gulp.src('css/*.css') - .pipe(concat('styles.css')) - .pipe(cssmin()) - .pipe(gulp.dest('./dist/css')) -}); - -// build everything for production distribution -gulp.task('build', gulp.series('tags', 'javascript', 'css', 'fonts', 'images'), () => { - return gulp.src(['./src/public/index.html']) - .pipe(ref()) - .pipe(gulp.dest('./dist')) -}); - -// create task -gulp.task('default', gulp.series('build'), () => {}); +'use strict'; + +const gulp = require('gulp'), + riot = require('gulp-riot'), + concat = require('gulp-concat'), + minify = require('gulp-minify'), + cssmin = require('gulp-clean-css'), + ref = require('gulp-useref'); + +// build riotjs tags (components) +gulp.task('tags', () => { + return gulp.src('./src/public/views/**/*.tag.html') + .pipe(concat('tags.js')) + .pipe(riot({compact: true, whitespace: false})) + .pipe(minify()) + .pipe(gulp.dest('./dist/js')); +}); + +// combine javascript files +gulp.task('javascript', () => { + return gulp.src('./src/public/js/**/*.js') + .pipe(concat('combined.js')) + .pipe(minify()) + .pipe(gulp.dest('./dist/js')); +}); + +// move fonts +gulp.task('fonts', () => { + return gulp.src('./src/public/fonts/**/*.ttf') + .pipe(gulp.dest('./dist/fonts')); +}); + +// move images +// TODO: minimize +gulp.task('images', () => { + return gulp.src('./src/public/images/**/*') + .pipe(gulp.dest('./dist/img')); +}); + +// combine css +gulp.task('css', () => { + return gulp.src('css/*.css') + .pipe(concat('styles.css')) + .pipe(cssmin()) + .pipe(gulp.dest('./dist/css')); +}); + +// build everything for production distribution +gulp.task('build', gulp.series('tags', 'javascript', 'css', 'fonts', 'images'), () => { + return gulp.src(['./src/public/index.html']) + .pipe(ref()) + .pipe(gulp.dest('./dist')); +}); + +// create task +gulp.task('default', gulp.series('build'), () => {});