Skip to content
This repository was archived by the owner on Mar 7, 2019. It is now read-only.

Commit 678bede

Browse files
Upgrade ESLint to 3.13
1 parent c70ec26 commit 678bede

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

coding-styles/fixable.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@ module.exports = {
180180
maxEOF: 1,
181181
}],
182182

183+
// Disallow conditional expressions that can be expressed with simpler constructs
184+
// Use || instead of ternary in default assignments
185+
'no-unneeded-ternary': [1, {
186+
defaultAssignment: false,
187+
}],
188+
183189
// Require or disallow spacing between function identifiers and their invocations
184190
// This rule disallows spaces between the function name and the opening parenthesis that calls
185191
// it.
@@ -223,6 +229,12 @@ module.exports = {
223229
// possible.
224230
'operator-assignment': [1, 'always'],
225231

232+
// Operator Linebreak
233+
// When a statement is too long to fit on a single line, line breaks are generally inserted next
234+
// to the operators separating expressions. This rule is aimed at enforcing a particular
235+
// operator line break style.
236+
'operator-linebreak': [1, 'before'],
237+
226238
// Enforce padding within blocks
227239
// This rule enforces consistent padding within blocks.
228240
'padded-blocks': [1, 'never'],

coding-styles/recommended.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ module.exports = {
137137
// Disallow Dangling Underscores in Identifiers
138138
'no-underscore-dangle': 1,
139139

140-
// Disallow conditional expressions that can be expressed with simpler constructs
141-
// Use || instead of ternary in default assignments
142-
'no-unneeded-ternary': [1, {
143-
defaultAssignment: false,
144-
}],
145-
146140
// Disallow Warning Comments
147141
// These comments are a warning signal, that there is something not production ready in your
148142
// code. Most likely you want to fix it or remove the comments before you roll out your code
@@ -160,12 +154,6 @@ module.exports = {
160154
const: 'never',
161155
}],
162156

163-
// Operator Linebreak
164-
// When a statement is too long to fit on a single line, line breaks are generally inserted next
165-
// to the operators separating expressions. This rule is aimed at enforcing a particular
166-
// operator line break style.
167-
'operator-linebreak': [1, 'before'],
168-
169157
// Enforces having an empty line after the last top-level import statement or require call
170158
'import/newline-after-import': 1,
171159
},

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"eslint-plugin-react": "^6.8.0"
1313
},
1414
"devDependencies": {
15-
"eslint": "^3.12.0"
15+
"eslint": "^3.13.0"
1616
},
1717
"engines": {},
1818
"homepage": "https://github.com/strvcom/eslint-config-javascript",
@@ -23,7 +23,7 @@
2323
"license": "BSD-3-Clause",
2424
"main": "default",
2525
"peerDependencies": {
26-
"eslint": "^3.12.0"
26+
"eslint": "^3.13.0"
2727
},
2828
"repository": {
2929
"type": "git",

unused.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ module.exports = {
119119
// Unused, too restrictive.
120120
'object-curly-newline': 0,
121121

122+
// Prefer destructuring from arrays and objects
123+
// Unused, too restrictive.
124+
'prefer-destructuring': 0,
125+
122126
// Suggest using Reflect methods where applicable
123127
// Deprecated, will be removed from ESLint soon
124128
'prefer-reflect': 0,

0 commit comments

Comments
 (0)