From e8bc87a0a829a4155edcfb2cca971a77e689c820 Mon Sep 17 00:00:00 2001 From: Logicer Date: Mon, 1 Apr 2024 23:19:12 +1100 Subject: [PATCH 1/2] refine flat config types --- src/configs/flat/base.ts | 4 ++-- src/configs/flat/prettier.ts | 3 ++- src/configs/flat/recommended.ts | 3 ++- src/configs/flat/standard.ts | 3 ++- tools/update-rulesets.ts | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/configs/flat/base.ts b/src/configs/flat/base.ts index 761c3f08..f750d564 100644 --- a/src/configs/flat/base.ts +++ b/src/configs/flat/base.ts @@ -1,4 +1,4 @@ -import type { ESLint } from "eslint"; +import type { ESLint, Linter } from "eslint"; import * as parser from "yaml-eslint-parser"; export default [ { @@ -21,4 +21,4 @@ export default [ "spaced-comment": "off", }, }, -]; +] satisfies Linter.FlatConfig[]; diff --git a/src/configs/flat/prettier.ts b/src/configs/flat/prettier.ts index ea93bdd7..169f1a86 100644 --- a/src/configs/flat/prettier.ts +++ b/src/configs/flat/prettier.ts @@ -1,6 +1,7 @@ // IMPORTANT! // This file has been automatically generated, // in order to update its content execute "npm run update" +import type { Linter } from "eslint"; import base from "./base"; export default [ ...base, @@ -21,4 +22,4 @@ export default [ "yml/quotes": "off", }, }, -]; +] satisfies Linter.FlatConfig[]; diff --git a/src/configs/flat/recommended.ts b/src/configs/flat/recommended.ts index c430a1ea..9dc84374 100644 --- a/src/configs/flat/recommended.ts +++ b/src/configs/flat/recommended.ts @@ -1,6 +1,7 @@ // IMPORTANT! // This file has been automatically generated, // in order to update its content execute "npm run update" +import type { Linter } from "eslint"; import base from "./base"; export default [ ...base, @@ -16,4 +17,4 @@ export default [ "yml/vue-custom-block/no-parsing-error": "error", }, }, -]; +] satisfies Linter.FlatConfig[]; diff --git a/src/configs/flat/standard.ts b/src/configs/flat/standard.ts index a050eab2..f316c926 100644 --- a/src/configs/flat/standard.ts +++ b/src/configs/flat/standard.ts @@ -1,6 +1,7 @@ // IMPORTANT! // This file has been automatically generated, // in order to update its content execute "npm run update" +import type { Linter } from "eslint"; import base from "./base"; export default [ ...base, @@ -29,4 +30,4 @@ export default [ "yml/vue-custom-block/no-parsing-error": "error", }, }, -]; +] satisfies Linter.FlatConfig[]; diff --git a/tools/update-rulesets.ts b/tools/update-rulesets.ts index 3dc846b2..c4601819 100644 --- a/tools/update-rulesets.ts +++ b/tools/update-rulesets.ts @@ -90,6 +90,7 @@ for (const rec of ["recommended", "standard", "prettier"] as const) { * This file has been automatically generated, * in order to update its content execute "npm run update" */ +import type { Linter } from "eslint"; import base from './base'; export default [ ...base, @@ -104,7 +105,7 @@ export default [ .join(",\n")} }, } -] +] satisfies Linter.FlatConfig[] `; const filePath = path.resolve( From 6c57a881926d1d6487a85cdeb158a2a51955642e Mon Sep 17 00:00:00 2001 From: Logicer Date: Mon, 1 Apr 2024 23:31:25 +1100 Subject: [PATCH 2/2] Create slow-emus-listen.md --- .changeset/slow-emus-listen.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/slow-emus-listen.md diff --git a/.changeset/slow-emus-listen.md b/.changeset/slow-emus-listen.md new file mode 100644 index 00000000..34d1892c --- /dev/null +++ b/.changeset/slow-emus-listen.md @@ -0,0 +1,5 @@ +--- +"eslint-plugin-yml": minor +--- + +feat: improved compatibility with `@types/eslint` for flat config.