Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Feat(Eslint): Upgrade to Eslint 6 (#254)" #336

Merged
merged 1 commit into from May 21, 2020
Merged

Revert "Feat(Eslint): Upgrade to Eslint 6 (#254)" #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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