Navigation Menu

Skip to content

Commit

Permalink
ESLint rules and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AncientOgro authored and AngrySnout committed Feb 10, 2018
1 parent 6ba1301 commit 64ea3b1
Show file tree
Hide file tree
Showing 65 changed files with 1,735 additions and 1,541 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.json
Expand Up @@ -14,8 +14,15 @@
"Buffer": true
},
"rules": {
"prefer-promise-reject-errors": 0,
"no-mixed-operators" : 0,
"import/prefer-default-export": 0,
"no-plusplus": 0,
"func-names": 0,
"no-tabs": 0,
"no-param-reassign": 0,
"no-use-before-define": 0,
"prefer-rest-params": 0,
"indent": [
"error",
"tab"
Expand Down
101 changes: 50 additions & 51 deletions Gulpfile.js
@@ -1,54 +1,55 @@
/* eslint-disable */
// Usage:
// build the project:
// $ gulp build
// build, launch server, and watch:
// $ gulp

var gulp = require('gulp');
var del = require('del');
var sourcemaps = require('gulp-sourcemaps');
var babel = require('gulp-babel');
var watch = require('gulp-watch');
var gutil = require('gulp-util');
var source = require('vinyl-source-stream');
var buffer = require('vinyl-buffer');
var glob = require('glob');
var gulpif = require('gulp-if');
var rename = require('gulp-rename');
var plumber = require('gulp-plumber');

var sass = require('gulp-sass');
var autoprefixer = require('gulp-autoprefixer');
var cleanCSS = require('gulp-clean-css');

var browserify = require('browserify');
var watchify = require('watchify');
var uglify = require('gulp-uglify');

var dev = (process.env.NODE_ENV !== 'production');

gulp.task('sass', function() {
return gulp.src('./website/styles/*.scss')
.pipe(plumber())
.pipe(gulpif(dev, sourcemaps.init()))
.pipe(sass())
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(gulpif(!dev, cleanCSS()))
.pipe(gulpif(dev, sourcemaps.write('./')))
.pipe(gulp.dest('./assets/styles'));
});
const gulp = require('gulp');
const del = require('del');
const sourcemaps = require('gulp-sourcemaps');
const babel = require('gulp-babel');
const watch = require('gulp-watch');
const gutil = require('gulp-util');
const source = require('vinyl-source-stream');
const buffer = require('vinyl-buffer');
const glob = require('glob');
const gulpif = require('gulp-if');
const rename = require('gulp-rename');
const plumber = require('gulp-plumber');

const sass = require('gulp-sass');
const autoprefixer = require('gulp-autoprefixer');
const cleanCSS = require('gulp-clean-css');

const browserify = require('browserify');
const watchify = require('watchify');
const uglify = require('gulp-uglify');

const dev = (process.env.NODE_ENV !== 'production');

gulp.task('sass', () => gulp.src('./website/styles/*.scss')
.pipe(plumber())
.pipe(gulpif(dev, sourcemaps.init()))
.pipe(sass())
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false,
}))
.pipe(gulpif(!dev, cleanCSS()))
.pipe(gulpif(dev, sourcemaps.write('./')))
.pipe(gulp.dest('./assets/styles')));

function bundleJS(file, watch) {
var bundler;
var args = { cache: {}, packageCache: {}, entries: [file], debug: true };
let bundler;
const args = {
cache: {}, packageCache: {}, entries: [file], debug: true,
};

if (watch) bundler = watchify(browserify(args));
else bundler = browserify(args);

bundler.transform('babelify', {presets: ['es2015'], only: /\/website\/js/})
bundler.transform('babelify', { presets: ['es2015'], only: /\/website\/js/ })
.transform('browserify-shim')
.transform('debowerify')
.transform('./jadeify');
Expand All @@ -59,46 +60,44 @@ function bundleJS(file, watch) {
.pipe(source(file))
.pipe(buffer())
.pipe(gulpif(!dev, uglify()))
.pipe(rename(path => { path.dirname = ''; }))
.pipe(rename((path) => { path.dirname = ''; }))
.pipe(gulp.dest('./assets/js/'));
}
bundle();

if (watch) bundler.on('update', function () { bundle(); });
if (watch) bundler.on('update', () => { bundle(); });
}

function makeBundles(watch) {
glob('./website/js/**/[^_]*.js', function(err, files) {
if(err) return gutil.log(err);
files.map(function(entry) {
glob('./website/js/**/[^_]*.js', (err, files) => {
if (err) return gutil.log(err);
files.map((entry) => {
bundleJS(entry, watch);
});
});
}

gulp.task('js', function() {
gulp.task('js', () => {
makeBundles();
return gulp.src('./src/**/*')
.pipe(plumber())
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(babel({presets: ['es2015']}))
.pipe(babel({ presets: ['es2015'] }))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./build/'));
});

gulp.task('clean', function() {
return del(['./assets/js/**/*', './assets/styles/**/*']);
});
gulp.task('clean', () => del(['./assets/js/**/*', './assets/styles/**/*']));

gulp.task('watch', function() {
gulp.task('watch', () => {
gulp.watch('./website/styles/*.scss', ['sass']);
gulp.watch('./website/assets/**/*', ['static']);
makeBundles(true);
return gulp.src('src/**/*')
.pipe(plumber())
.pipe(watch('src/**/*'))
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(babel({presets: ['es2015']}))
.pipe(babel({ presets: ['es2015'] }))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./build/'));
});
Expand Down
1 change: 1 addition & 0 deletions index.js
@@ -1 +1,2 @@
/* eslint-disable import/no-unresolved */
require('./build/app');
25 changes: 13 additions & 12 deletions jadeify.js
@@ -1,8 +1,9 @@
'use strict';
/*global module*/

var through = require('through');
var pug = require('pug');
/* global module */

// eslint-disable-next-line import/no-extraneous-dependencies
const through = require('through');
const pug = require('pug');

module.exports = function (fileName, options) {
if (!/\.pug$/i.test(fileName)) {
Expand All @@ -11,34 +12,34 @@ module.exports = function (fileName, options) {

options.runtimePath = options.runtimePath === undefined ? 'pug-runtime' : options.runtimePath;

var inputString = '';
let inputString = '';
return through(
function (chunk) {
(chunk) => {
inputString += chunk;
},
function () {
var self = this;
const self = this;

options.filename = fileName;
options.compileDebug = false;

var result;
let result;
try {
result = pug.compileClientWithDependenciesTracked(inputString, options);
} catch (e) {
self.emit('error', e);
return;
}

result.dependencies.forEach(function (dep) {
result.dependencies.forEach((dep) => {
self.emit('file', dep);
});

var moduleBody = 'var pug = require(\'' + options.runtimePath + '\');\n\n' +
'module.exports = template;' + result.body + ';';
const moduleBody = `var pug = require('${options.runtimePath}');\n\n` +
`module.exports = template;${result.body};`;

self.queue(moduleBody);
self.queue(null);
}
},
);
};
14 changes: 7 additions & 7 deletions knexfile.js
@@ -1,14 +1,14 @@
/*global module*/
/* global module */

var config = require('./tracker.json');
const config = require('./tracker.json');

var database = {
'client': 'pg',
'connection': config.postgresURL,
'searchPath': 'knex,public'
const database = {
client: 'pg',
connection: config.postgresURL,
searchPath: 'knex,public',
};

module.exports = {
development: database,
production: database
production: database,
};

0 comments on commit 64ea3b1

Please sign in to comment.