Merge branch 'master' into greenkeeper/emoji-regex-9.0.0

Author: jessebeach

__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'] }] },

package.json

@@ -35,11 +35,11 @@
     "@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",
+    "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": "^4.5.2",
+    "eslint-plugin-flowtype": "^5.0.0",
     "eslint-plugin-import": "^2.18.0",
     "estraverse": "^4.2.0",
     "expect": "^24.3.1",