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

[rails.git] / config / eslint.json

diff --git a/config/eslint.json b/config/eslint.json
index 090b3f238382a4ba77a99181278f3cc958cdd5e6..cd235e678694cd8a3979055eb32a04006d30190c 100644 (file)
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -12,7 +12,6 @@
     "L": "readonly",
     "OSM": "writable",
     "Piwik": "readonly",
-    "querystring": "readonly",
     "require": "readonly",
     "updateLinks": "readonly"
   },
@@ -29,6 +28,7 @@
     "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"],
@@ -45,7 +45,9 @@
     "no-alert": "warn",
     "no-array-constructor": "error",
     "no-caller": "error",
+    "no-console": "warn",
     "no-div-regex": "error",
+    "no-eq-null": "error",
     "no-eval": "error",
     "no-extend-native": "error",
     "no-extra-bind": "error",
@@ -54,6 +56,7 @@
     "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",
@@ -62,6 +65,7 @@
     "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",
@@ -70,14 +74,16 @@
     "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-shadow-restricted-names": "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",
@@ -89,7 +95,6 @@
     "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 }],