Skip to content

Commit 82ac7d6

Browse files
authored
Eslint5 support (#24)
* Add support for ESLint 5 Added two new rules from ESLint v5.0.0. * [max-classes-per-file](https://eslint.org/docs/rules/max-classes-per-file) - Using default of one class per file. * [max-lines-per-function](https://eslint.org/docs/rules/max-lines-per-function) - Using defaults. (Ignored for test files.) Added older rule based on new options in ESLint v5.0.0 * [array-element-newline](https://eslint.org/docs/rules/array-element-newline) - Set to `consistent`, which requires consistent usage of linebreaks between array elements. (Ignored for test files.) * Update test for new format
1 parent 57873a1 commit 82ac7d6

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1111

1212
### Removed
1313

14+
## [4.0.0] - 2018-06-23
15+
### Added
16+
Added two new rules from ESLint v5.0.0.
17+
* [max-classes-per-file](https://eslint.org/docs/rules/max-classes-per-file) - Using default of one class per file.
18+
* [max-lines-per-function](https://eslint.org/docs/rules/max-lines-per-function) - Using defaults. (Ignored for test files.)
19+
20+
Added older rule based on new options in ESLint v5.0.0
21+
* [array-element-newline](https://eslint.org/docs/rules/array-element-newline) - Set to `consistent`, which requires consistent usage of linebreaks between array elements. (Ignored for test files.)
22+
1423
## [3.2.0] - 2018-06-16
1524
### Removed
1625
* `array-element-newline`

index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = {
1717
'array-bracket-spacing': ['error', 'never'],
1818
'array-callback-return': 'error',
1919
'arrow-body-style': ['error', 'as-needed'],
20+
'array-element-newline': ['error', 'consistent'],
2021
'arrow-parens': ['error', 'always'],
2122
'arrow-spacing': ['error', {
2223
before: true,
@@ -76,12 +77,14 @@ module.exports = {
7677
beforeBlockComment: true,
7778
beforeLineComment: true
7879
}],
80+
'max-classes-per-file': 'error',
7981
'max-depth': ['error', 4],
8082
'max-lines': ['error', {
8183
max: 300,
8284
skipComments: true,
8385
skipBlankLines: true
8486
}],
87+
'max-lines-per-function': 'error',
8588
'max-nested-callbacks': ['error', 4],
8689
'max-params': ['error', 4],
8790
'max-statements': ['error', 12],
@@ -304,8 +307,10 @@ module.exports = {
304307
env: {mocha: true},
305308
rules: {
306309
'array-bracket-newline': 'off',
310+
'array-element-newline': 'off',
307311
'id-length': 'off',
308312
'max-lines': 'off',
313+
'max-lines-per-function': 'off',
309314
'max-nested-callbacks': 'off',
310315
'max-statements': 'off',
311316
'newline-after-var': 'off',

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-tc",
3-
"version": "3.2.0",
3+
"version": "4.0.0",
44
"description": "ESLint shareable config for JavaScript projects",
55
"keywords": [
66
"eslintconfig",
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"chai": "^4.1.2",
33-
"eslint": "^4.19.1",
33+
"eslint": "^5.0.0",
3434
"eslint-formatter-pretty": "^1.3.0",
3535
"is-plain-obj": "^1.1.0",
3636
"mocha": "^5.2.0",
@@ -39,7 +39,7 @@
3939
"temp-write": "^3.4.0"
4040
},
4141
"peerDependencies": {
42-
"eslint": "^4.19.1"
42+
"eslint": "^5.0.0"
4343
},
4444
"engines": {
4545
"node": ">=6.0.0",

test/tests.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('eslint config tests', () => {
4343
error.ruleId.should.equal('no-console');
4444
error.line.should.equal(expectedErrorLineNum);
4545
error.column.should.equal(expectedErrorColumnNum);
46-
error.source.should.equal('console.log("doh, I used the wrong quotes");');
46+
error.message.should.equal('Unexpected console statement.');
4747
});
4848
});
4949
});

0 commit comments

Comments
 (0)