Skip to content

Commit 002f8c6

Browse files
renovate[bot]renovate-botJoshuaKGoldberg
authored
Update typescript-eslint monorepo to v4 (major) (#697)
* Update typescript-eslint monorepo to v4 * Disable @typescript-eslint/consistent-type-imports * Shadows; disable @typescript-eslint/no-implicit-any-catch too Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Josh Goldberg <me@joshuakgoldberg.com>
1 parent b59812a commit 002f8c6

File tree

5 files changed

+166
-46
lines changed

5 files changed

+166
-46
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ module.exports = {
2020
rules: {
2121
"@typescript-eslint/require-array-sort-compare": "off",
2222
"@typescript-eslint/consistent-type-definitions": ["error", "type"],
23+
"@typescript-eslint/consistent-type-imports": "off",
2324
"@typescript-eslint/explicit-function-return-type": "off",
2425
"@typescript-eslint/explicit-module-boundary-types": "off",
2526
"@typescript-eslint/generic-type-naming": "off",
2627
"@typescript-eslint/naming-convention": "off",
2728
"@typescript-eslint/init-declarations": "off",
2829
"@typescript-eslint/method-signature-style": "off",
2930
"@typescript-eslint/no-explicit-any": "off",
31+
"@typescript-eslint/no-implicit-any-catch": "off",
3032
"@typescript-eslint/no-magic-numbers": "off",
3133
"@typescript-eslint/no-parameter-properties": "off",
3234
"@typescript-eslint/no-type-alias": "off",

package-lock.json

Lines changed: 157 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"@types/glob": "7.1.3",
2929
"@types/jest": "26.0.13",
3030
"@types/node": "12.12.21",
31-
"@typescript-eslint/eslint-plugin": "3.9.1",
32-
"@typescript-eslint/parser": "3.9.1",
31+
"@typescript-eslint/eslint-plugin": "4.1.0",
32+
"@typescript-eslint/parser": "4.1.0",
3333
"babel-jest": "26.3.0",
3434
"eslint": "7.8.1",
3535
"husky": "4.3.0",

src/cli/runCli.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export const runCli = async (
4444
return ResultStatus.Succeeded;
4545
}
4646

47-
for (const convertConfig of dependencies.convertConfigs) {
48-
const result = await tryConvertConfig(convertConfig, parsedArgv);
47+
for (const configConverter of dependencies.convertConfigs) {
48+
const result = await tryConvertConfig(configConverter, parsedArgv);
4949
if (result.status !== ResultStatus.Succeeded) {
5050
logErrorResult(result, dependencies);
5151
return result.status;
@@ -57,13 +57,13 @@ export const runCli = async (
5757
};
5858

5959
const tryConvertConfig = async (
60-
config: SansDependencies<typeof convertConfig>,
60+
configConverter: SansDependencies<typeof convertConfig>,
6161
argv: Partial<TSLintToESLintSettings>,
6262
): Promise<ResultWithStatus> => {
6363
let result: ResultWithStatus;
6464

6565
try {
66-
result = await config(argv as TSLintToESLintSettings);
66+
result = await configConverter(argv as TSLintToESLintSettings);
6767
} catch (error) {
6868
result = {
6969
errors: [error as Error],

src/reporting/reportOutputs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const logFailedConversions = (failed: ErrorSummary[], logger: Logger) =>
2727
logger.stderr.write(chalk.red(` error${failed.length === 1 ? "" : "s"}`));
2828
logger.stderr.write(chalk.red(" thrown."));
2929
logger.stderr.write(chalk.redBright(` ❌${EOL}`));
30-
logger.info.write(failed.map((failed) => failed.getSummary()).join("\n\n") + "\n\n");
30+
logger.info.write(failed.map((fail) => fail.getSummary()).join("\n\n") + "\n\n");
3131
logger.stderr.write(chalk.red(` Check ${logger.debugFileName} for details.${EOL}`));
3232
};
3333

0 commit comments

Comments
 (0)