summaryrefslogtreecommitdiff
path: root/.eslintrc.yml
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-10-09 15:25:53 +0000
committerFatih Acet <acetfatih@gmail.com>2018-10-09 15:25:53 +0000
commitd76190371c1ab3ab08f11604aa06196c2acd7138 (patch)
tree6612104ab5d7910ba84079982ea4ad5388c05865 /.eslintrc.yml
parentb46894b15b6840c1cc8300120e2fd2ccb0dcc97f (diff)
downloadgitlab-ce-d76190371c1ab3ab08f11604aa06196c2acd7138.tar.gz
Resolve "Harmonize prettier and eslint configs"
Diffstat (limited to '.eslintrc.yml')
-rw-r--r--.eslintrc.yml51
1 files changed, 12 insertions, 39 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml
index a954bb4ff37..d04a10a9127 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,9 +1,9 @@
----
env:
browser: true
es6: true
extends:
- airbnb-base
+ - prettier
- plugin:vue/recommended
globals:
__webpack_public_path__: true
@@ -19,34 +19,31 @@ plugins:
- promise
settings:
html/html-extensions:
- - ".html"
- - ".html.raw"
+ - '.html'
+ - '.html.raw'
import/resolver:
webpack:
- config: "./config/webpack.config.js"
+ config: './config/webpack.config.js'
rules:
filenames/match-regex:
- error
- - "^[a-z0-9_]+$"
+ - '^[a-z0-9_]+$'
import/no-commonjs: error
- no-multiple-empty-lines:
- - error
- - max: 1
promise/catch-or-return: error
no-param-reassign:
- error
- props: true
ignorePropertyModificationsFor:
- - "acc" # for reduce accumulators
- - "accumulator" # for reduce accumulators
- - "el" # for DOM elements
- - "element" # for DOM elements
- - "state" # for Vuex mutations
+ - 'acc' # for reduce accumulators
+ - 'accumulator' # for reduce accumulators
+ - 'el' # for DOM elements
+ - 'element' # for DOM elements
+ - 'state' # for Vuex mutations
no-underscore-dangle:
- error
- allow:
- - __
- - _links
+ - __
+ - _links
no-mixed-operators: off
vue/html-self-closing:
- error
@@ -60,31 +57,7 @@ rules:
- error
- properties: never
ignoreDestructuring: true
- ## Conflicting rules with prettier:
- space-before-function-paren: off
- curly: off
- arrow-parens: off
- function-paren-newline: off
- object-curly-newline: off
- padded-blocks: off
- # Disabled for now, to make the eslint 3 -> eslint 5 update smoother
- ## Indent rule. We are using the old for now: https://eslint.org/docs/user-guide/migrating-to-4.0.0#indent-rewrite
- indent: off
- indent-legacy:
- - error
- - 2
- - SwitchCase: 1
- VariableDeclarator: 1
- outerIIFEBody: 1
- FunctionDeclaration:
- parameters: 1
- body: 1
- FunctionExpression:
- parameters: 1
- body: 1
# Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
- operator-linebreak: off
- implicit-arrow-linebreak: off
no-else-return:
- error
- allowElseIf: true