Merge branch 'release/3.0.0'

[rbdr/serpentity] / .eslintrc

diff --git a/.eslintrc b/.eslintrc
index e38a8dda1ffe71723130aa01d2f64af060d1cb49..1ea88c51923b13234d30d5c3852d99fc6f4c8a2a 100644 (file)
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,9 +1,21 @@
 {
 {

-  "extends": "eslint-config-hapi",
+  "parserOptions": {
+    "ecmaVersion": 2019,
+    "sourceType": "module"
+  },
+  "env": {
+    "es6": true,
+    "browser": true
+  },
+  "extends": [
+    "@hapi/eslint-config-hapi"
+  ],

   "rules": {
     "indent": [
   "rules": {
     "indent": [

-      "error",
+      2,

       2
       2

-    ]
+    ],
+    "no-undef": 2,
+    "require-yield": 0

   }
 }
   }
 }