From 469d755a87e625b708389e80fe66c37dbc532cda Mon Sep 17 00:00:00 2001
From: Charlie Fish <fishcharlie@me.com>
Date: Wed, 15 Apr 2020 17:06:03 -0600
Subject: [PATCH] Cleaning up configs

---
 .eslintrc.js | 10 ++++++++--
 .gitignore   | 14 +-------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 887c13306..5a53a00f8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,10 +9,16 @@ module.exports = {
 		{
 			"files": ["**/*.ts"],
 			"parser": "@typescript-eslint/parser",
-			"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+			"extends": [
+				"eslint:recommended",
+				"plugin:@typescript-eslint/eslint-recommended",
+				"plugin:@typescript-eslint/recommended"
+			],
 			"plugins": ["@typescript-eslint"],
 			"rules": {
-				"@typescript-eslint/camelcase": "off"
+				"@typescript-eslint/camelcase": "off",
+				"@typescript-eslint/no-this-alias": "off",
+				"@typescript-eslint/no-var-requires": "off"
 			}
 		}
 	],
diff --git a/.gitignore b/.gitignore
index 7fb0c6567..eec8b1d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,7 @@
 .DS_Store
 thumbs.db
-*.log
 node_modules/
-.settings
-.session.vim
-.vscode
-dist
-
-# Ignore webstorm directories
-.idea/
-
-.bundle/
-docs/_site
-Gemfile.lock
-
 .nyc_output
 coverage
 coverage.html
+dist
\ No newline at end of file