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

fix(typescript-eslint): Fix typescript-eslint config in ESLint >=v8.35.0 #646

Merged
merged 1 commit into from Mar 19, 2023
Merged

fix(typescript-eslint): Fix typescript-eslint config in ESLint >=v8.35.0 #646

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: 2 additions & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -24,13 +24,15 @@
"extends": "./index.js"
},
"devDependencies": {
"@eslint/js": ">=8.36.0",
"@types/node": "*",
"@typescript-eslint/eslint-plugin": ">=5.55.0",
"@typescript-eslint/parser": ">=5.55.0",
"eslint": ">=8.36.0",
"typescript": ">=3.3.1 <5.1.0"
},
"peerDependencies": {
"@eslint/js": ">=8.36.0",
"@typescript-eslint/eslint-plugin": ">=5.55.0",
"@typescript-eslint/parser": ">=5.55.0",
"eslint": ">=8.36.0",
Expand Down
104 changes: 53 additions & 51 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions typescript/index.js
View file
Open in desktop
@@ -1,6 +1,7 @@
/* eslint-env node */
const { resolve } = require("path");
const base = resolve(__dirname, "..", "index.js");
const eslintJS = require("@eslint/js");

// @typescript-eslint original rules
let rules = {
Expand Down Expand Up @@ -214,8 +215,7 @@ rules = {
const baseRules = Object.entries(extensionRules).map(([key]) => [delPrefix(key), "off"]);

// Import baseRules options
const eslintRecommended = require(resolve(require.resolve("eslint"), "..", "..", "conf", "eslint-recommended.js"));
const baseRulesOptions = { ...eslintRecommended.rules, ...require(base).rules };
const baseRulesOptions = { ...eslintJS.configs.recommended.rules, ...require(base).rules };

// Infer options from baseRulesOptions for the extensionRules
const doneInferred = Object.entries(extensionRules)
Expand Down