Skip to content

Commit fda3c49

Browse files
authored
Merge pull request #650 from evcohen/chore-update-dependencies
Updated dependencies including eslint-config-airbnb-base
2 parents e566e86 + 4a872f4 commit fda3c49

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+115
-114
lines changed

__mocks__/genInteractives.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ Object.keys(interactiveElementsMap)
119119
.concat(Object.keys(nonInteractiveElementsMap))
120120
.forEach((name: string) => delete indeterminantInteractiveElementsMap[name]);
121121

122-
const abstractRoles = roleNames.filter(role => roles.get(role).abstract);
122+
const abstractRoles = roleNames.filter((role) => roles.get(role).abstract);
123123

124-
const nonAbstractRoles = roleNames.filter(role => !roles.get(role).abstract);
124+
const nonAbstractRoles = roleNames.filter((role) => !roles.get(role).abstract);
125125

126126
const interactiveRoles = []
127127
.concat(
@@ -130,21 +130,21 @@ const interactiveRoles = []
130130
// aria-activedescendant, thus in practice we treat it as a widget.
131131
'toolbar',
132132
)
133-
.filter(role => !roles.get(role).abstract)
134-
.filter(role => roles.get(role).superClass.some(klasses => includes(klasses, 'widget')));
133+
.filter((role) => !roles.get(role).abstract)
134+
.filter((role) => roles.get(role).superClass.some((klasses) => includes(klasses, 'widget')));
135135

136136
const nonInteractiveRoles = roleNames
137-
.filter(role => !roles.get(role).abstract)
138-
.filter(role => !roles.get(role).superClass.some(klasses => includes(klasses, 'widget')))
137+
.filter((role) => !roles.get(role).abstract)
138+
.filter((role) => !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget')))
139139
// 'toolbar' does not descend from widget, but it does support
140140
// aria-activedescendant, thus in practice we treat it as a widget.
141-
.filter(role => !includes(['toolbar'], role));
141+
.filter((role) => !includes(['toolbar'], role));
142142

143143
export function genElementSymbol(openingElement: Object) {
144144
return (
145145
openingElement.name.name + (openingElement.attributes.length > 0
146146
? `${openingElement.attributes
147-
.map(attr => `[${attr.name.name}="${attr.value.value}"]`)
147+
.map((attr) => `[${attr.name.name}="${attr.value.value}"]`)
148148
.join('')}`
149149
: ''
150150
)
@@ -187,15 +187,15 @@ export function genNonInteractiveRoleElements() {
187187
...nonInteractiveRoles,
188188
'article button',
189189
'fakerole article button',
190-
].map(value => JSXElementMock('div', [JSXAttributeMock('role', value)]));
190+
].map((value) => JSXElementMock('div', [JSXAttributeMock('role', value)]));
191191
}
192192

193193
export function genAbstractRoleElements() {
194-
return abstractRoles.map(value => JSXElementMock('div', [JSXAttributeMock('role', value)]));
194+
return abstractRoles.map((value) => JSXElementMock('div', [JSXAttributeMock('role', value)]));
195195
}
196196

197197
export function genNonAbstractRoleElements() {
198-
return nonAbstractRoles.map(value => JSXElementMock('div', [JSXAttributeMock('role', value)]));
198+
return nonAbstractRoles.map((value) => JSXElementMock('div', [JSXAttributeMock('role', value)]));
199199
}
200200

201201
export function genIndeterminantInteractiveElements(): Array<TJSXElementMock> {

__tests__/index-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import path from 'path';
77
import plugin from '../src';
88

99
const rules = fs.readdirSync(path.resolve(__dirname, '../src/rules/'))
10-
.map(f => path.basename(f, '.js'));
10+
.map((f) => path.basename(f, '.js'));
1111

1212
describe('all rule files should be exported by the plugin', () => {
1313
rules.forEach((ruleName) => {

__tests__/src/rules/alt-text-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import rule from '../../../src/rules/alt-text';
1818

1919
const ruleTester = new RuleTester();
2020

21-
const missingPropError = type => ({
21+
const missingPropError = (type) => ({
2222
message: `${type} elements must have an alt prop, either with meaningful text, or an empty string for decorative images.`,
2323
type: 'JSXOpeningElement',
2424
});
2525

26-
const altValueError = type => ({
26+
const altValueError = (type) => ({
2727
message: `Invalid alt value for ${type}. \
2828
Use alt="" for presentational images.`,
2929
type: 'JSXOpeningElement',

__tests__/src/rules/aria-props-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const errorMessage = (name) => {
3939
};
4040

4141
// Create basic test cases using all valid role types.
42-
const basicValidityTests = ariaAttributes.map(prop => ({
42+
const basicValidityTests = ariaAttributes.map((prop) => ({
4343
code: `<div ${prop.toLowerCase()}="foobar" />`,
4444
}));
4545

__tests__/src/rules/aria-role-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ const errorMessage = {
2626

2727
const roleKeys = [...roles.keys()];
2828

29-
const validRoles = roleKeys.filter(role => roles.get(role).abstract === false);
30-
const invalidRoles = roleKeys.filter(role => roles.get(role).abstract === true);
29+
const validRoles = roleKeys.filter((role) => roles.get(role).abstract === false);
30+
const invalidRoles = roleKeys.filter((role) => roles.get(role).abstract === true);
3131

32-
const createTests = roleNames => roleNames.map(role => ({
32+
const createTests = (roleNames) => roleNames.map((role) => ({
3333
code: `<div role="${role.toLowerCase()}" />`,
3434
}));
3535

3636
const validTests = createTests(validRoles);
3737
const invalidTests = createTests(invalidRoles).map((test) => {
38-
const invalidTest = Object.assign({}, test);
38+
const invalidTest = { ...test };
3939
invalidTest.errors = [errorMessage];
4040
return invalidTest;
4141
});

__tests__/src/rules/aria-unsupported-elements-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import rule from '../../../src/rules/aria-unsupported-elements';
2020

2121
const ruleTester = new RuleTester();
2222

23-
const errorMessage = invalidProp => ({
23+
const errorMessage = (invalidProp) => ({
2424
message: `This element does not support ARIA roles, states and properties. \
2525
Try removing the prop '${invalidProp}'.`,
2626
type: 'JSXOpeningElement',
@@ -51,15 +51,15 @@ const ariaValidityTests = domElements.map((element) => {
5151

5252
// Generate invalid test cases.
5353
const invalidRoleValidityTests = domElements
54-
.filter(element => Boolean(dom.get(element).reserved))
55-
.map(reservedElem => ({
54+
.filter((element) => Boolean(dom.get(element).reserved))
55+
.map((reservedElem) => ({
5656
code: `<${reservedElem} role {...props} />`,
5757
errors: [errorMessage('role')],
5858
}));
5959

6060
const invalidAriaValidityTests = domElements
61-
.filter(element => Boolean(dom.get(element).reserved))
62-
.map(reservedElem => ({
61+
.filter((element) => Boolean(dom.get(element).reserved))
62+
.map((reservedElem) => ({
6363
code: `<${reservedElem} aria-hidden aria-role="none" {...props} />`,
6464
errors: [errorMessage('aria-hidden')],
6565
}));

__tests__/src/rules/interactive-supports-focus-test.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ const triggeringHandlers = [
170170
const passReducer = (roles, handlers, messageTemplate) => (
171171
staticElements.reduce((elementAcc, element) => (
172172
elementAcc.concat(roles.reduce((roleAcc, role) => (
173-
roleAcc.concat(handlers.map(handler => ({
173+
roleAcc.concat(handlers.map((handler) => ({
174174
code: messageTemplate(element, role, handler),
175175
})))
176176
), []))
@@ -180,7 +180,7 @@ const passReducer = (roles, handlers, messageTemplate) => (
180180
const failReducer = (roles, handlers, messageTemplate) => (
181181
staticElements.reduce((elementAcc, element) => (
182182
elementAcc.concat(roles.reduce((roleAcc, role) => (
183-
roleAcc.concat(handlers.map(handler => ({
183+
roleAcc.concat(handlers.map((handler) => ({
184184
code: codeTemplate(element, role, handler),
185185
errors: [{
186186
type,
@@ -196,12 +196,12 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
196196
...alwaysValid,
197197
...passReducer(
198198
interactiveRoles,
199-
eventHandlers.filter(handler => !includes(triggeringHandlers, handler)),
199+
eventHandlers.filter((handler) => !includes(triggeringHandlers, handler)),
200200
codeTemplate,
201201
),
202202
...passReducer(
203-
interactiveRoles.filter(role => !includes(recommendedRoles, role)),
204-
eventHandlers.filter(handler => includes(triggeringHandlers, handler)),
203+
interactiveRoles.filter((role) => !includes(recommendedRoles, role)),
204+
eventHandlers.filter((handler) => includes(triggeringHandlers, handler)),
205205
tabindexTemplate,
206206
),
207207
]
@@ -210,7 +210,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
210210
invalid: [
211211
...failReducer(recommendedRoles, triggeringHandlers, tabbableTemplate),
212212
...failReducer(
213-
interactiveRoles.filter(role => !includes(recommendedRoles, role)),
213+
interactiveRoles.filter((role) => !includes(recommendedRoles, role)),
214214
triggeringHandlers,
215215
focusableTemplate,
216216
),
@@ -224,12 +224,12 @@ ruleTester.run(`${ruleName}:strict`, rule, {
224224
...alwaysValid,
225225
...passReducer(
226226
interactiveRoles,
227-
eventHandlers.filter(handler => !includes(triggeringHandlers, handler)),
227+
eventHandlers.filter((handler) => !includes(triggeringHandlers, handler)),
228228
codeTemplate,
229229
),
230230
...passReducer(
231-
interactiveRoles.filter(role => !includes(strictRoles, role)),
232-
eventHandlers.filter(handler => includes(triggeringHandlers, handler)),
231+
interactiveRoles.filter((role) => !includes(strictRoles, role)),
232+
eventHandlers.filter((handler) => includes(triggeringHandlers, handler)),
233233
tabindexTemplate,
234234
),
235235
]
@@ -238,7 +238,7 @@ ruleTester.run(`${ruleName}:strict`, rule, {
238238
invalid: [
239239
...failReducer(strictRoles, triggeringHandlers, tabbableTemplate),
240240
...failReducer(
241-
interactiveRoles.filter(role => !includes(strictRoles, role)),
241+
interactiveRoles.filter((role) => !includes(strictRoles, role)),
242242
triggeringHandlers,
243243
focusableTemplate,
244244
),

__tests__/src/rules/no-distracting-elements-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import rule from '../../../src/rules/no-distracting-elements';
1818

1919
const ruleTester = new RuleTester();
2020

21-
const expectedError = element => ({
21+
const expectedError = (element) => ({
2222
message: `Do not use <${element}> elements as they can create visual accessibility issues and are deprecated.`,
2323
type: 'JSXOpeningElement',
2424
});

__tests__/src/rules/role-supports-aria-props-test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@ const errorMessage = (attr, role, tag, isImplicit) => ({
3636
type: 'JSXOpeningElement',
3737
});
3838

39-
const nonAbstractRoles = [...roles.keys()].filter(role => roles.get(role).abstract === false);
39+
const nonAbstractRoles = [...roles.keys()].filter((role) => roles.get(role).abstract === false);
4040

41-
const createTests = rolesNames => rolesNames.reduce((tests, role) => {
41+
const createTests = (rolesNames) => rolesNames.reduce((tests, role) => {
4242
const {
4343
props: propKeyValues,
4444
} = roles.get(role);
4545
const validPropsForRole = Object.keys(propKeyValues);
4646
const invalidPropsForRole = [...aria.keys()]
47-
.map(attribute => attribute.toLowerCase())
48-
.filter(attribute => validPropsForRole.indexOf(attribute) === -1);
47+
.map((attribute) => attribute.toLowerCase())
48+
.filter((attribute) => validPropsForRole.indexOf(attribute) === -1);
4949
const normalRole = role.toLowerCase();
5050

5151
const allTests = [];
5252

53-
allTests[0] = tests[0].concat(validPropsForRole.map(prop => ({
53+
allTests[0] = tests[0].concat(validPropsForRole.map((prop) => ({
5454
code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
5555
})));
5656

57-
allTests[1] = tests[1].concat(invalidPropsForRole.map(prop => ({
57+
allTests[1] = tests[1].concat(invalidPropsForRole.map((prop) => ({
5858
code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
5959
errors: [errorMessage(prop.toLowerCase(), normalRole, 'div', false)],
6060
})));

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@
3838
"babel-preset-airbnb": "^4.0.0",
3939
"coveralls": "^3.0.1",
4040
"eslint": "^3 || ^4 || ^5 || ^6",
41-
"eslint-config-airbnb-base": "^13.0.0",
42-
"eslint-plugin-flowtype": "^3.5.0",
41+
"eslint-config-airbnb-base": "^14.0.0",
42+
"eslint-plugin-flowtype": "^4.5.2",
4343
"eslint-plugin-import": "^2.18.0",
4444
"estraverse": "^4.2.0",
4545
"expect": "^24.3.1",
46-
"flow-bin": "^0.103.0",
46+
"flow-bin": "^0.112.0",
4747
"in-publish": "^2.0.0",
4848
"jest": "^24.0.0",
4949
"jscodeshift": "^0.6.0",
5050
"minimist": "^1.2.0",
5151
"object.assign": "^4.1.0",
52-
"rimraf": "^2.6.3",
52+
"rimraf": "^3.0.0",
5353
"safe-publish-latest": "^1.1.1",
5454
"to-ast": "^1.0.0"
5555
},

0 commit comments

Comments
 (0)