From b4c84bd4c73fd524e9d70e1ecfbc56e597d0974d Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 14:32:02 +0000 Subject: [PATCH 1/9] Updating ESlint to ^4.15.0 and adding new rules to config --- .eslintrc | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index 44a504e4080..1af8fe076c2 100644 --- a/.eslintrc +++ b/.eslintrc @@ -12,6 +12,9 @@ "rules": { "no-console": "off", "strict": ["error", "global"], - "curly": "warn" + "curly": "warn", + "getter-return": "error", + "function-paren-newline": ["error", "multiline"], + "implicit-arrow-linebreak": ["error", "beside"] } } diff --git a/package.json b/package.json index 5758c6263af..58a91cbfc94 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "precommit": "lint-staged" }, "devDependencies": { - "eslint": "^4.4.1", + "eslint": "^4.15.0", "husky": "^0.13.2", "lerna": "^2.0.0", "lerna-changelog": "^0.6.0", From 6ba1aa8ad61f551f72c212673d94ec38a065d255 Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 15:21:57 +0000 Subject: [PATCH 2/9] remoning style rule and auto fixing breakages from new rules --- .eslintrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 1af8fe076c2..a5317db8a79 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,7 +14,6 @@ "strict": ["error", "global"], "curly": "warn", "getter-return": "error", - "function-paren-newline": ["error", "multiline"], "implicit-arrow-linebreak": ["error", "beside"] } } From 4e41a7fccafe98e33aa198e2d78a99b38f462de1 Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 15:49:53 +0000 Subject: [PATCH 3/9] Removing implicit-arrow-linebreak style rule --- .eslintrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index a5317db8a79..29eafb8d59a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -13,7 +13,6 @@ "no-console": "off", "strict": ["error", "global"], "curly": "warn", - "getter-return": "error", - "implicit-arrow-linebreak": ["error", "beside"] + "getter-return": "error" } } From e3d44a5983396e21a42462aa91add59b42bf9f9d Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 16:51:43 +0000 Subject: [PATCH 4/9] adding new rule to eslint config project --- packages/eslint-config-react-app/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js index c7a619abd62..e4aaba26335 100644 --- a/packages/eslint-config-react-app/index.js +++ b/packages/eslint-config-react-app/index.js @@ -239,6 +239,7 @@ module.exports = { 'Please use import() instead. More info: https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting', }, ], + 'getter-return': 'error', // https://github.com/benmosher/eslint-plugin-import/tree/master/docs/rules 'import/first': 'error', From 0d1273268d63c0aa08eebf13dff808334f6159d6 Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 17:58:06 +0000 Subject: [PATCH 5/9] updating react scripts eslint version --- package.json | 2 +- packages/react-scripts/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 58a91cbfc94..5758c6263af 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "precommit": "lint-staged" }, "devDependencies": { - "eslint": "^4.15.0", + "eslint": "^4.4.1", "husky": "^0.13.2", "lerna": "^2.0.0", "lerna-changelog": "^0.6.0", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index dcac53cf49f..af773fc4520 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -32,7 +32,7 @@ "chalk": "1.1.3", "css-loader": "0.28.7", "dotenv": "4.0.0", - "eslint": "4.10.0", + "eslint": "^4.15.0", "eslint-config-react-app": "^2.0.1", "eslint-loader": "1.9.0", "eslint-plugin-flowtype": "2.39.1", From 27ecdeafccf3e042e3de54fed2d7e1ff60281fb1 Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 18:01:24 +0000 Subject: [PATCH 6/9] Pinning version. --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 7b3883c5829..ef6f91dec63 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -32,7 +32,7 @@ "chalk": "1.1.3", "css-loader": "0.28.7", "dotenv": "4.0.0", - "eslint": "^4.15.0", + "eslint": "4.15.0", "dotenv-expand": "4.0.1", "eslint-config-react-app": "^2.0.1", "eslint-loader": "1.9.0", From b5b7cc03409dfdbaea6f050c082433c4daff655d Mon Sep 17 00:00:00 2001 From: Chris Laughlin Date: Tue, 9 Jan 2018 18:02:08 +0000 Subject: [PATCH 7/9] Changing getter-return to warn --- packages/eslint-config-react-app/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js index e4aaba26335..5503ad21a24 100644 --- a/packages/eslint-config-react-app/index.js +++ b/packages/eslint-config-react-app/index.js @@ -239,7 +239,7 @@ module.exports = { 'Please use import() instead. More info: https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting', }, ], - 'getter-return': 'error', + 'getter-return': 'warn', // https://github.com/benmosher/eslint-plugin-import/tree/master/docs/rules 'import/first': 'error', From c03ca1628c3a5ddac5f0f569d0d2d11d8803765b Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 12 Jan 2018 20:06:27 +0000 Subject: [PATCH 8/9] Update package.json --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index ef6f91dec63..2aace690b15 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -32,8 +32,8 @@ "chalk": "1.1.3", "css-loader": "0.28.7", "dotenv": "4.0.0", - "eslint": "4.15.0", "dotenv-expand": "4.0.1", + "eslint": "4.15.0", "eslint-config-react-app": "^2.0.1", "eslint-loader": "1.9.0", "eslint-plugin-flowtype": "2.39.1", From eace2dec0f7516c0ceab54c56528da39e8a7ebe0 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 12 Jan 2018 20:06:53 +0000 Subject: [PATCH 9/9] Update .eslintrc --- .eslintrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index 29eafb8d59a..44a504e4080 100644 --- a/.eslintrc +++ b/.eslintrc @@ -12,7 +12,6 @@ "rules": { "no-console": "off", "strict": ["error", "global"], - "curly": "warn", - "getter-return": "error" + "curly": "warn" } }