Skip to content

Commit b41a099

Browse files
committed
fix: fix import plugin settings
1 parent 8ce263f commit b41a099

6 files changed

Lines changed: 33 additions & 7 deletions

File tree

src/coffeescript.cts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { pluginNodeRules } from "./plugin-node-rules.cjs"
2-
import { pluginImportRulesExtra } from "./plugin-import-rules.cjs"
2+
import { pluginImportRulesExtra, pluginImportSettings } from "./plugin-import-rules.cjs"
33
import type { Linter } from "eslint"
44
import * as eslintPluginCoffee from "eslint-plugin-coffee"
55
import * as nodePlugin from "eslint-plugin-node"
@@ -21,4 +21,7 @@ export const coffeeConfig: Linter.Config = {
2121
...pluginNodeRules,
2222
...pluginImportRulesExtra,
2323
},
24+
settings: {
25+
...pluginImportSettings,
26+
},
2427
}

src/index.cts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { jsConfig } from "./javascript.cjs"
22
import { tsConfigs } from "./typescript.cjs"
33
import { jsonConfig } from "./json.cjs"
4-
import { yamlConfig } from "./yaml.cjs"
4+
// import { yamlConfig } from "./yaml.cjs"
55
import { htmlConfig } from "./html.cjs"
6-
// import { pluginImportSettings } from "./plugin-import-rules.cjs"
76
// import pluginOptimizeRegex from "eslint-plugin-optimize-regex"
87
import semverMajor from "semver/functions/major"
98
import { getEslintVersion } from "./eslint-version.cjs"

src/javascript.cts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { eslintRulesExtra } from "./official-eslint-rules.cjs"
22
import { pluginNodeRules } from "./plugin-node-rules.cjs"
3-
import { pluginImportRulesExtra } from "./plugin-import-rules.cjs"
3+
import { pluginImportRulesExtra, pluginImportSettings } from "./plugin-import-rules.cjs"
44
import type { Linter } from "eslint"
55
import * as eslintBabelParser from "@babel/eslint-parser"
66
import * as nodePlugin from "eslint-plugin-node"
@@ -42,5 +42,8 @@ export const jsConfig: Linter.Config[] = [
4242
...pluginImportRulesExtra,
4343
...importPlugin.configs.recommended.rules,
4444
},
45+
settings: {
46+
...pluginImportSettings,
47+
},
4548
},
4649
]

src/plugin-import-rules.cts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { Linter } from "eslint"
2+
import * as importPlugin from 'eslint-plugin-import';
23

34
export const pluginImportRulesExtra: Linter.RulesRecord = {
45
"import/no-absolute-path": "error",

src/types.d.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,26 @@ declare module "eslint-plugin-node" {
88

99
declare module "eslint-plugin-import" {
1010
import type { ESLint, Linter } from "eslint"
11-
const plugin: ESLint.Plugin & {
11+
const plugin: {
12+
rules: Record<string, Linter.RuleEntry>,
1213
configs: {
13-
recommended: Linter.Config
14+
recommended: Linter.LegacyConfig,
15+
errors: Linter.LegacyConfig,
16+
warnings: Linter.LegacyConfig,
17+
stage0: Linter.LegacyConfig,
18+
react: Linter.LegacyConfig,
19+
'react-native': Linter.LegacyConfig,
20+
electron: Linter.LegacyConfig,
21+
typescript: Linter.LegacyConfig,
22+
},
23+
flatConfigs: {
24+
recommended: Linter.Config,
25+
errors: Linter.Config,
26+
warnings: Linter.Config,
27+
react: Linter.Config,
28+
'react-native': Linter.Config,
29+
electron: Linter.Config,
30+
typescript: Linter.Config,
1431
}
1532
}
1633
export = plugin

src/typescript.cts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as importPlugin from "eslint-plugin-import"
66
import type { GlobifiedEntry } from "globify-gitignore"
77
import makeSynchronous from "make-synchronous"
88
import { eslintRulesExtra } from "./official-eslint-rules.cjs"
9-
import { pluginImportRulesExtra, pluginImportTypeScriptRulesExtra } from "./plugin-import-rules.cjs"
9+
import { pluginImportRulesExtra, pluginImportSettings, pluginImportTypeScriptRulesExtra } from "./plugin-import-rules.cjs"
1010
// import { pluginNodeRules } from "./plugin-node-rules.cjs"
1111
import { findFilesForGroups } from "./searchFs.cjs"
1212
import * as eslintTypeScriptParser from "@typescript-eslint/parser"
@@ -146,6 +146,9 @@ export const tsConfig: Linter.Config = {
146146
...pluginImportTypeScriptRulesExtra,
147147
...importPlugin.configs.recommended.rules,
148148
},
149+
settings: {
150+
...pluginImportSettings,
151+
},
149152
}
150153

151154
export const tsConfigs = tsEslint.config([

0 commit comments

Comments
 (0)