From 4523db5b10d58fe45430acc7874bad5bef3ca589 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Mon, 26 Oct 2020 07:26:46 -0700
Subject: [PATCH] Lint and format .js files (#291)

We were needlessly ignoring .js files in our eslint and prettier configs.
---
 .eslintrc.js                 |  6 +-----
 package.json                 |  6 +++---
 tests/test.js                | 22 ++++++++++------------
 tests/utils/mockEncryptor.js | 34 +++++++++++++++++-----------------
 4 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 18c9f5efdf3..f93dff4a04e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,7 +7,6 @@ module.exports = {
     '@metamask/eslint-config/config/typescript',
   ],
   ignorePatterns: [
-    '*.js',
     '!.eslintrc.js',
     '!jest.config.js',
     'node_modules',
@@ -16,10 +15,7 @@ module.exports = {
     '*.d.ts',
   ],
   overrides: [{
-    files: [
-      '.eslintrc.js',
-      'jest.config.js',
-    ],
+    files: ['*.js'],
     parserOptions: {
       sourceType: 'script',
     },
diff --git a/package.json b/package.json
index 56b1740165d..e311a4907d9 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,10 @@
   },
   "scripts": {
     "prepublishOnly": "yarn build",
-    "lint": "eslint --ext .ts .",
+    "lint": "eslint --ext js,ts .",
     "test": "jest --coverage",
-    "format": "prettier **/*.ts --check --ignore-path=.gitignore",
-    "format:fix": "prettier **/*.ts --write --ignore-path=.gitignore",
+    "format": "prettier **/*.ts **/*.js --check --ignore-path=.gitignore",
+    "format:fix": "prettier **/*.ts **/*.js --write --ignore-path=.gitignore",
     "build": "rm -rf dist && tsc",
     "build:watch": "yarn build && tsc -w",
     "build:link": "yarn build && cd dist && yarn link && rm -rf node_modules && cd ..",
diff --git a/tests/test.js b/tests/test.js
index f834d1f038d..318229964a5 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -1,17 +1,15 @@
-const {
-	TokenRatesController
-} = require('./dist');
+const { TokenRatesController } = require('./dist');
 
 const assets = new TokenRatesController({
-	disabled: false,
-	interval: 1000,
-	nativeCurrency: 'usd',
-	tokens: [
-		{ address: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359' },
-		{ address: '0x960b236A07cf122663c4303350609A66A7B288C0' },
-		{ address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52' },
-		{ address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2' }
-	]
+  disabled: false,
+  interval: 1000,
+  nativeCurrency: 'usd',
+  tokens: [
+    { address: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359' },
+    { address: '0x960b236A07cf122663c4303350609A66A7B288C0' },
+    { address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52' },
+    { address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2' },
+  ],
 });
 
 assets.subscribe(console.log);
diff --git a/tests/utils/mockEncryptor.js b/tests/utils/mockEncryptor.js
index 93dcfe039cf..6089a370d95 100644
--- a/tests/utils/mockEncryptor.js
+++ b/tests/utils/mockEncryptor.js
@@ -1,32 +1,32 @@
-const sinon = require('sinon')
+const sinon = require('sinon');
 
-const mockHex = '0xabcdef0123456789'
-const mockKey = Buffer.alloc(32)
-let cacheVal
+const mockHex = '0xabcdef0123456789';
+const mockKey = Buffer.alloc(32);
+let cacheVal;
 
 module.exports = {
   encrypt: sinon.stub().callsFake(function (_password, dataObj) {
-    cacheVal = dataObj
-    return Promise.resolve(mockHex)
+    cacheVal = dataObj;
+    return Promise.resolve(mockHex);
   }),
 
-  decrypt (_password, _text) {
-    return Promise.resolve(cacheVal || {})
+  decrypt(_password, _text) {
+    return Promise.resolve(cacheVal || {});
   },
 
-  encryptWithKey (key, dataObj) {
-    return this.encrypt(key, dataObj)
+  encryptWithKey(key, dataObj) {
+    return this.encrypt(key, dataObj);
   },
 
-  decryptWithKey (key, text) {
-    return this.decrypt(key, text)
+  decryptWithKey(key, text) {
+    return this.decrypt(key, text);
   },
 
-  keyFromPassword (_password) {
-    return Promise.resolve(mockKey)
+  keyFromPassword(_password) {
+    return Promise.resolve(mockKey);
   },
 
-  generateSalt () {
-    return 'WHADDASALT!'
+  generateSalt() {
+    return 'WHADDASALT!';
   },
-}
+};