diff --git a/src/configs/imports.spec.ts b/src/configs/imports.spec.ts deleted file mode 100644 index ae25528..0000000 --- a/src/configs/imports.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { importsConfig } from "./imports"; - -describe("importsConfig", () => { - it("should create config w/ flat config parsing fixes", () => { - const [imports] = importsConfig(); - - expect(imports).toStrictEqual( - expect.objectContaining({ - languageOptions: { - parserOptions: { - ecmaVersion: "latest", - sourceType: "module", - }, - }, - settings: { - "import-x/parsers": { - espree: [".js", ".cjs", ".mjs", ".jsx"], - }, - }, - }), - ); - }); -}); diff --git a/src/configs/imports.ts b/src/configs/imports.ts index 3ec2a04..4cb932f 100644 --- a/src/configs/imports.ts +++ b/src/configs/imports.ts @@ -1,9 +1,7 @@ -import type { ESLint, Linter } from "eslint"; - import importX from "eslint-plugin-import-x"; import nodePlugin from "eslint-plugin-n"; -import type { TypescriptOptions } from "../types"; +import type { TypedConfigItem, TypescriptOptions } from "../types"; import { importsRules } from "../rules/imports"; @@ -28,26 +26,13 @@ export const importsConfig = ({ }: ImportsConfigOptions = {}) => { return [ { - languageOptions: { - parserOptions: { - ecmaVersion: "latest", - sourceType: "module", - }, - }, name: "jimmy.codes/imports", plugins: { - // TODO: remove unknown conversion - "import-x": importX as unknown as ESLint.Plugin, + "import-x": importX, "n": nodePlugin, }, rules: importsRules, - // https://github.com/import-js/eslint-plugin-import/issues/2556#issuecomment-1419518561 - settings: { - "import-x/parsers": { - espree: [".js", ".cjs", ".mjs", ".jsx"], - }, - }, }, ...(typescript ? [typescriptImports] : []), - ] satisfies Linter.Config[]; + ] satisfies TypedConfigItem[]; }; diff --git a/src/configs/javascript.ts b/src/configs/javascript.ts index 3610bca..4df5121 100644 --- a/src/configs/javascript.ts +++ b/src/configs/javascript.ts @@ -1,4 +1,4 @@ -import type { Linter } from "eslint"; +import type { TypedConfigItem } from "../types"; import { javascriptRules } from "../rules/javascript"; @@ -11,5 +11,5 @@ export const javascriptConfig = () => { name: "jimmy.codes/javascript", rules: javascriptRules, }, - ] satisfies Linter.Config[]; + ] satisfies TypedConfigItem[]; }; diff --git a/src/configs/node.ts b/src/configs/node.ts index 475767b..845281d 100644 --- a/src/configs/node.ts +++ b/src/configs/node.ts @@ -1,7 +1,7 @@ -import type { Linter } from "eslint"; - import nodePlugin from "eslint-plugin-n"; +import type { TypedConfigItem } from "../types"; + import { nodeRules } from "../rules/node"; export const nodeConfig = () => { @@ -13,5 +13,5 @@ export const nodeConfig = () => { }, rules: nodeRules, }, - ] satisfies Linter.Config[]; + ] satisfies TypedConfigItem[]; };