From 47acf7c6f88690ecb8a417404fb66bd74b1e0509 Mon Sep 17 00:00:00 2001
From: Hamza Hamidi <hamidihamzacg@gmail.com>
Date: Thu, 21 May 2020 21:35:37 +0200
Subject: [PATCH] Feat(Eslint): Upgrade to Eslint 6 (#254)

---
 package.json           | 2 +-
 src/__tests__/index.js | 4 +++-
 src/utils.js           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index bd74f0c..9024aaf 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "common-tags": "^1.4.0",
     "core-js": "^3.1.4",
     "dlv": "^1.1.0",
-    "eslint": "^5.0.0",
+    "eslint": "^6.5.1",
     "indent-string": "^4.0.0",
     "lodash.merge": "^4.6.0",
     "loglevel-colored-level-prefix": "^1.0.0",
diff --git a/src/__tests__/index.js b/src/__tests__/index.js
index 6cc26eb..535026a 100644
--- a/src/__tests__/index.js
+++ b/src/__tests__/index.js
@@ -353,8 +353,10 @@ test('reads text from fs if filePath is provided but not text', () => {
   format({ filePath });
   // format({filePath}).catch(() => {})
   // one hit to get the file and one for the eslintignore
-  expect(fsMock.readFileSync).toHaveBeenCalledTimes(2);
+  expect(fsMock.readFileSync).toHaveBeenCalledTimes(3);
   expect(fsMock.readFileSync).toHaveBeenCalledWith(filePath, 'utf8');
+  const eslintIgnoreCall  = fsMock.readFileSync.mock.calls[1][0];
+  expect(eslintIgnoreCall.includes('.eslintignore')).toBeTruthy();
 });
 
 test('logs error if it cannot read the file from the filePath', () => {
diff --git a/src/utils.js b/src/utils.js
index acfa3d5..d97d259 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -75,7 +75,7 @@ function getOptionsForFormatting(
 }
 
 function getRelevantESLintConfig(eslintConfig, eslintPath) {
-  const cliEngine = getESLintCLIEngine(eslintPath);
+  const cliEngine = getESLintCLIEngine(eslintPath, { ignore: false });
   // TODO: Actually test this branch
   // istanbul ignore next
   const loadedRules =