Upgrade eslint (#3897)

SimenB · cpojer · commit 388fd8caf7b8 · 2017-06-26T09:14:24.000+02:00
diff --git a/.eslintignore b/.eslintignore
@@ -1,7 +1,6 @@
 **/coverage/**
 **/node_modules/**
 bin/
-docs/
 flow-typed/**
 packages/*/build/**
 packages/*/build-es5/**
diff --git a/.eslintrc-docs.json b/.eslintrc-docs.json
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,29 +7,58 @@
  */
 
 module.exports = {
-  'extends': [
+  extends: [
     './packages/eslint-config-fb-strict/index.js',
-    'plugin:import/errors'
+    'plugin:import/errors',
   ],
-  'parser': 'babel-eslint',
-  'rules': {
+  parser: 'babel-eslint',
+  rules: {
     'computed-property-spacing': 0,
     'flowtype/boolean-style': 2,
     'flowtype/no-primitive-constructor-types': 2,
     'flowtype/require-valid-file-annotation': 2,
     'max-len': 0,
     'no-multiple-empty-lines': 1,
     'import/no-duplicates': 2,
-    'import/no-unresolved': [2, { 'ignore': ['^types/'] }],
+    'import/no-unresolved': [2, { ignore: ['^types/'] }],
     // This has to be disabled until all type and module imports are combined
     // https://github.com/benmosher/eslint-plugin-import/issues/645
     'import/order': 0,
     // These has to be disabled until the whole code base is converted to ESM
     'import/default': 0,
     'import/named': 0,
   },
-  'plugins': [
-    'markdown',
-    'import'
-  ]
+  plugins: ['markdown', 'import'],
+  overrides: [
+    // to make it more suitable for running on code examples in docs/ folder
+    {
+      files: ['*.md'],
+      rules: {
+        'react/react-in-jsx-scope': 0,
+        'react/jsx-no-undef': 0,
+        'jest/no-focused-tests': 0,
+        'jest/valid-expect': 0,
+        'jest/no-identical-title': 0,
+        'no-undef': 0,
+        'no-unused-vars': 0,
+        'consistent-return': 0,
+        'import/no-unresolved': 0,
+        'sort-keys': 0
+      },
+    },
+    {
+      files: ['examples/**/*'],
+      rules: {
+        'babel/func-params-comma-dangle': 0,
+        'import/order': 0,
+        'import/no-unresolved': [2, { 'ignore': ['^react-native$'] }]
+      },
+    },
+    {
+      files: ['scripts/**/*', 'integration_tests/**/*'],
+      rules: {
+        'babel/func-params-comma-dangle': 0,
+      },
+    },
+  ],
 };
diff --git a/blog/2016-07-27-jest-14.md b/blog/2016-07-27-jest-14.md
@@ -54,7 +54,7 @@ By building a test renderer that targets no specific platform we are finally abl
 
 You can start using Jest with react-native by running `npm install --save-dev jest-react-native` and by adding the preset to your Jest configuration:
 
-```javascript
+```json
 "jest": {
   "preset": "jest-react-native"
 }
diff --git a/docs/en/MockFunctions.md b/docs/en/MockFunctions.md
@@ -25,7 +25,7 @@ invokes a callback for each item in a supplied array.
 
 ```javascript
 function forEach(items, callback) {
-  for (var index = 0; index < items.length; index++) {
+  for (let index = 0; index < items.length; index++) {
     callback(items[index]);
   }
 }
diff --git a/examples/.eslintrc b/examples/.eslintrc
diff --git a/integration_tests/.eslintrc b/integration_tests/.eslintrc
diff --git a/integration_tests/__tests__/iterator-to-null-test.js b/integration_tests/__tests__/iterator-to-null-test.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  */
+/* eslint-disable no-extend-native */
 
 'use strict';
 
diff --git a/package.json b/package.json
@@ -20,12 +20,12 @@
     "codecov": "^1.0.1",
     "cross-spawn": "^5.1.0",
     "enzyme": "^2.8.2",
-    "eslint": "^3.17.1",
+    "eslint": "^4.1.0",
     "eslint-plugin-babel": "^4.1.1",
-    "eslint-plugin-flowtype": "^2.30.3",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-markdown": "^1.0.0-beta.4",
-    "eslint-plugin-react": "^6.7.1",
+    "eslint-plugin-flowtype": "^2.34.0",
+    "eslint-plugin-import": "^2.6.0",
+    "eslint-plugin-markdown": "^1.0.0-beta.6",
+    "eslint-plugin-react": "^7.1.0",
     "flow-bin": "^0.48.0",
     "glob": "^7.1.1",
     "graceful-fs": "^4.1.11",
@@ -57,8 +57,7 @@
     "clean-all": "rm -rf ./node_modules && rm -rf ./packages/*/node_modules && rm -rf ./integration_tests/*/*/node_modules && yarn run build-clean",
     "jest": "node ./packages/jest-cli/bin/jest.js",
     "jest-coverage": "yarn run jest --silent -- --coverage",
-    "lint": "yarn run lint-prettier --silent && eslint . --cache && yarn run lint-docs --silent",
-    "lint-docs": "eslint --config ./.eslintrc-docs.json --no-ignore --ext md ./docs/*.md",
+    "lint": "yarn run lint-prettier --silent && eslint . --cache --ext js,md",
     "lint-es5-build": "eslint --no-eslintrc --no-ignore --env=browser packages/*/build-es5",
     "lint-prettier": "node scripts/prettier.js lint",
     "prettier": "node scripts/prettier.js write",
diff --git a/packages/babel-plugin-jest-hoist/README.md b/packages/babel-plugin-jest-hoist/README.md
@@ -29,7 +29,7 @@ $ babel --plugins jest-hoist script.js
 ### Via Node API
 
 ```javascript
-require("babel-core").transform("code", {
-  plugins: ["jest-hoist"]
+require('babel-core').transform('code', {
+  plugins: ['jest-hoist'],
 });
 ```
diff --git a/packages/babel-preset-jest/README.md b/packages/babel-preset-jest/README.md
@@ -29,7 +29,7 @@ $ babel script.js --presets jest
 ### Via Node API
 
 ```javascript
-require("babel-core").transform("code", {
-  presets: ["jest"]
+require('babel-core').transform('code', {
+  presets: ['jest'],
 });
 ```
diff --git a/packages/eslint-config-fb-strict/index.js b/packages/eslint-config-fb-strict/index.js
@@ -63,7 +63,7 @@ module.exports = Object.assign({}, fbjsConfig, {
     'semi': [2, 'always'],
     'sort-keys': [2],
     'space-before-blocks': [2],
-    'space-before-function-paren': [2, 'never'],
+    'space-before-function-paren': [2, {anonymous: 'never', asyncArrow: 'always', named: 'never'}],
     'space-in-parens': [2, 'never'],
   }),
 });
diff --git a/packages/eslint-plugin-jest/README.md b/packages/eslint-plugin-jest/README.md
@@ -61,7 +61,7 @@ This plugin exports a recommended configuration that enforces good testing pract
 
 To enable this configuration use the `extends` property in your `.eslintrc` config file:
 
-```js
+```json
 {
   "extends": ["plugin:jest/recommended"]
 }
diff --git a/packages/eslint-plugin-jest/docs/rules/no-disabled-tests.md b/packages/eslint-plugin-jest/docs/rules/no-disabled-tests.md
@@ -10,24 +10,24 @@ This rule looks for every `describe.skip`, `it.skip`, `test.skip`, `xdescribe`,
 The following patterns are considered warnings:
 
 ```js
-describe.skip("foo", function () {});
-it.skip("foo", function () {});
-describe["skip"]("bar", function () {});
-it["skip"]("bar", function () {});
-test.skip("foo", function () {});
-test["skip"]("bar", function () {});
-xdescribe("foo", function () {});
-xit("foo", function () {});
-xtest("bar", function () {});
+describe.skip('foo', () => {});
+it.skip('foo', () => {});
+describe['skip']('bar', () => {});
+it['skip']('bar', () => {});
+test.skip('foo', () => {});
+test['skip']('bar', () => {});
+xdescribe('foo', () => {});
+xit('foo', () => {});
+xtest('bar', () => {});
 ```
 
 These patterns would not be considered warnings:
 
 ```js
-describe("foo", function () {});
-it("foo", function () {});
-describe.only("bar", function () {});
-it.only("bar", function () {});
-test("foo", function () {});
-test.only("bar", function () {});
+describe('foo', () => {});
+it('foo', () => {});
+describe.only('bar', () => {});
+it.only('bar', () => {});
+test('foo', () => {});
+test.only('bar', () => {});
 ```
diff --git a/packages/eslint-plugin-jest/docs/rules/no-focused-tests.md b/packages/eslint-plugin-jest/docs/rules/no-focused-tests.md
@@ -12,31 +12,31 @@ This rule looks for every `describe.only`, `it.only`, `test.only`, `fdescribe`,
 Of course there are some edge-cases which can’t be detected by this rule e.g.:
 
 ```js
-var describeOnly = describe.only;
+const describeOnly = describe.only;
 describeOnly.apply(describe);
 ```
 
 The following patterns are considered warnings:
 
 ```js
-describe.only("foo", function () {});
-it.only("foo", function () {});
-describe["only"]("bar", function () {});
-it["only"]("bar", function () {});
-test.only("foo", function () {});
-test["only"]("bar", function () {});
-fdescribe("foo", function () {});
-fit("foo", function () {});
-ftest("bar", function () {});
+describe.only('foo', () => {});
+it.only('foo', () => {});
+describe['only']('bar', () => {});
+it['only']('bar', () => {});
+test.only('foo', () => {});
+test['only']('bar', () => {});
+fdescribe('foo', () => {});
+fit('foo', () => {});
+ftest('bar', () => {});
 ```
 
 These patterns would not be considered warnings:
 
 ```js
-describe("foo", function () {});
-it("foo", function () {});
-describe.skip("bar", function () {});
-it.skip("bar", function () {});
-test("foo", function () {});
-test.skip("bar", function () {});
+describe('foo', () => {});
+it('foo', () => {});
+describe.skip('bar', () => {});
+it.skip('bar', () => {});
+test('foo', () => {});
+test.skip('bar', () => {});
 ```
diff --git a/packages/eslint-plugin-jest/docs/rules/no-identical-title.md b/packages/eslint-plugin-jest/docs/rules/no-identical-title.md
@@ -9,15 +9,15 @@ This rule looks at the title of every test and test suites. It will report when
 The following patterns are considered warnings:
 
 ```js
-describe('foo', function () {
-  it('should do bar', function() {});
-  it('should do bar', function() {}); // Has the same title as the previous test
+describe('foo', () => {
+  it('should do bar', () => {});
+  it('should do bar', () => {}); // Has the same title as the previous test
 
-  describe('baz', function() {
+  describe('baz', () => {
     // ...
   });
 
-  describe('baz', function() { // Has the same title as a previous test suite
+  describe('baz', () => { // Has the same title as a previous test suite
     // ...
   });
 });
@@ -26,20 +26,20 @@ describe('foo', function () {
 These patterns would not be considered warnings:
 
 ```js
-describe('foo', function () {
-  it('should do foo', function() {});
-  it('should do bar', function() {});
+describe('foo', () => {
+  it('should do foo', () => {});
+  it('should do bar', () => {});
 
   // Has the same name as a parent test suite, which is fine
-  describe('foo', function() {
+  describe('foo', () => {
     // Has the same name as a test in a parent test suite, which is fine
-    it('should do foo', function() {});
-    it('should work', function() {});
+    it('should do foo', () => {});
+    it('should work', () => {});
   });
 
-  describe('baz', function() { // Has the same title as a previous test suite
+  describe('baz', () => { // Has the same title as a previous test suite
     // Has the same name as a test in a sibling test suite, which is fine
-    it('should work', function() {});
+    it('should work', () => {});
   });
 });
 ```
diff --git a/packages/eslint-plugin-jest/docs/rules/valid-expect.md b/packages/eslint-plugin-jest/docs/rules/valid-expect.md
@@ -15,7 +15,7 @@ expect('something');
 or when a matcher function was not called, e.g.:
 
 ```js
-expect(true).toBeDefined
+expect(true).toBeDefined;
 ```
 
 This rule is enabled by default.
diff --git a/packages/jest-mock/README.md b/packages/jest-mock/README.md
@@ -25,7 +25,7 @@ values for its mocks member and its return values.
 
 Inspects the argument and returns its schema in the following recursive format:
 
-```js
+```
 {
   type: ...
   members : {}
@@ -40,18 +40,18 @@ prototype should always be `object`. For instance, a simple class might be
 defined like this:
 
 ```js
-{
+const classDef = {
   type: 'function',
   members: {
     staticMethod: {type: 'function'},
     prototype: {
       type: 'object',
       members: {
-        instanceMethod: {type: 'function'}
-      }
-    }
-  }
-}
+        instanceMethod: {type: 'function'},
+      },
+    },
+  },
+};
  ```
 
 Metadata may also contain references to other objects defined within the
@@ -61,13 +61,13 @@ same metadata object. The metadata for the referent must be marked with
 For instance, this metadata blob:
 
 ```js
-{
+const refID = {
   type: 'object',
   refID: 1,
   members: {
-    self: {ref: 1}
-  }
-}
+    self: {ref: 1},
+  },
+};
 ```
 
 defines an object with a slot named `self` that refers back to the object.
diff --git a/packages/jest-validate/README.md b/packages/jest-validate/README.md
diff --git a/packages/pretty-format/README.md b/packages/pretty-format/README.md
diff --git a/scripts/.eslintrc b/scripts/.eslintrc
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ By building a test renderer that targets no specific platform we are finally abl`
`54`	`54`
`55`	`55`	You can start using Jest with react-native by running `npm install --save-dev jest-react-native` and by adding the preset to your Jest configuration:
`56`	`56`
`57`		-```javascript
	`57`	+```json
`58`	`58`	`"jest": {`
`59`	`59`	`"preset": "jest-react-native"`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ invokes a callback for each item in a supplied array.`
`25`	`25`
`26`	`26`	```javascript
`27`	`27`	`function forEach(items, callback) {`
`28`		`- for (var index = 0; index < items.length; index++) {`
	`28`	`+ for (let index = 0; index < items.length; index++) {`
`29`	`29`	`callback(items[index]);`
`30`	`30`	`}`
`31`	`31`	`}`