From 72c65393da3a3c3fb9f97d34ca94a81eadc09f6e Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 20 Dec 2016 23:38:10 +0900 Subject: [PATCH] Update eslint --- ...orm-v3.4.0.json => .eslintrc-platform.json | 32 +++++++++++++++---- .eslintrc.json | 2 +- package.json | 6 ++-- 3 files changed, 30 insertions(+), 10 deletions(-) rename .eslintrc-platform-v3.4.0.json => .eslintrc-platform.json (89%) diff --git a/.eslintrc-platform-v3.4.0.json b/.eslintrc-platform.json similarity index 89% rename from .eslintrc-platform-v3.4.0.json rename to .eslintrc-platform.json index c5c100e6..5fdb105b 100644 --- a/.eslintrc-platform-v3.4.0.json +++ b/.eslintrc-platform.json @@ -1,4 +1,5 @@ { + "comment": "mattermost/platform@3.5.0/webapp/.eslintrc.json", "extends": "eslint:recommended", "parserOptions": { "ecmaVersion": 6, @@ -36,6 +37,7 @@ "block-scoped-var": 2, "brace-style": [2, "1tbs", { "allowSingleLine": false }], "camelcase": [2, {"properties": "never"}], + "class-methods-use-this": 1, "comma-dangle": [2, "never"], "comma-spacing": [2, {"before": false, "after": true}], "comma-style": [2, "last"], @@ -48,6 +50,7 @@ "dot-location": [2, "object"], "dot-notation": 2, "eqeqeq": [2, "smart"], + "func-call-spacing": [2, "never"], "func-names": 2, "func-style": [2, "declaration"], "generator-star-spacing": [2, {"before": false, "after": true}], @@ -56,14 +59,16 @@ "id-blacklist": 0, "indent": [2, 4, {"SwitchCase": 0}], "jsx-quotes": [2, "prefer-single"], - "key-spacing": [2, {"beforeColon": false, "afterColon": true}], + "key-spacing": [2, {"beforeColon": false, "afterColon": true, "mode": "strict"}], "keyword-spacing": [2, {"before": true, "after": true, "overrides": {}}], + "line-comment-position": 0, "linebreak-style": 2, "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }], "max-lines": [1, {"max": 450, "skipBlankLines": true, "skipComments": false}], "max-nested-callbacks": [1, {"max":1}], "max-nested-callbacks": [2, {"max":2}], "max-statements-per-line": [2, {"max": 1}], + "multiline-ternary": [1, "never"], "new-cap": 2, "new-parens": 2, "newline-before-return": 0, @@ -99,6 +104,8 @@ "no-fallthrough": 2, "no-floating-decimal": 2, "no-func-assign": 2, + "no-global-assign": 2, + "no-implicit-coercion": 2, "no-implicit-globals": 0, "no-implied-eval": 2, "no-inner-declarations": 0, @@ -131,12 +138,14 @@ "no-redeclare": 2, "no-return-assign": [2, "always"], "no-script-url": 2, - "no-self-assign": 2, + "no-self-assign": [2, {"props": true}], "no-self-compare": 2, "no-sequences": 2, "no-shadow": [2, {"hoist": "functions"}], "no-shadow-restricted-names": 2, "no-spaced-func": 2, + "no-tabs": 0, + "no-template-curly-in-string": 2, "no-ternary": 0, "no-this-before-super": 2, "no-throw-literal": 2, @@ -149,6 +158,7 @@ "no-unneeded-ternary": [2, {"defaultAssignment": false}], "no-unreachable": 2, "no-unsafe-finally": 2, + "no-unsafe-negation": 2, "no-unused-expressions": 2, "no-unused-vars": [2, {"vars": "all", "args": "after-used"}], "no-use-before-define": [2, "nofunc"], @@ -172,6 +182,7 @@ "padded-blocks": [2, "never"], "prefer-arrow-callback": 2, "prefer-const": 2, + "prefer-numeric-literals": 2, "prefer-reflect": 2, "prefer-rest-params": 2, "prefer-spread": 2, @@ -184,6 +195,7 @@ "react/jsx-closing-bracket-location": [2, { "location": "tag-aligned" }], "react/jsx-curly-spacing": [2, "never"], "react/jsx-equals-spacing": [2, "never"], + "react/jsx-filename-extension": 2, "react/jsx-first-prop-new-line": [2, "multiline"], "react/jsx-handler-names": 0, "react/jsx-indent": [2, 4], @@ -196,11 +208,10 @@ "react/jsx-no-target-blank": 2, "react/jsx-no-undef": 2, "react/jsx-pascal-case": 2, - "react/jsx-filename-extension": 2, "react/jsx-space-before-closing": [2, "never"], "react/jsx-uses-react": 2, "react/jsx-uses-vars": 2, - "react/no-comment-textnodes": 2, + "react/jsx-no-comment-textnodes": 2, "react/no-danger": 0, "react/no-deprecated": 2, "react/no-did-mount-set-state": 2, @@ -219,19 +230,28 @@ "react/require-render-return": 2, "react/self-closing-comp": 2, "react/sort-comp": 0, - "react/wrap-multilines": 2, + "react/jsx-wrap-multilines": 2, + "react/no-find-dom-node": 1, + "react/forbid-component-props": 0, + "react/no-danger-with-children": 2, + "react/no-unused-prop-types": [1, {"skipShapeProps": true}], + "react/style-prop-object": 2, + "react/no-children-prop": 2, + "react/no-unescaped-entities": 2, "require-yield": 2, "rest-spread-spacing": [2, "never"], "semi": [2, "always"], "semi-spacing": [2, {"before": false, "after": true}], "sort-imports": 0, + "sort-keys": 0, "space-before-blocks": [2, "always"], "space-before-function-paren": [2, "never"], "space-in-parens": [2, "never"], "space-infix-ops": 2, "space-unary-ops": [2, { "words": true, "nonwords": false }], + "symbol-description": 2, "template-curly-spacing": [2, "never"], - "valid-typeof": 2, + "valid-typeof": [2, {"requireStringLiterals": false}], "vars-on-top": 0, "wrap-iife": [2, "outside"], "wrap-regex": 2, diff --git a/.eslintrc.json b/.eslintrc.json index cc864d9b..f2e32637 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "./.eslintrc-platform-v3.4.0.json", + "extends": "./.eslintrc-platform.json", "rules": { "global-require": 1, "indent": [2, 2, {"SwitchCase": 0}], diff --git a/package.json b/package.json index 27f7b1f7..a47bf3bc 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "devDependencies": { "7zip-bin": "^2.0.1", "babel-core": "^6.7.5", - "babel-eslint": "^6.1.2", + "babel-eslint": "^7.1.1", "babel-loader": "^6.2.4", "babel-preset-react": "^6.5.0", "chai": "^3.5.0", @@ -47,8 +47,8 @@ "electron": "1.4.12", "electron-builder": "^7.11.2", "electron-connect": "~0.6.0", - "eslint": "^3.4.0", - "eslint-plugin-react": "^6.2.0", + "eslint": "^3.12.2", + "eslint-plugin-react": "^6.8.0", "gulp": "^3.9.1", "gulp-diff": "^1.0.0", "gulp-esformatter": "^6.0.0",