Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #45 from Glimpse/chrisdias/eslint
Browse files Browse the repository at this point in the history
combine eslint.config.js with .eslintrc.json
  • Loading branch information
chrisdias authored May 3, 2017
2 parents 8cce179 + 827cef4 commit 65d16d2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 38 deletions.
15 changes: 13 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,18 @@
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn"

"valid-typeof": "warn",
"camelcase": "error",
"curly": "error",
"func-names": "error",
"space-in-parens": "error",
"no-console": "off",
"brace-style": ["error", "1tbs", { "allowSingleLine": true}],
"comma-spacing": ["error", { "before": false, "after": true }] ,
"indent": ["error", 4, { "SwitchCase": 1 } ] ,
"no-trailing-spaces": ["error", { "skipBlankLines" : true } ] ,
"quotes": ["error", "single", "avoid-escape"] ,
"semi": ["error", "always" ],
"semi-spacing": ["error", { "before": false, "after": true } ]
}
}
34 changes: 0 additions & 34 deletions eslint.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var gulp = require('gulp');
var del = require('del');
var webpack = require('webpack');
var eslint = require('gulp-eslint');
var eslintConfig = require('./eslint.config.js');
var eslintConfig = require('./.eslintrc.json');

gulp.task('populate-mongodb', function populateMongoDb(cb) {
process.argv.push('--config', path.join(__dirname, 'config.mongodb.json'));
Expand Down Expand Up @@ -110,7 +110,7 @@ gulp.task('lint-server', function lintServer() {

gulp.task('lint-gateway', function lintGateway() {
var config = _.assign({
parserOptions: {
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
Expand Down

0 comments on commit 65d16d2

Please sign in to comment.