merged ts files from master

Author: nmwenz90

.eslintrc

@@ -1,7 +1,11 @@
 {
-  "extends": ["airbnb", "plugin:jest/recommended"],
+  "extends": [
+    "airbnb", 
+    "plugin:jest/recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"],
   "root": true,
-  "plugins": ["jest", "react", "react-hooks"],
+  "plugins": ["jest", "react", "react-hooks", "@typescript-eslint"],
   "rules": {
     "arrow-parens": [2, "as-needed"],
     "import/no-unresolved": "off",

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "eslint.enable": true
+  "eslint.enable": true,
+  "git.ignoreLimitWarning": true
 }

MyMovie.gif

@@ -62,7 +62,13 @@
     "@babel/preset-react": "^7.10.4",
     "@types/chrome": "^0.0.119",
     "@types/jest": "^26.0.4",
+<<<<<<< HEAD
     "@types/node": "^14.0.23",
+=======
+    "@types/node": "^12.12.50",
+    "@typescript-eslint/eslint-plugin": "^3.6.1",
+    "@typescript-eslint/parser": "^3.6.1",
+>>>>>>> 24e511f2f701fa79d7fdee42f580beed7a058630
     "babel-loader": "^8.1.0",
     "core-js": "^3.6.5",
     "css-loader": "^3.6.0",