diff --git a/.eslintrc.yml b/.eslintrc.yml
index 106e4335..2a6bd584 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,6 +6,7 @@ parserOptions:
 
 extends:
   - eslint:recommended
+  - plugin:prettier/recommended
   - prettier
   - plugin:import/errors
   - plugin:import/warnings
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c6ee4e7f..c0fe122d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,19 +3,18 @@
     "source.fixAll": true
   },
   "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-  "editor.formatOnPaste": false,
   "editor.formatOnSave": true,
-  "eslint.format.enable": true,
-  "eslint.alwaysShowStatus": true,
   "eslint.enable": true,
+  "eslint.format.enable": true,
   "eslint.validate": ["javascript", "typescript"],
-  "mochaExplorer.files": "src/**/*.test.ts",
-  "mochaExplorer.require": "ts-node/register",
-  "mochaExplorer.timeout": 20000,
   "files.associations": {
     "CODE_OF_CONDUCT": "markdown",
     "CONTRIBUTING": "markdown"
   },
-  "yaml.format.enable": true,
+  "mochaExplorer.files": "src/**/*.test.ts",
+  "mochaExplorer.require": "ts-node/register",
+  "mochaExplorer.timeout": 20000,
+  "prettier.disableLanguages": ["javascript", "typescript"],
+  "prettier.enable": true,
   "tslint.enable": false
 }
diff --git a/tsconfig.json b/tsconfig.json
index fbcc927c..e89e6245 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true
   },
-  "include": ["./src/**/*.ts"],
+  "include": ["./src/**/*.ts", "./*.js"],
   "exclude": ["node_modules", "dist"],
   "parserOptions": {
     "ecmaVersion": 2018,