Merge branch 'master' into fix-lang-rule

Author: jessebeach

.travis.yml

@@ -1,12 +1,10 @@
 language: node_js
 node_js:
+  - "14"
   - "12"
   - "10"
-  - "9"
   - "8"
-  - "7"
   - "6"
-  - "5"
   - "4"
 cache:
   yarn: true
@@ -29,6 +27,7 @@ env:
   global:
     - TEST=true
   matrix:
+    - ESLINT=7
     - ESLINT=6
     - ESLINT=5
     - ESLINT=4
@@ -45,19 +44,15 @@ matrix:
       env: ESLINT=5
     - node_js: "4"
       env: ESLINT=6
-    - node_js: "5"
-      env: ESLINT=5
+    - node_js: "4"
+      env: ESLINT=7
     - node_js: "6"
       env: ESLINT=6
+    - node_js: "6"
+      env: ESLINT=7
+    - node_js: "8"
+      env: ESLINT=7
   allow_failures:
-    - node_js: "7"
-      env: ESLINT=6
-    - node_js: "5"
-      env: ESLINT=6
-    - node_js: "5"
-      env: ESLINT=4
-    - node_js: "5"
-      env: ESLINT=3
     - node_js: "4"
       env: ESLINT=4
     - node_js: "4"

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

@@ -50,7 +50,6 @@ const array = [{
   'input[type="image"]': ['InputImage'],
 }];
 
-
 ruleTester.run('alt-text', rule, {
   valid: [
     // DEFAULT ELEMENT 'img' TESTS

__tests__/src/rules/label-has-for-test.js

@@ -34,7 +34,6 @@ const expectedEveryError = {
   type: 'JSXOpeningElement',
 };
 
-
 const optionsComponents = [{
   components: ['Label', 'Descriptor'],
 }];

__tests__/src/rules/mouse-events-have-key-events-test.js

@@ -39,10 +39,21 @@ ruleTester.run('mouse-events-have-key-events', rule, {
       code: '<div onMouseOver={handleMouseOver} onFocus={handleFocus} {...props} />;',
     },
     { code: '<div />;' },
+    { code: '<div onBlur={() => {}} />' },
+    { code: '<div onFocus={() => {}} />' },
     { code: '<div onMouseOut={() => void 0} onBlur={() => void 0} />' },
     { code: '<div onMouseOut={() => void 0} onBlur={() => void 0} {...props} />' },
     { code: '<div onMouseOut={handleMouseOut} onBlur={handleOnBlur} />' },
     { code: '<div onMouseOut={handleMouseOut} onBlur={handleOnBlur} {...props} />' },
+    { code: '<MyElement />' },
+    { code: '<MyElement onMouseOver={() => {}} />' },
+    { code: '<MyElement onMouseOut={() => {}} />' },
+    { code: '<MyElement onBlur={() => {}} />' },
+    { code: '<MyElement onFocus={() => {}} />' },
+    { code: '<MyElement onMouseOver={() => {}} {...props} />' },
+    { code: '<MyElement onMouseOut={() => {}} {...props} />' },
+    { code: '<MyElement onBlur={() => {}} {...props} />' },
+    { code: '<MyElement onFocus={() => {}} {...props} />' },
   ].map(parserOptionsMapper),
   invalid: [
     { code: '<div onMouseOver={() => void 0} />;', errors: [mouseOverError] },

__tests__/src/rules/no-onchange-test.js

@@ -4,7 +4,6 @@
  * @author Ethan Cohen
  */
 
-
 // -----------------------------------------------------------------------------
 // Requirements
 // -----------------------------------------------------------------------------

__tests__/src/rules/role-has-required-aria-props-test.js

@@ -29,7 +29,6 @@ const errorMessage = (role) => {
   };
 };
 
-
 // Create basic test cases using all valid role types.
 const basicValidityTests = [...roles.keys()].map((role) => {
   const {

__tests__/src/util/hasAccessibleChild-test.js

@@ -11,7 +11,6 @@ describe('hasAccessibleChild', () => {
     });
   });
 
-
   describe('has no children and sets dangerouslySetInnerHTML', () => {
     it('Returns true', () => {
       const prop = JSXAttributeMock('dangerouslySetInnerHTML', true);

package.json

@@ -30,48 +30,48 @@
     "jest": "jest --coverage __tests__/**/*"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.2.3",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.0.0",
-    "babel-preset-airbnb": "^4.0.0",
-    "coveralls": "^3.0.1",
-    "eslint": "^3 || ^4 || ^5 || ^6",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-plugin-flowtype": "^4.5.2",
-    "eslint-plugin-import": "^2.18.0",
-    "estraverse": "^4.2.0",
+    "@babel/cli": "^7.10.1",
+    "@babel/core": "^7.10.2",
+    "@babel/plugin-transform-flow-strip-types": "^7.10.1",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^24.9.0",
+    "babel-preset-airbnb": "^5.0.0",
+    "coveralls": "^3.1.0",
+    "eslint": "^3 || ^4 || ^5 || ^6 || ^7",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-flowtype": "^5.1.3",
+    "eslint-plugin-import": "^2.21.2",
+    "estraverse": "^4.3.0",
     "expect": "^24.3.1",
-    "flow-bin": "^0.112.0",
-    "in-publish": "^2.0.0",
-    "jest": "^24.0.0",
+    "flow-bin": "^0.113.0",
+    "in-publish": "^2.0.1",
+    "jest": "^24.9.0",
     "jscodeshift": "^0.6.0",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.5",
     "object.assign": "^4.1.0",
-    "rimraf": "^3.0.0",
-    "safe-publish-latest": "^1.1.1",
+    "rimraf": "^3.0.2",
+    "safe-publish-latest": "^1.1.4",
     "to-ast": "^1.0.0"
   },
   "engines": {
     "node": ">=4.0"
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.4.5",
-    "aria-query": "^4.0.1",
-    "array-includes": "^3.0.3",
+    "@babel/runtime": "^7.10.2",
+    "aria-query": "^4.0.2",
+    "array-includes": "^3.1.1",
     "ast-types-flow": "^0.0.7",
-    "axe-core": "^3.5.2",
-    "axobject-query": "^2.1.1",
-    "damerau-levenshtein": "^1.0.4",
-    "emoji-regex": "^7.0.2",
+    "axe-core": "^3.5.4",
+    "axobject-query": "^2.1.2",
+    "damerau-levenshtein": "^1.0.6",
+    "emoji-regex": "^9.0.0",
     "has": "^1.0.3",
-    "jsx-ast-utils": "^2.2.1",
+    "jsx-ast-utils": "^2.4.1"
     "language-tags": "^1.0.5"
   },
   "peerDependencies": {
-    "eslint": "^3 || ^4 || ^5 || ^6"
+    "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
   },
   "jest": {
     "coverageReporters": [

src/rules/alt-text.js

@@ -218,7 +218,6 @@ module.exports = {
         return type;
       }));
 
-
     return {
       JSXOpeningElement: (node) => {
         const nodeType = elementType(node);

src/rules/anchor-has-content.js

@@ -11,7 +11,6 @@ import { elementType } from 'jsx-ast-utils';
 import { arraySchema, generateObjSchema } from '../util/schemas';
 import hasAccessibleChild from '../util/hasAccessibleChild';
 
-
 const errorMessage = 'Anchors must have content and the content must be accessible by a screen reader.';
 
 const schema = generateObjSchema({ components: arraySchema });

src/rules/img-redundant-alt.js

@@ -59,8 +59,7 @@ module.exports = {
       const redundantWords = REDUNDANT_WORDS.concat(words);
 
       if (typeof value === 'string' && isVisible) {
-        const hasRedundancy = redundantWords
-          .some((word) => Boolean(value.match(new RegExp(`(?!{)\\b${word}\\b(?!})`, 'i'))));
+        const hasRedundancy = new RegExp(`(?!{)\\b(${redundantWords.join('|')})\\b(?!})`, 'i').test(value);
 
         if (hasRedundancy === true) {
           context.report({

src/rules/mouse-events-have-key-events.js

@@ -8,6 +8,7 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { dom } from 'aria-query';
 import { getProp, getPropValue } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 
@@ -26,6 +27,12 @@ module.exports = {
 
   create: (context) => ({
     JSXOpeningElement: (node) => {
+      const { name } = node.name;
+
+      if (!dom.get(name)) {
+        return;
+      }
+
       const { attributes } = node;
 
       // Check onmouseover / onfocus pairing.

src/rules/no-distracting-elements.js

@@ -14,7 +14,6 @@ const errorMessage = (element) => (
   `Do not use <${element}> elements as they can create visual accessibility issues and are deprecated.`
 );
 
-
 const DEFAULT_ELEMENTS = [
   'marquee',
   'blink',

src/rules/no-noninteractive-tabindex.js

@@ -58,7 +58,6 @@ module.exports = {
         }
         const role = getLiteralPropValue(getProp(node.attributes, 'role'));
 
-
         if (!dom.has(type)) {
           // Do not test higher level JSX components, as we do not know what
           // low-level DOM element this maps to.

src/util/isNonInteractiveElement.js

@@ -26,6 +26,9 @@ const nonInteractiveRoles = new Set(roleKeys
         // 'toolbar' does not descend from widget, but it does support
         // aria-activedescendant, thus in practice we treat it as a widget.
         && name !== 'toolbar'
+        // This role is meant to have no semantic value.
+        // @see https://www.w3.org/TR/wai-aria-1.2/#generic
+        && name !== 'generic'
         && !role.superClass.some((classes) => includes(classes, 'widget'))
     );
   }).concat(
@@ -42,6 +45,9 @@ const interactiveRoles = new Set(roleKeys
       // The `progressbar` is descended from `widget`, but in practice, its
       // value is always `readonly`, so we treat it as a non-interactive role.
         && name !== 'progressbar'
+        // This role is meant to have no semantic value.
+        // @see https://www.w3.org/TR/wai-aria-1.2/#generic
+        && name !== 'generic'
         && role.superClass.some((classes) => includes(classes, 'widget'))
     );
   }).concat(