Merge branch 'master' into more-flow-configuration

Author: jessebeach

__tests__/src/rules/img-redundant-alt-test.js

@@ -57,6 +57,8 @@ ruleTester.run('img-redundant-alt', rule, {
     { code: '<UX.Layout>test</UX.Layout>' },
     { code: '<img alt={imageAlt} />' },
     { code: '<img alt />' },
+    { code: '<img alt="Photography" />;' },
+    { code: '<img alt="ImageMagick" />;' },
   ].map(parserOptionsMapper),
   invalid: [
     { code: '<img alt="Photo of friend." />;', errors: [expectedError] },

docs/rules/img-has-alt.md

@@ -18,7 +18,7 @@ This rule takes one optional object argument of type object:
 
 For the `components` option, these strings determine which JSX elements (**always including** `<img>`) should be checked for having `alt` prop. This is a good use case when you have a wrapper component that simply renders an `img` element (like in React):
 
-```js
+```jsx
 // Image.js
 const Image = props => {
   const {
@@ -42,7 +42,7 @@ return (
 );
 ```
 
-Note that passing props as spread attribute without `alt` explicitly defined will cause this rule to fail. Explicitly pass down `alt` prop or use `role="presentation"` for rule to pass. Use `Image` component above as a reference for destructuring and applying the prop. **It is a good thing to explicitly pass props that you expect to be passed for self-documentation.** For example:
+Note that passing props as spread attribute without `alt` explicitly defined will cause this rule to fail. Explicitly pass down `alt` prop for rule to pass. Use `Image` component above as a reference for destructuring and applying the prop. **It is a good thing to explicitly pass props that you expect to be passed for self-documentation.** For example:
 
 #### Bad
 ```jsx
@@ -85,4 +85,5 @@ function Foo(props) {
 <img {...props} alt /> // Has no value
 <img {...props} alt={undefined} /> // Has no value
 <img {...props} alt={`${undefined}`} /> // Has no value
+<img src="foo" role="presentation" /> // Avoid ARIA if it can be achieved without
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-jsx-a11y",
   "version": "3.0.2",
-  "description": "A static analysis linter of jsx and their accessibility with screen readers.",
+  "description": "Static AST checker for accessibility rules on JSX elements.",
   "keywords": [
     "eslint",
     "eslintplugin",
@@ -42,7 +42,7 @@
     "eslint-plugin-flowtype": "^2.29.2",
     "eslint-plugin-import": "^2.2.0",
     "expect": "^1.20.2",
-    "flow-bin": "^0.37.4",
+    "flow-bin": "^0.38.0",
     "jest": "^18.1.0",
     "jscodeshift": "^0.3.30",
     "minimist": "^1.2.0",

src/rules/img-redundant-alt.js

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