Merge branch 'main' into fix-typos

github · Nov 20, 2020 · 6aaf048 · 6aaf048
2 parents 6ed5c82 + c5d599e
commit 6aaf048
Showing 22 changed files with 166 additions and 155 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -29,6 +29,8 @@
         "no-async-foreach/no-async-foreach": "error",
         "no-console": "off",
         "no-sequences": "error",
+        "no-shadow": "off",
+        "@typescript-eslint/no-shadow": ["error"],
         "one-var": ["error", "never"]
     },
     "overrides": [{
@@ -48,8 +50,7 @@
             "@typescript-eslint/require-await": "off",
             "@typescript-eslint/restrict-template-expressions": "off",
             "func-style": "off",
-            "github/no-then": "off",
-            "no-shadow": "off"
+            "github/no-then": "off"
         }
     }]
 }
diff --git a/lib/api-client.js b/lib/api-client.js
diff --git a/lib/api-client.js.map b/lib/api-client.js.map
diff --git a/lib/codeql.js b/lib/codeql.js