diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 51902405..2db8a0f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,17 +38,6 @@ jobs: - run: npm install - run: npm run lint - eslint8: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: "lts/*" - - run: npm install - - run: npm install --save-dev eslint@8 - - run: npm test - test-remote: name: eslint-remote-tester runs-on: ubuntu-latest diff --git a/package.json b/package.json index be4d50fc..627142d1 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "typescript": "^5.7.2" }, "peerDependencies": { - "eslint": ">=8.23.0" + "eslint": ">=9.0.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/tests/lib/eslint-rule-tester.js b/tests/lib/eslint-rule-tester.js deleted file mode 100644 index dd16a8e2..00000000 --- a/tests/lib/eslint-rule-tester.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @fileoverview Helpers for tests. - * @author 唯然 - */ - -'use strict'; - -const eslintVersion = require('eslint/package.json').version; -const { RuleTester } = require('eslint'); -const { FlatRuleTester } = require('eslint/use-at-your-own-risk'); - -// greater than or equal to ESLint v9 -exports.gteEslintV9 = +eslintVersion.split('.')[0] >= 9; - -exports.RuleTester = exports.gteEslintV9 ? RuleTester : FlatRuleTester; diff --git a/tests/lib/rules/consistent-output.js b/tests/lib/rules/consistent-output.js index 75ecabe8..ca135568 100644 --- a/tests/lib/rules/consistent-output.js +++ b/tests/lib/rules/consistent-output.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/consistent-output'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const ERROR = { messageId: 'missingOutput', type: 'ObjectExpression' }; diff --git a/tests/lib/rules/fixer-return.js b/tests/lib/rules/fixer-return.js index 349a9bf4..3436bddc 100644 --- a/tests/lib/rules/fixer-return.js +++ b/tests/lib/rules/fixer-return.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/fixer-return'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/meta-property-ordering.js b/tests/lib/rules/meta-property-ordering.js index 1d4dfec8..d6e2fb70 100644 --- a/tests/lib/rules/meta-property-ordering.js +++ b/tests/lib/rules/meta-property-ordering.js @@ -9,7 +9,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/meta-property-ordering'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-deprecated-context-methods.js b/tests/lib/rules/no-deprecated-context-methods.js index 84770ccd..f185b4ce 100644 --- a/tests/lib/rules/no-deprecated-context-methods.js +++ b/tests/lib/rules/no-deprecated-context-methods.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-deprecated-context-methods'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-deprecated-report-api.js b/tests/lib/rules/no-deprecated-report-api.js index 6483fbde..7a35146c 100644 --- a/tests/lib/rules/no-deprecated-report-api.js +++ b/tests/lib/rules/no-deprecated-report-api.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-deprecated-report-api'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-identical-tests.js b/tests/lib/rules/no-identical-tests.js index 6f0e444e..afb642ff 100644 --- a/tests/lib/rules/no-identical-tests.js +++ b/tests/lib/rules/no-identical-tests.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-identical-tests'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const ERROR_OBJECT_TEST = { messageId: 'identical', type: 'ObjectExpression' }; const ERROR_STRING_TEST = { messageId: 'identical', type: 'Literal' }; diff --git a/tests/lib/rules/no-meta-replaced-by.js b/tests/lib/rules/no-meta-replaced-by.js index d72f41ac..b08f14c5 100644 --- a/tests/lib/rules/no-meta-replaced-by.js +++ b/tests/lib/rules/no-meta-replaced-by.js @@ -9,7 +9,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-meta-replaced-by'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-meta-schema-default.js b/tests/lib/rules/no-meta-schema-default.js index 869f4971..e6432110 100644 --- a/tests/lib/rules/no-meta-schema-default.js +++ b/tests/lib/rules/no-meta-schema-default.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-meta-schema-default'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-missing-message-ids.js b/tests/lib/rules/no-missing-message-ids.js index 78b9e600..ff207938 100644 --- a/tests/lib/rules/no-missing-message-ids.js +++ b/tests/lib/rules/no-missing-message-ids.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-missing-message-ids'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-missing-placeholders.js b/tests/lib/rules/no-missing-placeholders.js index 43bb137b..1d883950 100644 --- a/tests/lib/rules/no-missing-placeholders.js +++ b/tests/lib/rules/no-missing-placeholders.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-missing-placeholders'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; /** * Create an error for the given key diff --git a/tests/lib/rules/no-only-tests.js b/tests/lib/rules/no-only-tests.js index 0df7e600..16a67755 100644 --- a/tests/lib/rules/no-only-tests.js +++ b/tests/lib/rules/no-only-tests.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-only-tests'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-property-in-node.js b/tests/lib/rules/no-property-in-node.js index 62181a3b..029405e3 100644 --- a/tests/lib/rules/no-property-in-node.js +++ b/tests/lib/rules/no-property-in-node.js @@ -1,6 +1,6 @@ 'use strict'; -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const path = require('path'); const rule = require('../../../lib/rules/no-property-in-node'); diff --git a/tests/lib/rules/no-unused-message-ids.js b/tests/lib/rules/no-unused-message-ids.js index 8f5f6fa8..39457df4 100644 --- a/tests/lib/rules/no-unused-message-ids.js +++ b/tests/lib/rules/no-unused-message-ids.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-unused-message-ids'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unused-placeholders.js b/tests/lib/rules/no-unused-placeholders.js index fd93b777..9e8d2a6b 100644 --- a/tests/lib/rules/no-unused-placeholders.js +++ b/tests/lib/rules/no-unused-placeholders.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-unused-placeholders'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; /** * Create an error for the given key diff --git a/tests/lib/rules/no-useless-token-range.js b/tests/lib/rules/no-useless-token-range.js index c4b13960..5405b7a1 100644 --- a/tests/lib/rules/no-useless-token-range.js +++ b/tests/lib/rules/no-useless-token-range.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/no-useless-token-range'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; /** * Wraps a code sample as an eslint rule diff --git a/tests/lib/rules/prefer-message-ids.js b/tests/lib/rules/prefer-message-ids.js index ac54184e..a2ea2af2 100644 --- a/tests/lib/rules/prefer-message-ids.js +++ b/tests/lib/rules/prefer-message-ids.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/prefer-message-ids'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-object-rule.js b/tests/lib/rules/prefer-object-rule.js index 9c0aae74..d02ec2e4 100644 --- a/tests/lib/rules/prefer-object-rule.js +++ b/tests/lib/rules/prefer-object-rule.js @@ -9,7 +9,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/prefer-object-rule'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-output-null.js b/tests/lib/rules/prefer-output-null.js index b7c0eda1..cbb8086c 100644 --- a/tests/lib/rules/prefer-output-null.js +++ b/tests/lib/rules/prefer-output-null.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/prefer-output-null'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const ERROR = { messageId: 'useOutputNull', type: 'Property' }; diff --git a/tests/lib/rules/prefer-placeholders.js b/tests/lib/rules/prefer-placeholders.js index f7fe49e0..bd41797f 100644 --- a/tests/lib/rules/prefer-placeholders.js +++ b/tests/lib/rules/prefer-placeholders.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/prefer-placeholders'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-replace-text.js b/tests/lib/rules/prefer-replace-text.js index c83a9559..aa5b7e4d 100644 --- a/tests/lib/rules/prefer-replace-text.js +++ b/tests/lib/rules/prefer-replace-text.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/prefer-replace-text'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/report-message-format.js b/tests/lib/rules/report-message-format.js index 7ca4cf10..417882b9 100644 --- a/tests/lib/rules/report-message-format.js +++ b/tests/lib/rules/report-message-format.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/report-message-format'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-default-options.js b/tests/lib/rules/require-meta-default-options.js index da2b4209..50cb1616 100644 --- a/tests/lib/rules/require-meta-default-options.js +++ b/tests/lib/rules/require-meta-default-options.js @@ -1,7 +1,7 @@ 'use strict'; const rule = require('../../../lib/rules/require-meta-default-options'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const ruleTester = new RuleTester({ languageOptions: { sourceType: 'commonjs' }, diff --git a/tests/lib/rules/require-meta-docs-description.js b/tests/lib/rules/require-meta-docs-description.js index 2b4ded37..f76bb293 100644 --- a/tests/lib/rules/require-meta-docs-description.js +++ b/tests/lib/rules/require-meta-docs-description.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-docs-description'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-docs-recommended.js b/tests/lib/rules/require-meta-docs-recommended.js index 1a58bacc..6d626e85 100644 --- a/tests/lib/rules/require-meta-docs-recommended.js +++ b/tests/lib/rules/require-meta-docs-recommended.js @@ -1,7 +1,7 @@ 'use strict'; const rule = require('../../../lib/rules/require-meta-docs-recommended'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const ruleTester = new RuleTester({ languageOptions: { sourceType: 'commonjs' }, diff --git a/tests/lib/rules/require-meta-docs-url.js b/tests/lib/rules/require-meta-docs-url.js index da7a9048..9c299d93 100644 --- a/tests/lib/rules/require-meta-docs-url.js +++ b/tests/lib/rules/require-meta-docs-url.js @@ -10,7 +10,7 @@ // Requirements // ----------------------------------------------------------------------------- -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; const rule = require('../../../lib/rules/require-meta-docs-url'); // ----------------------------------------------------------------------------- diff --git a/tests/lib/rules/require-meta-fixable.js b/tests/lib/rules/require-meta-fixable.js index 8aef6c04..c3bb18a8 100644 --- a/tests/lib/rules/require-meta-fixable.js +++ b/tests/lib/rules/require-meta-fixable.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-fixable'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-has-suggestions.js b/tests/lib/rules/require-meta-has-suggestions.js index 0a1e96ab..d459c681 100644 --- a/tests/lib/rules/require-meta-has-suggestions.js +++ b/tests/lib/rules/require-meta-has-suggestions.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-has-suggestions'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-schema-description.js b/tests/lib/rules/require-meta-schema-description.js index 1b3f4256..5aabc5ec 100644 --- a/tests/lib/rules/require-meta-schema-description.js +++ b/tests/lib/rules/require-meta-schema-description.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-schema-description'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-schema.js b/tests/lib/rules/require-meta-schema.js index dfb1754d..11e48c13 100644 --- a/tests/lib/rules/require-meta-schema.js +++ b/tests/lib/rules/require-meta-schema.js @@ -5,7 +5,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-schema'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-meta-type.js b/tests/lib/rules/require-meta-type.js index 2180e23e..6a222331 100644 --- a/tests/lib/rules/require-meta-type.js +++ b/tests/lib/rules/require-meta-type.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/require-meta-type'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/test-case-property-ordering.js b/tests/lib/rules/test-case-property-ordering.js index 149278d1..f4532975 100644 --- a/tests/lib/rules/test-case-property-ordering.js +++ b/tests/lib/rules/test-case-property-ordering.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/test-case-property-ordering'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; // ------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/test-case-shorthand-strings.js b/tests/lib/rules/test-case-shorthand-strings.js index 4deddade..9708b510 100644 --- a/tests/lib/rules/test-case-shorthand-strings.js +++ b/tests/lib/rules/test-case-shorthand-strings.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const rule = require('../../../lib/rules/test-case-shorthand-strings'); -const RuleTester = require('../eslint-rule-tester').RuleTester; +const RuleTester = require('eslint').RuleTester; /** * Returns the code for some valid test cases