Merge branch 'master' into 657-fix-mouse-event

jessebeach · web-flow · commit c8dc47726528 · 2020-06-12T14:41:05.000-07:00
diff --git a/.travis.yml b/.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"
diff --git a/__tests__/__util__/axeMapping.js b/__tests__/__util__/axeMapping.js
@@ -2,5 +2,5 @@
 import * as axe from 'axe-core';
 
 export function axeFailMessage(checkId, data) {
-  return axe._audit.data.checks[checkId].messages.fail(data);
+  return axe.utils.getCheckMessage(checkId, 'fail', data);
 }
diff --git a/__tests__/src/rules/alt-text-test.js b/__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
diff --git a/__tests__/src/rules/label-has-associated-control-test.js b/__tests__/src/rules/label-has-associated-control-test.js
@@ -30,6 +30,7 @@ const htmlForValid = [
   { code: '<label htmlFor="js_id"><span><span><span>A label</span></span></span></label>', options: [{ depth: 4 }] },
   { code: '<label htmlFor="js_id" aria-label="A label" />' },
   { code: '<label htmlFor="js_id" aria-labelledby="A label" />' },
+  { code: '<div><label htmlFor="js_id">A label</label><input id="js_id" /></div>' },
   // Custom label component.
   { code: '<CustomLabel htmlFor="js_id" aria-label="A label" />', options: [{ labelComponents: ['CustomLabel'] }] },
   { code: '<CustomLabel htmlFor="js_id" label="A label" />', options: [{ labelAttributes: ['label'], labelComponents: ['CustomLabel'] }] },
diff --git a/__tests__/src/rules/label-has-for-test.js b/__tests__/src/rules/label-has-for-test.js
@@ -34,7 +34,6 @@ const expectedEveryError = {
   type: 'JSXOpeningElement',
 };
 
-
 const optionsComponents = [{
   components: ['Label', 'Descriptor'],
 }];
diff --git a/__tests__/src/rules/no-onchange-test.js b/__tests__/src/rules/no-onchange-test.js
@@ -4,7 +4,6 @@
  * @author Ethan Cohen
  */
 
-
 // -----------------------------------------------------------------------------
 // Requirements
 // -----------------------------------------------------------------------------
diff --git a/__tests__/src/rules/role-has-required-aria-props-test.js b/__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 {
diff --git a/__tests__/src/util/hasAccessibleChild-test.js b/__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);
diff --git a/docs/rules/aria-activedescendant-has-tabindex.md b/docs/rules/aria-activedescendant-has-tabindex.md
@@ -1,6 +1,6 @@
 # aria-activedescendant-has-tabindex
 
-`aria-activedescendant` is used to manage focus within a [composite widget](https://www.w3.org/TR/wai-aria/roles#composite_header).
+`aria-activedescendant` is used to manage focus within a [composite widget](https://www.w3.org/TR/wai-aria/#composite).
 The element with the attribute `aria-activedescendant` retains the active document
 focus; it indicates which of its child elements has secondary focus by assigning
 the ID of that element to the value of `aria-activedescendant`. This pattern is
diff --git a/docs/rules/aria-proptypes.md b/docs/rules/aria-proptypes.md
@@ -3,7 +3,7 @@
 ARIA state and property values must be valid.
 
 #### References
-1. [Spec](https://www.w3.org/TR/wai-aria/states_and_properties)
+1. [Spec](https://www.w3.org/TR/wai-aria/#states_and_properties)
 2. [AX_ARIA_04](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04)
 
 ## Rule details
diff --git a/docs/rules/role-has-required-aria-props.md b/docs/rules/role-has-required-aria-props.md
@@ -3,7 +3,7 @@
 Elements with ARIA roles must have all required attributes for that role.
 
 #### References
-1. [Spec](https://www.w3.org/TR/wai-aria/roles)
+1. [Spec](https://www.w3.org/TR/wai-aria/#roles)
 2. [AX_ARIA_03](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03)
 
 ## Rule details
diff --git a/docs/rules/role-supports-aria-props.md b/docs/rules/role-supports-aria-props.md
@@ -4,7 +4,7 @@ Enforce that elements with explicit or implicit roles defined contain only `aria
 
 #### References
 1. [AX_ARIA_10](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10)
-2. [Supported States & Properties](https://www.w3.org/TR/wai-aria/roles#supportedState)
+2. [Supported States & Properties](https://www.w3.org/TR/wai-aria/#states_and_properties)
 
 ## Rule details
 
diff --git a/package.json b/package.json
@@ -30,47 +30,47 @@
     "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.4.0",
-    "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"
   },
   "peerDependencies": {
-    "eslint": "^3 || ^4 || ^5 || ^6"
+    "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
   },
   "jest": {
     "coverageReporters": [
diff --git a/src/index.js b/src/index.js
@@ -11,6 +11,7 @@ module.exports = {
     'aria-proptypes': require('./rules/aria-proptypes'),
     'aria-role': require('./rules/aria-role'),
     'aria-unsupported-elements': require('./rules/aria-unsupported-elements'),
+    'autocomplete-valid': require('./rules/autocomplete-valid'),
     'click-events-have-key-events': require('./rules/click-events-have-key-events'),
     'control-has-associated-label': require('./rules/control-has-associated-label'),
     'heading-has-content': require('./rules/heading-has-content'),
diff --git a/src/rules/alt-text.js b/src/rules/alt-text.js
@@ -218,7 +218,6 @@ module.exports = {
         return type;
       }));
 
-
     return {
       JSXOpeningElement: (node) => {
         const nodeType = elementType(node);
diff --git a/src/rules/anchor-has-content.js b/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 });
diff --git a/src/rules/img-redundant-alt.js b/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({
diff --git a/src/rules/no-distracting-elements.js b/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',
diff --git a/src/rules/no-noninteractive-tabindex.js b/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.
diff --git a/src/util/isNonInteractiveElement.js b/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(

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`import * as axe from 'axe-core';`
`3`	`3`
`4`	`4`	`export function axeFailMessage(checkId, data) {`
`5`		`- return axe._audit.data.checks[checkId].messages.fail(data);`
	`5`	`+ return axe.utils.getCheckMessage(checkId, 'fail', data);`
`6`	`6`	`}`