Update eslint packages (decred#1145)

guangminglion · Feb 6, 2018 · 9fb4e6d · 9fb4e6d
1 parent d7aef8b
commit 9fb4e6d
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 279 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -11,10 +11,12 @@ module.exports = {
   "parser": "babel-eslint",
   "extends": "eslint:recommended",
   "rules": {
-    "indent": [
+    "indent-legacy": [
       "error",
       2
     ],
+    "indent": ["off"],
+    "no-useless-escape": ["off"],
     "linebreak-style": [
       "error",
       "unix"

diff --git a/app/components/inputs/DcrInput.js b/app/components/inputs/DcrInput.js
@@ -13,7 +13,7 @@ import balanceConnector from "connectors/balance";
  * Whenever possible, use the DcrInput component, as it is more flexible and
  * already manages the underlying input value in atoms.
  */
-export const FixedDcrInput = ({...props, currencyDisplay}) =>
+export const FixedDcrInput = ({currencyDisplay, ...props}) =>
   <FloatInput {...{...props, unit: currencyDisplay, maxFracDigits: 8}} />;
 
 /**

diff --git a/app/components/inputs/FeeInput.js b/app/components/inputs/FeeInput.js
@@ -2,7 +2,7 @@ import NumericInput from "./NumericInput";
 import balanceConnector from "connectors/balance";
 
 // FeeInput is an input that restricts values to a fee (DCR/KB or similar)
-const FeeInput = ({...props, currencyDisplay}) =>
+const FeeInput = ({currencyDisplay, ...props}) =>
   <NumericInput {...{...props, unit: currencyDisplay + "/KB"}} />;
 
 export default balanceConnector(FeeInput);
diff --git a/app/components/inputs/FloatInput.js b/app/components/inputs/FloatInput.js
@@ -1,7 +1,7 @@
 import NumericInput from "./NumericInput";
 import { restrictToStdDecimalNumber, limitFractionalDigits } from "helpers/strings";
 
-const FloatInput = ({...props, maxFracDigits}) => {
+const FloatInput = ({maxFracDigits, ...props}) => {
 
   var value = props.value;
 

diff --git a/app/components/views/GetStartedPage/AdvancedStartup/Form.js b/app/components/views/GetStartedPage/AdvancedStartup/Form.js
@@ -12,8 +12,6 @@ export const AdvancedHeader = () => (
 );
 
 const AdvancedBodyBase = ({
-  ...props,
-  ...state,
   onShowRemote,
   onShowAppData,
   sideActive,
@@ -32,7 +30,8 @@ const AdvancedBodyBase = ({
   rpchost,
   rpcport,
   appData,
-  intl
+  intl,
+  ...props,
  }) => {
   return (
     <div className="advanced-page">
@@ -50,7 +49,6 @@ const AdvancedBodyBase = ({
           {sideActive ?
             <RemoteDaemonForm {...{
               ...props,
-              ...state,
               onSubmitRemoteForm,
               setRpcUser,
               setRpcPass,
@@ -67,7 +65,6 @@ const AdvancedBodyBase = ({
             /> :
             <AppDataForm {...{
               ...props,
-              ...state,
               onSubmitAppDataForm,
               setAppData,
               appData,

diff --git a/app/components/views/TicketsPage/PurchaseTab/PurchaseTickets/PurchaseTicketsAdvanced.js b/app/components/views/TicketsPage/PurchaseTab/PurchaseTickets/PurchaseTicketsAdvanced.js
@@ -17,7 +17,6 @@ const messages = defineMessages({
 });
 
 const PurchaseTicketsAdvanced = ({
-  ...props,
   configuredStakePools,
   stakePool,
   ticketFee,
@@ -32,6 +31,7 @@ const PurchaseTicketsAdvanced = ({
   onChangeTxFee,
   onChangeExpiry,
   formatMessage,
+  ...props,
 }) => (
     <Aux>
       <div className="stakepool-purchase-ticket-row">

diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "asar": "^0.12.3",
     "babel-cli": "^6.24.1",
     "babel-core": "^6.25.0",
-    "babel-eslint": "^7.1.0",
+    "babel-eslint": "^8.2.1",
     "babel-jest": "^21.0.2",
     "babel-loader": "^7.1.1",
     "babel-plugin-add-module-exports": "^0.2.1",
@@ -143,18 +143,18 @@
     "devtron": "^1.4.0",
     "electron": "1.7.11",
     "enzyme": "^3.1.0",
-    "eslint": "^3.12.1",
-    "eslint-config-airbnb": "^13.0.0",
-    "eslint-config-standard": "^6.2.1",
+    "eslint": "^4.16.0",
+    "eslint-config-airbnb": "^16.1.0",
+    "eslint-config-standard": "^10.2.1",
     "eslint-formatter-pretty": "^1.1.0",
     "eslint-loader": "^1.6.0",
-    "eslint-plugin-flowtype-errors": "^1.5.0",
+    "eslint-plugin-flowtype-errors": "^3.3.7",
     "eslint-plugin-import": "^2.1.0",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-mocha": "^4.7.0",
     "eslint-plugin-promise": "^3.3.0",
-    "eslint-plugin-react": "^6.9.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint-plugin-react": "^7.6.1",
+    "eslint-plugin-standard": "^3.0.1",
     "express": "^4.14.0",
     "extract-text-webpack-plugin": "^3.0.0",
     "fbjs-scripts": "^0.7.1",