Skip to content

Commit

Permalink
Proper extends
Browse files Browse the repository at this point in the history
  • Loading branch information
wyze committed Mar 8, 2016
1 parent e6aa157 commit 23a40ac
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 18 deletions.
11 changes: 7 additions & 4 deletions base.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ module.exports = {
extends: [
'airbnb/base',
'plugin:wyze/recommended',
'./rules/best-practices.js',
'./rules/es6.js',
'./rules/style.js'
'wyze/rules/best-practices',
'wyze/rules/es6',
'wyze/rules/style'
],
parser: 'babel-eslint'
parser: 'babel-eslint',
plugins: [
'wyze'
]
};
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
extends: [
'airbnb',
'./base.js',
'./rules/react.js'
'wyze/base',
'wyze/rules/react'
]
};
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
"*.js"
],
"eslintConfig": {
"extends": "./base.js",
"plugin": [
"wyze"
]
"extends": "./base.js"
},
"__comment_on_estraverse-fb": "needed as a dependency until fixed in babel-eslint or eslint 2.3.x",
"dependencies": {
Expand Down
3 changes: 0 additions & 3 deletions rules/es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ module.exports = {
'generators': true
}
},
'plugins': [
'wyze'
],
'rules': {
// require parens in arrow function arguments
'arrow-parens': [2, 'as-needed'],
Expand Down
6 changes: 3 additions & 3 deletions test/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ test('extends files', async t => {
const expected = [
'airbnb/base',
'plugin:wyze/recommended',
'./rules/best-practices.js',
'./rules/es6.js',
'./rules/style.js',
'wyze/rules/best-practices',
'wyze/rules/es6',
'wyze/rules/style',
]

t.same(base.extends, expected, 'extending incorrect rules in `./base`')
Expand Down
4 changes: 2 additions & 2 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ test('extends length', async t => {
test('extends files', async t => {
const expected = [
'airbnb',
'./base.js',
'./rules/react.js',
'wyze/base',
'wyze/rules/react',
]

t.same(main.extends, expected, 'extending incorrect rules in `./index`')
Expand Down

0 comments on commit 23a40ac

Please sign in to comment.