summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-05-28 10:54:38 +0200
committerLukas Eipert <leipert@gitlab.com>2018-05-29 18:35:07 +0200
commitc0f3bd92a775afd1eb92943bfeccee7706e00ac5 (patch)
tree2da51cf05ba131a85163d88078a297d19e33bc08
parenta30e6b819bcf87c5297fe68bb54dd1751f7e0bfb (diff)
downloadgitlab-ce-c0f3bd92a775afd1eb92943bfeccee7706e00ac5.tar.gz
convert eslintrc to yml
-rw-r--r--.eslintrc56
-rw-r--r--.eslintrc.yml53
2 files changed, 53 insertions, 56 deletions
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 3f187db0c07..00000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "env": {
- "browser": true,
- "es6": true
- },
- "extends": [
- "airbnb-base",
- "plugin:vue/recommended"
- ],
- "globals": {
- "__webpack_public_path__": true,
- "gl": false,
- "gon": false,
- "localStorage": false
- },
- "parserOptions": {
- "parser": "babel-eslint"
- },
- "plugins": [
- "filenames",
- "import",
- "html",
- "promise"
- ],
- "settings": {
- "html/html-extensions": [".html", ".html.raw"],
- "import/resolver": {
- "webpack": {
- "config": "./config/webpack.config.js"
- }
- }
- },
- "rules": {
- "filenames/match-regex": [2, "^[a-z0-9_]+$"],
- "import/no-commonjs": "error",
- "no-multiple-empty-lines": ["error", { "max": 1 }],
- "promise/catch-or-return": "error",
- "no-underscore-dangle": ["error", { "allow": ["__", "_links"] }],
- "no-mixed-operators": 0,
- "space-before-function-paren": 0,
- "curly": 0,
- "arrow-parens": 0,
- "vue/html-self-closing": [
- "error",
- {
- "html": {
- "void": "always",
- "normal": "never",
- "component": "always"
- },
- "svg": "always",
- "math": "always"
- }
- ]
- }
-}
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 00000000000..ceacf23f19c
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,53 @@
+---
+env:
+ browser: true
+ es6: true
+extends:
+ - airbnb-base
+ - plugin:vue/recommended
+globals:
+ __webpack_public_path__: true
+ gl: false
+ gon: false
+ localStorage: false
+parserOptions:
+ parser: babel-eslint
+plugins:
+ - filenames
+ - import
+ - html
+ - promise
+settings:
+ html/html-extensions:
+ - ".html"
+ - ".html.raw"
+ import/resolver:
+ webpack:
+ config: "./config/webpack.config.js"
+rules:
+ filenames/match-regex:
+ - error
+ - "^[a-z0-9_]+$"
+ import/no-commonjs: error
+ no-multiple-empty-lines:
+ - error
+ - max: 1
+ promise/catch-or-return: error
+ no-underscore-dangle:
+ - error
+ - allow:
+ - __
+ - _links
+ no-mixed-operators: 0
+ vue/html-self-closing:
+ - error
+ - html:
+ void: always
+ normal: never
+ component: always
+ svg: always
+ math: always
+ ## Conflicting rules with prettier:
+ space-before-function-paren: 0
+ curly: 0
+ arrow-parens: 0