diff --git a/package.json b/package.json index bc680ca8..92e11f9a 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,8 @@ "@types/mocha": "^10.0.10", "@types/node": "^22.13.13", "@types/semver": "^7.7.0", - "@typescript-eslint/eslint-plugin": "^8.28.0", - "@typescript-eslint/parser": "~8.29.0", - "@typescript-eslint/types": "~8.29.0", + "@typescript-eslint/parser": "^8.29.0", + "@typescript-eslint/types": "^8.29.0", "benchmark": "^2.1.4", "c8": "^10.1.3", "chai": "^5.2.0", diff --git a/prettier.config.mjs b/prettier.config.mjs new file mode 100644 index 00000000..ff8b4c56 --- /dev/null +++ b/prettier.config.mjs @@ -0,0 +1 @@ +export default {}; diff --git a/tests/fixtures/integrations/snippet-scope/snippet-shadow-scope-setup.ts b/tests/fixtures/integrations/snippet-scope/snippet-shadow-scope-setup.ts index 303b59e4..52336412 100644 --- a/tests/fixtures/integrations/snippet-scope/snippet-shadow-scope-setup.ts +++ b/tests/fixtures/integrations/snippet-scope/snippet-shadow-scope-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils.js"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src/index.js"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/snippet-scope/ts-snippet-hoist-scope-setup.ts b/tests/fixtures/integrations/snippet-scope/ts-snippet-hoist-scope-setup.ts index 9b7181f5..fa38171d 100644 --- a/tests/fixtures/integrations/snippet-scope/ts-snippet-hoist-scope-setup.ts +++ b/tests/fixtures/integrations/snippet-scope/ts-snippet-hoist-scope-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils.js"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src/index.js"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/$derived-setup.ts b/tests/fixtures/integrations/type-info-tests/$derived-setup.ts index 1751c29e..d412fd99 100644 --- a/tests/fixtures/integrations/type-info-tests/$derived-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/$derived-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/$derived-ts-setup.ts b/tests/fixtures/integrations/type-info-tests/$derived-ts-setup.ts index 1751c29e..d412fd99 100644 --- a/tests/fixtures/integrations/type-info-tests/$derived-ts-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/$derived-ts-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/$derived2-setup.ts b/tests/fixtures/integrations/type-info-tests/$derived2-setup.ts index 1751c29e..d412fd99 100644 --- a/tests/fixtures/integrations/type-info-tests/$derived2-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/$derived2-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/$derived2-ts-setup.ts b/tests/fixtures/integrations/type-info-tests/$derived2-ts-setup.ts index 1751c29e..d412fd99 100644 --- a/tests/fixtures/integrations/type-info-tests/$derived2-ts-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/$derived2-ts-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/$props-setup.ts b/tests/fixtures/integrations/type-info-tests/$props-setup.ts index 1751c29e..d412fd99 100644 --- a/tests/fixtures/integrations/type-info-tests/$props-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/$props-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/await-setup.ts b/tests/fixtures/integrations/type-info-tests/await-setup.ts index 0776177e..6e873163 100644 --- a/tests/fixtures/integrations/type-info-tests/await-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/await-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/await-with-same-id-setup.ts b/tests/fixtures/integrations/type-info-tests/await-with-same-id-setup.ts index 1172dc96..5af1937a 100644 --- a/tests/fixtures/integrations/type-info-tests/await-with-same-id-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/await-with-same-id-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/i18n-setup.ts b/tests/fixtures/integrations/type-info-tests/i18n-setup.ts index 0776177e..6e873163 100644 --- a/tests/fixtures/integrations/type-info-tests/i18n-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/i18n-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/issue226-setup.ts b/tests/fixtures/integrations/type-info-tests/issue226-setup.ts index 2b458b9d..0ad5e9ea 100644 --- a/tests/fixtures/integrations/type-info-tests/issue226-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/issue226-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts b/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts index 14872ebb..05846f7d 100644 --- a/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts b/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts index 14872ebb..05846f7d 100644 --- a/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/reactive-setup.ts b/tests/fixtures/integrations/type-info-tests/reactive-setup.ts index 12eb3010..b90f6180 100644 --- a/tests/fixtures/integrations/type-info-tests/reactive-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/reactive-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts b/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts index 5804c700..96c7ba6f 100644 --- a/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts b/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts index a1a075a0..348575af 100644 --- a/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: { diff --git a/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts b/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts index f8a6a783..50827a22 100644 --- a/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts +++ b/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts @@ -1,6 +1,6 @@ import type { Linter } from "eslint"; import { generateParserOptions } from "../../../src/parser/test-utils"; -import { rules } from "@typescript-eslint/eslint-plugin"; +import { plugin } from "typescript-eslint"; import * as parser from "../../../../src"; import globals from "globals"; @@ -8,7 +8,7 @@ export function getConfig(): Linter.Config { return { plugins: { "@typescript-eslint": { - rules: rules as any, + rules: plugin.rules as any, }, }, languageOptions: {