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

diff --git a/config/eslint.js b/config/eslint.js
index 7cbb9575f39a468295bca251f76b33d4a4574f5d..cb421a9920ce3874ab151c49e340c4ce189fdb1e 100644 (file)
--- a/config/eslint.js
+++ b/config/eslint.js
@@ -111,11 +111,10 @@ module.exports = [
       "no-nested-ternary": "error",
       "no-new": "error",
       "no-new-func": "error",
-      "no-new-object": "error",
       "no-new-wrappers": "error",
+      "no-object-constructor": "error",
       "no-octal-escape": "error",
       "no-param-reassign": "error",
-      "no-process-env": "error",
       "no-proto": "error",
       "no-script-url": "error",
       "no-self-compare": "error",