Skip to content

Commit

Permalink
Revert "Feat(Eslint): Upgrade to Eslint 6 (#254)" (#336)
Browse files Browse the repository at this point in the history
This reverts commit 47acf7c.
  • Loading branch information
hamzahamidi committed May 21, 2020
1 parent 47acf7c commit 71f8d84
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -22,7 +22,7 @@
"common-tags": "^1.4.0",
"core-js": "^3.1.4",
"dlv": "^1.1.0",
"eslint": "^6.5.1",
"eslint": "^5.0.0",
"indent-string": "^4.0.0",
"lodash.merge": "^4.6.0",
"loglevel-colored-level-prefix": "^1.0.0",
Expand Down
4 changes: 1 addition & 3 deletions src/__tests__/index.js
Expand Up @@ -353,10 +353,8 @@ 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(3);
expect(fsMock.readFileSync).toHaveBeenCalledTimes(2);
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', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Expand Up @@ -75,7 +75,7 @@ function getOptionsForFormatting(
}

function getRelevantESLintConfig(eslintConfig, eslintPath) {
const cliEngine = getESLintCLIEngine(eslintPath, { ignore: false });
const cliEngine = getESLintCLIEngine(eslintPath);
// TODO: Actually test this branch
// istanbul ignore next
const loadedRules =
Expand Down

0 comments on commit 71f8d84

Please sign in to comment.