Skip to content

Commit

Permalink
fix(typescript-eslint): Fix typescript-eslint config in ESLint >=v8.3…
Browse files Browse the repository at this point in the history
…5.0 (#646)

This is caused by PR eslint/eslint#16844, moving eslint-recommended.js file to @eslint/js package.
  • Loading branch information
Hazmi35 committed Mar 19, 2023
1 parent b428487 commit 5e25e9f
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 53 deletions.
2 changes: 2 additions & 0 deletions package.json
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

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
@@ -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

0 comments on commit 5e25e9f

Please sign in to comment.