Skip to content

Commit

Permalink
feat: update @typescript-eslint/experimental-utils to v4
Browse files Browse the repository at this point in the history
BREAKING CHANGE: update `@typescript-eslint/experimental-utils` to v4
  • Loading branch information
G-Rath committed Jan 4, 2021
1 parent 420b675 commit 790fe6e
Show file tree
Hide file tree
Showing 7 changed files with 613 additions and 502 deletions.
1,077 changes: 593 additions & 484 deletions package-lock.json

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
]
},
"dependencies": {
"@typescript-eslint/experimental-utils": "^2.5.0",
"@typescript-eslint/experimental-utils": "^4.11.1",
"require-relative": "^0.8.7"
},
"devDependencies": {
Expand All @@ -93,22 +93,23 @@
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"@types/dedent": "^0.7.0",
"@types/eslint": "^6.8.1",
"@types/eslint": "^7.2.6",
"@types/jest": "^26.0.19",
"@types/node": "^12.19.11",
"@types/prettier": "^2.1.6",
"@types/require-relative": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^2.5.0",
"@typescript-eslint/parser": "^2.5.0",
"@typescript-eslint/eslint-plugin": "^4.11.1",
"@typescript-eslint/parser": "^4.11.1",
"babel-jest": "^26.6.3",
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
"dedent": "^0.7.0",
"eslint": "^6.8.0",
"eslint-config-ackama": "^1.4.2",
"eslint": "^7.17.0",
"eslint-config-ackama": "^2.0.1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^2.2.1",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jest": "^23.13.2",
"eslint-plugin-eslint-plugin": "^2.3.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.3",
"eslint-plugin-jest-formatting": "^2.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.0",
"husky": "^4.3.6",
Expand All @@ -120,7 +121,7 @@
"resolve-from": "^5.0.0",
"rimraf": "^3.0.2",
"semantic-release": "^17.3.1",
"typescript": "^3.9.5"
"typescript": "^4.1.3"
},
"peerDependencies": {
"eslint": ">=5"
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const rules = readdirSync(rulesDir)
.filter(rule => !excludedFiles.includes(rule))
.reduce(
(acc, curr) =>
// eslint-disable-next-line @typescript-eslint/no-require-imports,global-require
// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires,node/global-require
Object.assign(acc, { [curr]: require(join(rulesDir, curr)) as unknown }),
{}
);
Expand Down
1 change: 0 additions & 1 deletion src/rules/no-invalid-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ export = ESLintUtils.RuleCreator(name => name)({
[[
AST_NODE_TYPES.Identifier,
AST_NODE_TYPES.TemplateLiteral,
AST_NODE_TYPES.BigIntLiteral,
AST_NODE_TYPES.Literal
].join()](
node: TSESTree.Identifier | TSESTree.LiteralExpression
Expand Down
4 changes: 3 additions & 1 deletion test/src/rules.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ruleNames = Object.keys(plugin.rules);
const numberOfRules = 4;

const requireRule = (name: string): TSESLint.RuleModule<string, unknown[]> =>
// eslint-disable-next-line @typescript-eslint/no-require-imports,global-require
// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires,node/global-require
require(`../../src/rules/${name}`) as TSESLint.RuleModule<string, unknown[]>;

describe('rules', () => {
Expand Down Expand Up @@ -126,11 +126,13 @@ describe('rules', () => {
const recommendedLevel = meta.docs?.recommended;

if (recommendedLevel) {
// eslint-disable-next-line jest/no-conditional-expect
expect(presets['recommended-rules'].rules).toHaveProperty(
rule,
recommendedLevel
);
} else {
// eslint-disable-next-line jest/no-conditional-expect
expect(presets['recommended-rules'].rules).not.toHaveProperty(rule);
}
});
Expand Down
4 changes: 2 additions & 2 deletions tools/generate-rules-table.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ts-node-transpile-only

/* eslint-disable no-sync */
/* eslint-disable node/no-sync */

import { TSESLint } from '@typescript-eslint/experimental-utils';
import * as fs from 'fs';
Expand All @@ -18,7 +18,7 @@ interface RuleDetails {
type RuleModule = TSESLint.RuleModule<string, unknown[]>;

const requireRule = (name: string): RuleModule =>
// eslint-disable-next-line @typescript-eslint/no-require-imports,global-require
// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires,node/global-require
require(`../src/rules/${name}`) as RuleModule;

const staticElements = {
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es5",
"target": "es2015",
"module": "commonjs",
"moduleResolution": "node",
"lib": ["ES2015", "ES2018"],
Expand All @@ -14,6 +14,6 @@
"forceConsistentCasingInFileNames": true
},
"exclude": ["node_modules", "coverage", "lib"],
"files": [ ".eslintrc.js" ],
"include": [ "**/*.js", "**/*.ts" ]
"files": [".eslintrc.js"],
"include": ["**/*.js", "**/*.ts"]
}

0 comments on commit 790fe6e

Please sign in to comment.