Merge branch 'master' of github.com:evcohen/eslint-plugin-jsx-a11y into fix-aria-1-2-test-failures

jessebeach · jessebeach · commit f87561d0b66c · 2020-06-17T13:56:32.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__/src/rules/lang-test.js b/__tests__/src/rules/lang-test.js
@@ -30,6 +30,10 @@ ruleTester.run('lang', rule, {
     { code: '<div lang="foo" />;' },
     { code: '<html lang="en" />' },
     { code: '<html lang="en-US" />' },
+    { code: '<html lang="zh-Hans" />' },
+    { code: '<html lang="zh-Hant-HK" />' },
+    { code: '<html lang="zh-yue-Hant" />' },
+    { code: '<html lang="ja-Latn" />' },
     { code: '<html lang={foo} />' },
     { code: '<HTML lang="foo" />' },
     { code: '<Foo lang="bar" />' },
diff --git a/__tests__/src/rules/mouse-events-have-key-events-test.js b/__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] },
diff --git a/docs/rules/lang.md b/docs/rules/lang.md
@@ -1,17 +1,19 @@
 # lang
 
-The `lang` prop on the `<html>` element must have a valid value based on ISO country and language codes.
+The `lang` prop on the `<html>` element must be a valid IETF's BCP 47 language tag.
 
 #### References
+
 1. [axe-core, valid-lang](https://dequeuniversity.com/rules/axe/3.2/valid-lang)
-2. [ISO Language Codes](http://www.w3schools.com/tags/ref_language_codes.asp)
-3. [ISO Country Codes](http://www.w3schools.com/tags/ref_country_codes.asp)
+2. [Language tags in HTML and XML](https://www.w3.org/International/articles/language-tags/)
+3. [IANA Language Subtag Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
 
 ## Rule details
 
 This rule takes no arguments.
 
 ### Succeed
+
 ```jsx
 <html lang="en">
 <html lang="en-US">
diff --git a/package.json b/package.json
@@ -30,47 +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/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.0.1",
-    "eslint": "^3 || ^4 || ^5 || ^6",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-plugin-flowtype": "^5.0.0",
-    "eslint-plugin-import": "^2.18.0",
-    "estraverse": "^4.2.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.113.0",
-    "in-publish": "^2.0.0",
-    "jest": "^24.0.0",
-    "jscodeshift": "^0.6.0",
-    "minimist": "^1.2.0",
+    "in-publish": "^2.0.1",
+    "jest": "^24.9.0",
+    "jscodeshift": "^0.7.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",
+    "@babel/runtime": "^7.10.2",
     "aria-query": "^4.0.2",
-    "array-includes": "^3.0.3",
+    "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",
+    "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": [
diff --git a/src/rules/lang.js b/src/rules/lang.js
@@ -8,8 +8,8 @@
 // ----------------------------------------------------------------------------
 
 import { propName, elementType, getLiteralPropValue } from 'jsx-ast-utils';
+import tags from 'language-tags';
 import { generateObjSchema } from '../util/schemas';
-import ISO_CODES from '../util/attributes/ISO.json';
 
 const errorMessage = 'lang attribute must have a valid value.';
 
@@ -51,12 +51,7 @@ module.exports = {
         return;
       }
 
-      const hyphen = value.indexOf('-');
-      const lang = hyphen > -1 ? value.substring(0, hyphen) : value;
-      const country = hyphen > -1 ? value.substring(3) : undefined;
-
-      if (ISO_CODES.languages.indexOf(lang) > -1
-        && (country === undefined || ISO_CODES.countries.indexOf(country) > -1)) {
+      if (tags.check(value)) {
         return;
       }
 
diff --git a/src/rules/mouse-events-have-key-events.js b/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.
diff --git a/src/util/attributes/ISO.json b/src/util/attributes/ISO.json
