Merge remote-tracking branch 'upstream/master' into issue/4163

UlisesGascon · Feb 2, 2020 · cc20991 · cc20991
2 parents 802ccf5 + 883ae4b
commit cc20991
Show file tree

Hide file tree

Showing 24 changed files with 2,738 additions and 2,528 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -3,13 +3,12 @@ extends:
   - semistandard
   - plugin:prettier/recommended
 env:
-  node: yes
-  browser: yes
+  node: true
+  browser: true
 parserOptions:
   ecmaVersion: 5
   ecmaFeatures:
-    globalReturn: no
-    jsx: no
+    jsx: false
   sourceType: script
 rules:
   strict:
@@ -31,14 +30,14 @@ overrides:
     parserOptions:
       ecmaVersion: 2018
     env:
-      browser: no
+      browser: false
 
   - files:
       - test/**/*.{js,mjs}
     env:
-      mocha: yes
+      mocha: true
     globals:
-      expect: no
+      expect: readonly
   - files:
       - bin/*
       - lib/**/*.js