From 6db5604b41341dc0f41cc99f81edc0913aa661ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=AF=E7=84=B6?= Date: Tue, 30 Apr 2024 20:12:58 +0800 Subject: [PATCH] feat: eslint-utils => @eslint-community/eslint-utils (#474) eslint-plugin-eslint-comments => @eslint-community/eslint-plugin-eslint-comments --- eslint.config.js | 8 ++++---- lib/rules/fixer-return.js | 2 +- lib/rules/no-missing-placeholders.js | 2 +- lib/rules/no-only-tests.js | 2 +- lib/rules/no-unused-placeholders.js | 2 +- lib/rules/prefer-message-ids.js | 2 +- lib/rules/prefer-placeholders.js | 2 +- lib/rules/report-message-format.js | 2 +- lib/rules/require-meta-docs-description.js | 2 +- lib/rules/require-meta-docs-recommended.js | 2 +- lib/rules/require-meta-docs-url.js | 2 +- lib/rules/require-meta-fixable.js | 2 +- lib/rules/require-meta-has-suggestions.js | 2 +- lib/rules/require-meta-schema.js | 2 +- lib/rules/require-meta-type.js | 2 +- lib/utils.js | 5 ++++- package.json | 6 +++--- 17 files changed, 25 insertions(+), 22 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index ad269749..ecc609db 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -15,15 +15,15 @@ const compat = new FlatCompat({ module.exports = [ ...compat.extends( 'not-an-aardvark/node', - 'plugin:eslint-comments/recommended', + 'plugin:@eslint-community/eslint-comments/recommended', 'plugin:prettier/recommended', 'plugin:unicorn/recommended', ), pluginN.configs['flat/recommended'], { rules: { - 'eslint-comments/no-unused-disable': 'error', - 'eslint-comments/require-description': 'error', + '@eslint-community/eslint-comments/no-unused-disable': 'error', + '@eslint-community/eslint-comments/require-description': 'error', 'unicorn/consistent-function-scoping': 'off', 'unicorn/no-array-callback-reference': 'off', @@ -70,7 +70,7 @@ module.exports = [ 'no-unused-vars': 'off', strict: 'off', - 'eslint-comments/require-description': 'off', + '@eslint-community/eslint-comments/require-description': 'off', 'unicorn/filename-case': 'off', }, diff --git a/lib/rules/fixer-return.js b/lib/rules/fixer-return.js index 038556d7..0ea7c857 100644 --- a/lib/rules/fixer-return.js +++ b/lib/rules/fixer-return.js @@ -10,7 +10,7 @@ // ------------------------------------------------------------------------------ const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-missing-placeholders.js b/lib/rules/no-missing-placeholders.js index d3994428..364c340f 100644 --- a/lib/rules/no-missing-placeholders.js +++ b/lib/rules/no-missing-placeholders.js @@ -6,7 +6,7 @@ 'use strict'; const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-only-tests.js b/lib/rules/no-only-tests.js index 974f2ff7..816fedd1 100644 --- a/lib/rules/no-only-tests.js +++ b/lib/rules/no-only-tests.js @@ -5,7 +5,7 @@ const { isCommaToken, isOpeningBraceToken, isClosingBraceToken, -} = require('eslint-utils'); +} = require('@eslint-community/eslint-utils'); /** @type {import('eslint').Rule.RuleModule} */ module.exports = { diff --git a/lib/rules/no-unused-placeholders.js b/lib/rules/no-unused-placeholders.js index d6e7dc93..ca95c952 100644 --- a/lib/rules/no-unused-placeholders.js +++ b/lib/rules/no-unused-placeholders.js @@ -6,7 +6,7 @@ 'use strict'; const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/prefer-message-ids.js b/lib/rules/prefer-message-ids.js index 4ee51006..1d932748 100644 --- a/lib/rules/prefer-message-ids.js +++ b/lib/rules/prefer-message-ids.js @@ -1,7 +1,7 @@ 'use strict'; const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/prefer-placeholders.js b/lib/rules/prefer-placeholders.js index 4a5a7dfc..a1555945 100644 --- a/lib/rules/prefer-placeholders.js +++ b/lib/rules/prefer-placeholders.js @@ -6,7 +6,7 @@ 'use strict'; const utils = require('../utils'); -const { findVariable } = require('eslint-utils'); +const { findVariable } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/report-message-format.js b/lib/rules/report-message-format.js index d7f17a21..a73e9d0b 100644 --- a/lib/rules/report-message-format.js +++ b/lib/rules/report-message-format.js @@ -5,7 +5,7 @@ 'use strict'; -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); // ------------------------------------------------------------------------------ diff --git a/lib/rules/require-meta-docs-description.js b/lib/rules/require-meta-docs-description.js index 081b4ff6..58156bf4 100644 --- a/lib/rules/require-meta-docs-description.js +++ b/lib/rules/require-meta-docs-description.js @@ -1,6 +1,6 @@ 'use strict'; -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); // ------------------------------------------------------------------------------ diff --git a/lib/rules/require-meta-docs-recommended.js b/lib/rules/require-meta-docs-recommended.js index d620f34b..f2cdeee8 100644 --- a/lib/rules/require-meta-docs-recommended.js +++ b/lib/rules/require-meta-docs-recommended.js @@ -1,6 +1,6 @@ 'use strict'; -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); /** @type {import('eslint').Rule.RuleModule} */ diff --git a/lib/rules/require-meta-docs-url.js b/lib/rules/require-meta-docs-url.js index af3e6d40..d5039eee 100644 --- a/lib/rules/require-meta-docs-url.js +++ b/lib/rules/require-meta-docs-url.js @@ -10,7 +10,7 @@ const path = require('path'); const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ----------------------------------------------------------------------------- // Rule Definition diff --git a/lib/rules/require-meta-fixable.js b/lib/rules/require-meta-fixable.js index 3b9ec681..8e275f6d 100644 --- a/lib/rules/require-meta-fixable.js +++ b/lib/rules/require-meta-fixable.js @@ -5,7 +5,7 @@ 'use strict'; -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); // ------------------------------------------------------------------------------ diff --git a/lib/rules/require-meta-has-suggestions.js b/lib/rules/require-meta-has-suggestions.js index a7b5547a..1759eecf 100644 --- a/lib/rules/require-meta-has-suggestions.js +++ b/lib/rules/require-meta-has-suggestions.js @@ -1,7 +1,7 @@ 'use strict'; const utils = require('../utils'); -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); // ------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/require-meta-schema.js b/lib/rules/require-meta-schema.js index 9c3e908c..fc64242b 100644 --- a/lib/rules/require-meta-schema.js +++ b/lib/rules/require-meta-schema.js @@ -1,6 +1,6 @@ 'use strict'; -const { findVariable } = require('eslint-utils'); +const { findVariable } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); // ------------------------------------------------------------------------------ diff --git a/lib/rules/require-meta-type.js b/lib/rules/require-meta-type.js index 1b3a14c4..24036071 100644 --- a/lib/rules/require-meta-type.js +++ b/lib/rules/require-meta-type.js @@ -5,7 +5,7 @@ 'use strict'; -const { getStaticValue } = require('eslint-utils'); +const { getStaticValue } = require('@eslint-community/eslint-utils'); const utils = require('../utils'); const VALID_TYPES = new Set(['problem', 'suggestion', 'layout']); diff --git a/lib/utils.js b/lib/utils.js index d59555e5..d584a1e9 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,6 +1,9 @@ 'use strict'; -const { getStaticValue, findVariable } = require('eslint-utils'); +const { + getStaticValue, + findVariable, +} = require('@eslint-community/eslint-utils'); const estraverse = require('estraverse'); const functionTypes = new Set([ diff --git a/package.json b/package.json index 10159af3..16c4cdb9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "homepage": "https://github.com/eslint-community/eslint-plugin-eslint-plugin#readme", "dependencies": { - "eslint-utils": "^3.0.0", + "@eslint-community/eslint-utils": "^4.4.0", "estraverse": "^5.3.0" }, "nyc": { @@ -52,6 +52,7 @@ "devDependencies": { "@commitlint/cli": "^19.2.2", "@commitlint/config-conventional": "^19.2.2", + "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0", "@eslint/eslintrc": "^3.0.2", "@eslint/js": "^9.0.0", "@release-it/conventional-changelog": "^8.0.1", @@ -61,11 +62,10 @@ "@typescript-eslint/utils": "^7.7.0", "chai": "^4.4.1", "dirty-chai": "^2.0.1", - "eslint": "^9.0.0", + "eslint": "^9.1.1", "eslint-config-not-an-aardvark": "^2.1.0", "eslint-config-prettier": "^9.1.0", "eslint-doc-generator": "^1.7.0", - "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-eslint-plugin": "file:./", "eslint-plugin-markdown": "^4.0.1", "eslint-plugin-n": "^17.2.1",