From e5f4eb57b4733d0b338f120842e719f6df51c035 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 23 Sep 2016 15:29:36 -0700
Subject: [PATCH] [eslint config] [*] [deps] update `eslint-plugin-import`,
 `eslint` to 3.6

---
 packages/eslint-config-airbnb-base/package.json       |  8 ++++----
 .../eslint-config-airbnb-base/rules/best-practices.js | 10 +++++++++-
 packages/eslint-config-airbnb-base/rules/imports.js   | 11 +++++++++++
 packages/eslint-config-airbnb-base/rules/style.js     |  2 +-
 packages/eslint-config-airbnb/package.json            |  8 ++++----
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json
index 37944d16..c4ba9ead 100644
--- a/packages/eslint-config-airbnb-base/package.json
+++ b/packages/eslint-config-airbnb-base/package.json
@@ -47,16 +47,16 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.0.0",
     "babel-tape-runner": "^2.0.1",
-    "eslint": "^3.5.0",
+    "eslint": "^3.6.0",
     "eslint-find-rules": "^1.13.2",
-    "eslint-plugin-import": "^1.15.0",
+    "eslint-plugin-import": "^1.16.0",
     "in-publish": "^2.0.0",
     "safe-publish-latest": "^1.1.0",
     "tape": "^4.6.0"
   },
   "peerDependencies": {
-    "eslint": "^3.5.0",
-    "eslint-plugin-import": "^1.15.0"
+    "eslint": "^3.6.0",
+    "eslint-plugin-import": "^1.16.0"
   },
   "engines": {
     "node": ">= 4"
diff --git a/packages/eslint-config-airbnb-base/rules/best-practices.js b/packages/eslint-config-airbnb-base/rules/best-practices.js
index 1da565f6..d8d10b33 100644
--- a/packages/eslint-config-airbnb-base/rules/best-practices.js
+++ b/packages/eslint-config-airbnb-base/rules/best-practices.js
@@ -15,7 +15,9 @@ module.exports = {
 
     // enforce that class methods use "this"
     // http://eslint.org/docs/rules/class-methods-use-this
-    'class-methods-use-this': 'error',
+    'class-methods-use-this': ['error', {
+      exceptMethods: [],
+    }],
 
     // require return statements to either always or never specify values
     'consistent-return': 'error',
@@ -179,6 +181,12 @@ module.exports = {
       object: 'arguments',
       property: 'callee',
       message: 'arguments.callee is deprecated,'
+    }, {
+      property: '__defineGetter__',
+      message: 'Please use Object.defineProperty instead.',
+    }, {
+      property: '__defineSetter__',
+      message: 'Please use Object.defineProperty instead.',
     }],
 
     // disallow use of assignment in return statement
diff --git a/packages/eslint-config-airbnb-base/rules/imports.js b/packages/eslint-config-airbnb-base/rules/imports.js
index 1f5c67a7..b7065dd3 100644
--- a/packages/eslint-config-airbnb-base/rules/imports.js
+++ b/packages/eslint-config-airbnb-base/rules/imports.js
@@ -138,5 +138,16 @@ module.exports = {
     // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-absolute-path.md
     // TODO: enable, semver-major
     'import/no-absolute-path': ['off'],
+
+    // Forbid require() calls with expressions
+    // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-dynamic-require.md
+    // TODO: enable, semver-major
+    'import/no-dynamic-require': ['off'],
+
+    // prevent importing the submodules of other modules
+    // https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-internal-modules.md
+    'import/no-internal-modules': ['off', {
+      allow: [],
+    }],
   },
 };
diff --git a/packages/eslint-config-airbnb-base/rules/style.js b/packages/eslint-config-airbnb-base/rules/style.js
index 181bd02f..4349e135 100644
--- a/packages/eslint-config-airbnb-base/rules/style.js
+++ b/packages/eslint-config-airbnb-base/rules/style.js
@@ -26,7 +26,7 @@ module.exports = {
     'consistent-this': 'off',
 
     // enforce newline at the end of file, with no multiple empty lines
-    'eol-last': 'error',
+    'eol-last': ['error', 'always'],
 
     // enforce spacing between functions and their invocations
     // http://eslint.org/docs/rules/func-call-spacing
diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index a69217c4..e320fdf0 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -50,9 +50,9 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.0.0",
     "babel-tape-runner": "^2.0.1",
-    "eslint": "^3.5.0",
+    "eslint": "^3.6.0",
     "eslint-find-rules": "^1.13.2",
-    "eslint-plugin-import": "^1.15.0",
+    "eslint-plugin-import": "^1.16.0",
     "eslint-plugin-jsx-a11y": "^2.2.2",
     "eslint-plugin-react": "^6.3.0",
     "in-publish": "^2.0.0",
@@ -61,9 +61,9 @@
     "tape": "^4.6.0"
   },
   "peerDependencies": {
-    "eslint": "^3.5.0",
+    "eslint": "^3.6.0",
     "eslint-plugin-jsx-a11y": "^2.2.2",
-    "eslint-plugin-import": "^1.15.0",
+    "eslint-plugin-import": "^1.16.0",
     "eslint-plugin-react": "^6.3.0"
   },
   "engines": {