Skip to content

Commit 0fcc4ee

Browse files
committed
1 parent 210865e commit 0fcc4ee

8 files changed

+28
-10
lines changed

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
"requireParamDescription": false,
4343
"requireReturnDescription": false,
4444
}],
45+
46+
"eslint-plugin/consistent-output": 0,
47+
"eslint-plugin/require-meta-type": 0
4548
},
4649
"overrides": [
4750
{

lib/rules/forbid-prop-types.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ module.exports = {
142142
}
143143
case 'CallExpression': {
144144
const innerNode = node.arguments && node.arguments[0];
145-
if (propWrapperUtil.isPropWrapperFunction(context, context.getSource(node.callee)) && innerNode) {
145+
if (
146+
propWrapperUtil.isPropWrapperFunction(context, context.getSourceCode().getText(node.callee))
147+
&& innerNode
148+
) {
146149
checkNode(innerNode);
147150
}
148151
break;

lib/rules/jsx-closing-tag-location.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ module.exports = {
2727
url: docsUrl('jsx-closing-tag-location')
2828
},
2929
fixable: 'whitespace',
30-
31-
messages
30+
messages,
31+
schema: []
3232
},
3333

3434
create(context) {

lib/rules/jsx-curly-spacing.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ module.exports = {
371371
}
372372

373373
const sourceCode = context.getSourceCode();
374-
const first = context.getFirstToken(node);
374+
const first = context.getSourceCode().getFirstToken(node);
375375
const last = sourceCode.getLastToken(node);
376-
let second = context.getTokenAfter(first, {includeComments: true});
376+
let second = context.getSourceCode().getTokenAfter(first, {includeComments: true});
377377
let penultimate = sourceCode.getTokenBefore(last, {includeComments: true});
378378

379379
if (!second) {
380-
second = context.getTokenAfter(first);
380+
second = context.getSourceCode().getTokenAfter(first);
381381
const leadingComments = sourceCode.getNodeByRangeIndex(second.range[0]).leadingComments;
382382
second = leadingComments ? leadingComments[0] : second;
383383
}

lib/rules/jsx-no-constructed-context-values.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ module.exports = {
136136
recommended: false,
137137
url: docsUrl('jsx-no-constructed-context-values')
138138
},
139-
messages
139+
messages,
140+
schema: []
140141
},
141142

142143
create(context) {

lib/rules/jsx-no-useless-fragment.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,18 @@ module.exports = {
9393
recommended: false,
9494
url: docsUrl('jsx-no-useless-fragment')
9595
},
96-
messages
96+
messages,
97+
schema: [
98+
{
99+
type: 'object',
100+
properties: {
101+
allowExpressions: {
102+
type: 'boolean'
103+
}
104+
},
105+
additionalProperties: false
106+
}
107+
]
97108
},
98109

99110
create(context) {

lib/rules/jsx-sort-default-props.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ module.exports = {
6161
// (babel-eslint@5 does not expose property name so we have to rely on tokens)
6262
}
6363
if (node.type === 'ClassProperty') {
64-
const tokens = context.getFirstTokens(node, 2);
64+
const tokens = context.getSourceCode().getFirstTokens(node, 2);
6565
return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
6666
}
6767
return '';

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"babel-eslint": "^8 || ^9 || ^10.1.0",
5353
"eslint": "^3 || ^4 || ^5 || ^6 || ^7",
5454
"eslint-config-airbnb-base": "^14.2.1",
55-
"eslint-plugin-eslint-plugin": "^2.3.0 || ^3.5.3",
55+
"eslint-plugin-eslint-plugin": "^2.3.0 || ^3.5.3 || ^4.0.1",
5656
"eslint-plugin-import": "^2.24.2",
5757
"eslint-remote-tester": "^1.3.1",
5858
"eslint-remote-tester-repositories": "^0.0.3",

0 commit comments

Comments
 (0)