Skip to content

Commit

Permalink
Merge pull request #42 from edx/djoy/eslint-config
Browse files Browse the repository at this point in the history
fix: updating to use @edx/eslint-config
  • Loading branch information
davidjoy authored Feb 4, 2020
2 parents e1f1487 + 24e7a04 commit e86235e
Show file tree
Hide file tree
Showing 5 changed files with 535 additions and 456 deletions.
6 changes: 0 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@ module.exports = createConfig('eslint', {
'global-require': 'off',
'no-template-curly-in-string': 'off',
},
"parserOptions": {
"ecmaVersion": 2017
},
"env": {
"es6": true
},
});
12 changes: 1 addition & 11 deletions config/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
"extends": "eslint-config-edx",
"extends": "@edx/eslint-config",
"parser": "babel-eslint",
"rules": {
"import/no-extraneous-dependencies": [
Expand All @@ -17,16 +17,6 @@ module.exports = {
"components": [ "Link" ],
"specialLink": [ "to" ]
}],
"jsx-a11y/label-has-for": [ 2, {
"components": [ "label" ],
"required": {
"some": [ "nesting", "id" ]
},
"allowChildren": false
}]
},
"env": {
"jest": true
},
"globals": {
"newrelic": false
Expand Down
3 changes: 1 addition & 2 deletions lib/presets.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
const path = require('path');
const paths = require('./paths');

const getConfigFilepath = filename =>
path.resolve(paths.BASE_CONFIG_DIR, filename);
const getConfigFilepath = filename => path.resolve(paths.BASE_CONFIG_DIR, filename);

module.exports = {
eslint: {
Expand Down
Loading

0 comments on commit e86235e

Please sign in to comment.