Skip to content

Commit 5ad3cd6

Browse files
rdyrdy
committed
chore: Update eslint and peer dependencies
1 parent f2856da commit 5ad3cd6

20 files changed

+646
-515
lines changed

‎.eslintrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"extends": "airbnb",
3+
"settings": {
4+
"react": {
5+
"version": "detect"
6+
}
7+
},
38
"rules": {
49
"strict": [0, "global"],
510
"func-names": 0,

‎lib/rules/no-color-literals.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const util = require('util');
99
const Components = require('../util/Components');
1010
const styleSheet = require('../util/stylesheet');
1111

12-
const StyleSheets = styleSheet.StyleSheets;
13-
const astHelpers = styleSheet.astHelpers;
12+
const { StyleSheets } = styleSheet;
13+
const { astHelpers } = styleSheet;
1414

1515
module.exports = Components.detect((context) => {
1616
const styleSheets = new StyleSheets();

‎lib/rules/no-inline-styles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const util = require('util');
99
const Components = require('../util/Components');
1010
const styleSheet = require('../util/stylesheet');
1111

12-
const StyleSheets = styleSheet.StyleSheets;
13-
const astHelpers = styleSheet.astHelpers;
12+
const { StyleSheets } = styleSheet;
13+
const { astHelpers } = styleSheet;
1414

1515
module.exports = Components.detect((context) => {
1616
const styleSheets = new StyleSheets();

‎lib/rules/no-raw-text.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
module.exports = (context) => {
99
const options = context.options[0] || {};
1010

11-
const elementName = node => (
12-
node.openingElement &&
13-
node.openingElement.name &&
14-
node.openingElement.name.type === 'JSXIdentifier' &&
15-
node.openingElement.name.name
11+
const elementName = (node) => (
12+
node.openingElement
13+
&& node.openingElement.name
14+
&& node.openingElement.name.type === 'JSXIdentifier'
15+
&& node.openingElement.name.name
1616
);
1717

1818
const report = (node) => {
@@ -33,18 +33,18 @@ module.exports = (context) => {
3333
const skippedElements = options.skip ? options.skip : [];
3434
const allowedElements = ['Text', 'TSpan', 'StyledText', 'Animated.Text'].concat(skippedElements);
3535

36-
const hasOnlyLineBreak = value => /^[\r\n\t\f\v]+$/.test(value.replace(/ /g, ''));
36+
const hasOnlyLineBreak = (value) => /^[\r\n\t\f\v]+$/.test(value.replace(/ /g, ''));
3737

38-
const getValidation = node => !allowedElements.includes(elementName(node.parent));
38+
const getValidation = (node) => !allowedElements.includes(elementName(node.parent));
3939

4040
return {
4141
Literal(node) {
4242
const parentType = node.parent.type;
4343
const onlyFor = ['JSXExpressionContainer', 'JSXElement'];
44-
if (typeof node.value !== 'string' ||
45-
hasOnlyLineBreak(node.value) ||
46-
!onlyFor.includes(parentType) ||
47-
(node.parent.parent && node.parent.parent.type === 'JSXAttribute')
44+
if (typeof node.value !== 'string'
45+
|| hasOnlyLineBreak(node.value)
46+
|| !onlyFor.includes(parentType)
47+
|| (node.parent.parent && node.parent.parent.type === 'JSXAttribute')
4848
) return;
4949

5050
const isStringLiteral = parentType === 'JSXExpressionContainer';
@@ -62,8 +62,8 @@ module.exports = (context) => {
6262

6363
TemplateLiteral(node) {
6464
if (
65-
node.parent.type !== 'JSXExpressionContainer' ||
66-
(node.parent.parent && node.parent.parent.type === 'JSXAttribute')
65+
node.parent.type !== 'JSXExpressionContainer'
66+
|| (node.parent.parent && node.parent.parent.type === 'JSXAttribute')
6767
) return;
6868

6969
if (getValidation(node.parent)) {

‎lib/rules/no-unused-styles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
const Components = require('../util/Components');
99
const styleSheet = require('../util/stylesheet');
1010

11-
const StyleSheets = styleSheet.StyleSheets;
12-
const astHelpers = styleSheet.astHelpers;
11+
const { StyleSheets } = styleSheet;
12+
const { astHelpers } = styleSheet;
1313

1414
module.exports = Components.detect((context, components) => {
1515
const styleSheets = new StyleSheets();

‎lib/rules/sort-styles.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ const {
2626
module.exports = (context) => {
2727
const order = context.options[0] || 'asc';
2828
const options = context.options[1] || {};
29-
const ignoreClassNames = options.ignoreClassNames;
30-
const ignoreStyleProperties = options.ignoreStyleProperties;
29+
const { ignoreClassNames } = options;
30+
const { ignoreStyleProperties } = options;
3131
const isValidOrder = order === 'asc' ? (a, b) => a <= b : (a, b) => a >= b;
3232

3333
const sourceCode = context.getSourceCode();
@@ -40,7 +40,7 @@ module.exports = (context) => {
4040
let sortOrder = 0;
4141
if (isEitherShortHand(identifierA, identifierB)) {
4242
return a.range[0] - b.range[0];
43-
} else if (identifierA < identifierB) {
43+
} if (identifierA < identifierB) {
4444
sortOrder = -1;
4545
} else if (identifierA > identifierB) {
4646
sortOrder = 1;
@@ -53,10 +53,9 @@ module.exports = (context) => {
5353
const currentName = getStylePropertyIdentifier(current);
5454
const prevName = getStylePropertyIdentifier(prev);
5555
const hasComments = array
56-
.map(prop => sourceCode.getComments(prop))
56+
.map((prop) => sourceCode.getComments(prop))
5757
.reduce(
58-
(hasComment, comment) =>
59-
hasComment || comment.leading.length > 0 || comment.trailing > 0,
58+
(hasComment, comment) => hasComment || comment.leading.length > 0 || comment.trailing > 0,
6059
false
6160
);
6261

@@ -94,8 +93,8 @@ module.exports = (context) => {
9493
const currentName = getStylePropertyIdentifier(current);
9594

9695
if (
97-
arrayName === 'style properties' &&
98-
isEitherShortHand(prevName, currentName)
96+
arrayName === 'style properties'
97+
&& isEitherShortHand(prevName, currentName)
9998
) {
10099
return;
101100
}

‎lib/rules/split-platform-components.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = function (context) {
2222
if (node.type === 'Property') {
2323
const key = node.key || node.argument;
2424
return key.type === 'Identifier' ? key.name : key.value;
25-
} else if (node.type === 'Identifier') {
25+
} if (node.type === 'Identifier') {
2626
return node.name;
2727
}
2828
}
@@ -36,8 +36,8 @@ module.exports = function (context) {
3636

3737
function reportErrors(components, filename) {
3838
const containsAndroidAndIOS = (
39-
hasNodeWithName(components, 'IOS') &&
40-
hasNodeWithName(components, 'Android')
39+
hasNodeWithName(components, 'IOS')
40+
&& hasNodeWithName(components, 'Android')
4141
);
4242

4343
components.forEach((node) => {

‎lib/util/Components.js‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Components.prototype.set = function (node, props) {
6464
return;
6565
}
6666
const id = this.getId(currentNode);
67-
this.list[id] = Object.assign({}, this.list[id], props);
67+
this.list[id] = { ...this.list[id], ...props };
6868
};
6969

7070
/**
@@ -151,17 +151,12 @@ function componentRule(rule, context) {
151151
return false;
152152
}
153153

154-
const returnsJSX =
155-
node[property] &&
156-
node[property].type === 'JSXElement'
157-
;
158-
const returnsReactCreateElement =
159-
node[property] &&
160-
node[property].callee &&
161-
node[property].callee.property &&
162-
node[property].callee.property.name === 'createElement'
163-
;
164-
154+
const returnsJSX = node[property]
155+
&& node[property].type === 'JSXElement';
156+
const returnsReactCreateElement = node[property]
157+
&& node[property].callee
158+
&& node[property].callee.property
159+
&& node[property].callee.property.name === 'createElement';
165160
return Boolean(returnsJSX || returnsReactCreateElement);
166161
},
167162

@@ -172,9 +167,9 @@ function componentRule(rule, context) {
172167
*/
173168
getParentComponent: function () {
174169
return (
175-
utils.getParentES6Component() ||
176-
utils.getParentES5Component() ||
177-
utils.getParentStatelessComponent()
170+
utils.getParentES6Component()
171+
|| utils.getParentES5Component()
172+
|| utils.getParentStatelessComponent()
178173
);
179174
},
180175

@@ -184,6 +179,7 @@ function componentRule(rule, context) {
184179
* @returns {ASTNode} component node, null if we are not in a component
185180
*/
186181
getParentES5Component: function () {
182+
// eslint-disable-next-line react/destructuring-assignment
187183
let scope = context.getScope();
188184
while (scope) {
189185
const node = scope.block && scope.block.parent && scope.block.parent.parent;
@@ -218,6 +214,7 @@ function componentRule(rule, context) {
218214
* @returns {ASTNode} component node, null if we are not in a component
219215
*/
220216
getParentStatelessComponent: function () {
217+
// eslint-disable-next-line react/destructuring-assignment
221218
let scope = context.getScope();
222219
while (scope) {
223220
const node = scope.block;
@@ -266,7 +263,7 @@ function componentRule(rule, context) {
266263
return null;
267264
}
268265
let variableInScope;
269-
const variables = context.getScope().variables;
266+
const { variables } = context.getScope();
270267
for (i = 0, j = variables.length; i < j; i++) { // eslint-disable-line no-plusplus
271268
if (variables[i].name === variableName) {
272269
variableInScope = variables[i];
@@ -279,12 +276,12 @@ function componentRule(rule, context) {
279276

280277
// Find the variable declaration
281278
let defInScope;
282-
const defs = variableInScope.defs;
279+
const { defs } = variableInScope;
283280
for (i = 0, j = defs.length; i < j; i++) { // eslint-disable-line no-plusplus
284281
if (
285-
defs[i].type === 'ClassName' ||
286-
defs[i].type === 'FunctionName' ||
287-
defs[i].type === 'Variable'
282+
defs[i].type === 'ClassName'
283+
|| defs[i].type === 'FunctionName'
284+
|| defs[i].type === 'Variable'
288285
) {
289286
defInScope = defs[i];
290287
break;
@@ -392,7 +389,7 @@ function componentRule(rule, context) {
392389

393390
// Update the provided rule instructions to add the component detection
394391
const ruleInstructions = rule(context, components, utils);
395-
const updatedRuleInstructions = Object.assign({}, ruleInstructions);
392+
const updatedRuleInstructions = { ...ruleInstructions };
396393
Object.keys(detectionInstructions).forEach((instruction) => {
397394
updatedRuleInstructions[instruction] = (node) => {
398395
detectionInstructions[instruction](node);

0 commit comments

Comments
 (0)