Merge remote-tracking branch 'upstream/pull/3862'

[rails.git] / config / eslint.json

diff --git a/config/eslint.json b/config/eslint.json
index 8790b5edf88b39266b05313b11628f42ddf63f4f..3b878d48a8cb813955fb399243ed01af1e892fef 100644 (file)
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -7,13 +7,12 @@
     "eslint:recommended"
   ],
   "globals": {
     "eslint:recommended"
   ],
   "globals": {

-    "bowser": "readonly",
+    "Cookies": "readonly",

     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",
     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",

-    "Piwik": "readonly",
-    "querystring": "readonly",
-    "require": "readonly",
+    "Matomo": "readonly",
+    "Qs": "readonly",

     "updateLinks": "readonly"
   },
   "rules": {
     "updateLinks": "readonly"
   },
   "rules": {


@@ -29,16 +28,26 @@
     "comma-style": "error",
     "computed-property-spacing": "error",
     "curly": ["error", "multi-line", "consistent"],
     "comma-style": "error",
     "computed-property-spacing": "error",
     "curly": ["error", "multi-line", "consistent"],

+    "dot-location": ["error", "property"],

     "dot-notation": "error",
     "eol-last": "error",
     "eqeqeq": ["error", "smart"],
     "func-call-spacing": "error",
     "dot-notation": "error",
     "eol-last": "error",
     "eqeqeq": ["error", "smart"],
     "func-call-spacing": "error",

+    "indent": ["error", 2, {
+      "SwitchCase": 1,
+      "VariableDeclarator": "first",
+      "FunctionDeclaration": { "parameters": "first" },
+      "FunctionExpression": { "parameters": "first" },
+      "CallExpression": { "arguments": "first" }
+    }],

     "key-spacing": "error",
     "keyword-spacing": "error",
     "no-alert": "warn",
     "no-array-constructor": "error",
     "no-caller": "error",
     "key-spacing": "error",
     "keyword-spacing": "error",
     "no-alert": "warn",
     "no-array-constructor": "error",
     "no-caller": "error",

+    "no-console": "warn",

     "no-div-regex": "error",
     "no-div-regex": "error",

+    "no-eq-null": "error",

     "no-eval": "error",
     "no-extend-native": "error",
     "no-extra-bind": "error",
     "no-eval": "error",
     "no-extend-native": "error",
     "no-extra-bind": "error",


@@ -47,6 +56,7 @@
     "no-implicit-coercion": "warn",
     "no-implicit-globals": "warn",
     "no-implied-eval": "error",
     "no-implicit-coercion": "warn",
     "no-implicit-globals": "warn",
     "no-implied-eval": "error",

+    "no-invalid-this": "error",

     "no-iterator": "error",
     "no-labels": "error",
     "no-label-var": "error",
     "no-iterator": "error",
     "no-labels": "error",
     "no-label-var": "error",


@@ -55,6 +65,7 @@
     "no-loop-func": "error",
     "no-mixed-operators": "error",
     "no-multiple-empty-lines": "error",
     "no-loop-func": "error",
     "no-mixed-operators": "error",
     "no-multiple-empty-lines": "error",

+    "no-multi-spaces": "error",

     "no-multi-str": "error",
     "no-negated-condition": "error",
     "no-nested-ternary": "error",
     "no-multi-str": "error",
     "no-negated-condition": "error",
     "no-nested-ternary": "error",


@@ -63,14 +74,16 @@
     "no-new-object": "error",
     "no-new-wrappers": "error",
     "no-octal-escape": "error",
     "no-new-object": "error",
     "no-new-wrappers": "error",
     "no-octal-escape": "error",

+    "no-param-reassign": "error",

     "no-process-env": "error",
     "no-proto": "error",
     "no-script-url": "error",
     "no-self-compare": "error",
     "no-sequences": "error",
     "no-process-env": "error",
     "no-proto": "error",
     "no-script-url": "error",
     "no-self-compare": "error",
     "no-sequences": "error",

-    "no-shadow-restricted-names": "error",

     "no-throw-literal": "error",
     "no-trailing-spaces": "error",
     "no-throw-literal": "error",
     "no-trailing-spaces": "error",

+    "no-undef-init": "error",
+    "no-undefined": "error",

     "no-unmodified-loop-condition": "error",
     "no-unneeded-ternary": "error",
     "no-unused-expressions": "off",
     "no-unmodified-loop-condition": "error",
     "no-unneeded-ternary": "error",
     "no-unused-expressions": "off",


@@ -82,7 +95,6 @@
     "no-void": "error",
     "no-warning-comments": "warn",
     "no-whitespace-before-property": "error",
     "no-void": "error",
     "no-warning-comments": "warn",
     "no-whitespace-before-property": "error",

-    "no-with": "error",

     "object-curly-newline": ["error", { "consistent": true }],
     "object-curly-spacing": ["error", "always"],
     "object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],
     "object-curly-newline": ["error", { "consistent": true }],
     "object-curly-spacing": ["error", "always"],
     "object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],