update eslint rules and format JavaScript

- set maximum line length to 120
- don't require a space immediately after the line comment character or inside a block comment
- format JavaScript
This commit is contained in:
Dan Allen
2017-10-12 16:12:52 -06:00
parent e508c3c012
commit 7b81bf25d8
6 changed files with 16 additions and 32 deletions

View File

@@ -2,6 +2,8 @@
"extends": "standard",
"rules": {
"arrow-parens": ["error", "always"],
"comma-dangle": ["error", "always-multiline"]
"comma-dangle": ["error", "always-multiline"],
"max-len": [1, 120, 2],
"spaced-comment": "off"
}
}

View File

@@ -18,11 +18,7 @@ const previewSiteDestDir = path.join(buildDir, 'preview-site')
const srcDir = 'src'
const destDir = path.join(previewSiteDestDir, '_')
const jsFiles = [
'gulpfile.js',
'tasks/**/*.js',
path.join(srcDir, '{helpers,js}/**/*.js'),
]
const jsFiles = ['gulpfile.js', 'tasks/**/*.js', path.join(srcDir, '{helpers,js}/**/*.js')]
gulp.task('lint:css', () => lintCss(`${srcDir}/css/**/*.css`))
gulp.task('lint:js', () => lintJs(jsFiles))
@@ -32,9 +28,7 @@ gulp.task('format', () => format(jsFiles))
gulp.task('build', () => build(srcDir, destDir))
gulp.task('build:preview', ['build'], () =>
buildPreview(srcDir, destDir, previewSiteSrcDir, previewSiteDestDir)
)
gulp.task('build:preview', ['build'], () => buildPreview(srcDir, destDir, previewSiteSrcDir, previewSiteDestDir))
gulp.task('preview', ['build:preview'], () =>
preview(previewSiteDestDir, {

View File

@@ -1,4 +1,4 @@
var hljs = window.hljs = require('highlight.js/lib/highlight')
var hljs = (window.hljs = require('highlight.js/lib/highlight'))
hljs.registerLanguage('apache', require('highlight.js/lib/languages/apache'))
hljs.registerLanguage('asciidoc', require('highlight.js/lib/languages/asciidoc'))
hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash'))

View File

@@ -9,11 +9,7 @@ const vfs = require('vinyl-fs')
const yaml = require('js-yaml')
module.exports = async (src, dest, siteSrc, siteDest) => {
const [layouts] = await Promise.all([
compileLayouts(src),
registerPartials(src),
registerHelpers(src),
])
const [layouts] = await Promise.all([compileLayouts(src), registerPartials(src), registerHelpers(src)])
const mockUIModel = loadSampleUIModel(siteSrc)
@@ -22,10 +18,7 @@ module.exports = async (src, dest, siteSrc, siteDest) => {
.pipe(
map((file, next) => {
const compiledLayout = layouts['default.hbs']
const siteRootPath = path.relative(
path.dirname(file.path),
path.resolve(siteSrc)
)
const siteRootPath = path.relative(path.dirname(file.path), path.resolve(siteSrc))
mockUIModel['siteRootPath'] = siteRootPath
mockUIModel['siteRootUrl'] = path.join(siteRootPath, 'index.html')
mockUIModel['uiRootPath'] = path.join(siteRootPath, '_')
@@ -75,10 +68,7 @@ function compileLayouts (src) {
.src('layouts/*.hbs', { base: src, cwd: src })
.pipe(
map((file, next) => {
layouts[file.basename] = handlebars.compile(
file.contents.toString(),
{ preventIndent: true }
)
layouts[file.basename] = handlebars.compile(file.contents.toString(), { preventIndent: true })
next(null, file)
})
)
@@ -88,7 +78,5 @@ function compileLayouts (src) {
}
function loadSampleUIModel (siteSrc) {
return yaml.safeLoad(
fs.readFileSync(path.join(siteSrc, 'ui-model.yml'), 'utf8')
)
return yaml.safeLoad(fs.readFileSync(path.join(siteSrc, 'ui-model.yml'), 'utf8'))
}

View File

@@ -36,9 +36,11 @@ module.exports = (src, dest) => {
vfs
.src('js/vendor/*.js', Object.assign({ read: false }, opts))
.pipe(tap((file) => {
file.contents = browserify(file.relative, { basedir: src, detectGlobals: false }).bundle()
}))
.pipe(
tap((file) => {
file.contents = browserify(file.relative, { basedir: src, detectGlobals: false }).bundle()
})
)
.pipe(buffer())
.pipe(uglify()),

View File

@@ -27,9 +27,7 @@ module.exports = () => {
}
if (file.isStream()) {
return callback(
new PluginError('gulp-prettier-eslint', 'Streaming not supported')
)
return callback(new PluginError('gulp-prettier-eslint', 'Streaming not supported'))
}
const input = file.contents.toString()