Skip to content

Commit 2e94cdb

Browse files
authored
Use @eslint-community/eslint-utils package (#2112)
1 parent cfbfa12 commit 2e94cdb

33 files changed

+82
-38
lines changed

.eslintrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ module.exports = {
131131
'unicorn/no-useless-undefined': 'off',
132132
'unicorn/prefer-optional-catch-binding': 'off', // not supported by current ESLint parser version
133133
'unicorn/prefer-module': 'off',
134-
'unicorn/prevent-abbreviations': 'off'
134+
'unicorn/prevent-abbreviations': 'off',
135+
136+
'require-eslint-community': ['error']
135137
},
136138
overrides: [
137139
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
'use strict'
2+
3+
module.exports = {
4+
meta: {
5+
docs: {
6+
description: 'enforce use of the `@eslint-community/*` package',
7+
categories: ['Internal']
8+
},
9+
fixable: 'code',
10+
messages: {
11+
useCommunityPackageInstead:
12+
'Please use `@eslint-community/{{name}}` instead.'
13+
},
14+
schema: []
15+
},
16+
17+
/** @param {import('eslint').Rule.RuleContext} context */
18+
create(context) {
19+
return {
20+
/**
21+
* @param {import("../typings/eslint-plugin-vue/util-types/ast").Literal} node
22+
*/
23+
'CallExpression > Literal.arguments[value=/^(?:eslint-utils|regexpp)$/u]'(
24+
node
25+
) {
26+
context.report({
27+
node,
28+
messageId: 'useCommunityPackageInstead',
29+
data: {
30+
name: node.value
31+
},
32+
fix(fixer) {
33+
return fixer.replaceText(node, `'@eslint-community/${node.value}'`)
34+
}
35+
})
36+
}
37+
}
38+
}
39+
}

lib/rules/custom-event-name-casing.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const { findVariable } = require('eslint-utils')
7+
const { findVariable } = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99
const casing = require('../utils/casing')
1010
const { toRegExp } = require('../utils/regexp')

lib/rules/next-tick-style.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'use strict'
88

99
const utils = require('../utils')
10-
const { findVariable } = require('eslint-utils')
10+
const { findVariable } = require('@eslint-community/eslint-utils')
1111

1212
/**
1313
* @param {Identifier} identifier

lib/rules/no-async-in-computed-properties.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Armano
44
*/
55
'use strict'
6-
const { ReferenceTracker } = require('eslint-utils')
6+
const { ReferenceTracker } = require('@eslint-community/eslint-utils')
77
const utils = require('../utils')
88

99
/**

lib/rules/no-expose-after-await.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const { findVariable } = require('eslint-utils')
7+
const { findVariable } = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99

1010
/**

lib/rules/no-extra-parens.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
'use strict'
55

6-
const { isParenthesized } = require('eslint-utils')
6+
const { isParenthesized } = require('@eslint-community/eslint-utils')
77
const { wrapCoreRule } = require('../utils')
88
const { getStyleVariablesContext } = require('../utils/style-variables')
99

lib/rules/no-lifecycle-after-await.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* See LICENSE file in root directory for full license.
44
*/
55
'use strict'
6-
const { ReferenceTracker } = require('eslint-utils')
6+
const { ReferenceTracker } = require('@eslint-community/eslint-utils')
77
const utils = require('../utils')
88

99
/**
10-
* @typedef {import('eslint-utils').TYPES.TraceMap} TraceMap
10+
* @typedef {import('@eslint-community/eslint-utils').TYPES.TraceMap} TraceMap
1111
*/
1212

1313
const LIFECYCLE_HOOKS = [

lib/rules/no-multiple-slot-args.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict'
66

77
const utils = require('../utils')
8-
const { findVariable } = require('eslint-utils')
8+
const { findVariable } = require('@eslint-community/eslint-utils')
99

1010
module.exports = {
1111
meta: {

lib/rules/no-mutating-props.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict'
66

77
const utils = require('../utils')
8-
const { findVariable } = require('eslint-utils')
8+
const { findVariable } = require('@eslint-community/eslint-utils')
99

1010
// https://github.com/vuejs/vue-next/blob/7c11c58faf8840ab97b6449c98da0296a60dddd8/packages/shared/src/globalsWhitelist.ts
1111
const GLOBALS_WHITE_LISTED = new Set([

lib/rules/no-restricted-call-after-await.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
'use strict'
66
const fs = require('fs')
77
const path = require('path')
8-
const { ReferenceTracker } = require('eslint-utils')
8+
const { ReferenceTracker } = require('@eslint-community/eslint-utils')
99
const utils = require('../utils')
1010

1111
/**
12-
* @typedef {import('eslint-utils').TYPES.TraceMap} TraceMap
13-
* @typedef {import('eslint-utils').TYPES.TraceKind} TraceKind
12+
* @typedef {import('@eslint-community/eslint-utils').TYPES.TraceMap} TraceMap
13+
* @typedef {import('@eslint-community/eslint-utils').TYPES.TraceKind} TraceKind
1414
*/
1515

1616
/**

lib/rules/no-restricted-custom-event.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const { findVariable } = require('eslint-utils')
7+
const { findVariable } = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99
const regexp = require('../utils/regexp')
1010

lib/rules/no-setup-props-destructure.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* See LICENSE file in root directory for full license.
44
*/
55
'use strict'
6-
const { findVariable } = require('eslint-utils')
6+
const { findVariable } = require('@eslint-community/eslint-utils')
77
const utils = require('../utils')
88

99
module.exports = {

lib/rules/no-side-effects-in-computed-properties.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
* @author Michał Sajnóg
44
*/
55
'use strict'
6-
const { ReferenceTracker, findVariable } = require('eslint-utils')
6+
const {
7+
ReferenceTracker,
8+
findVariable
9+
} = require('@eslint-community/eslint-utils')
710
const utils = require('../utils')
811

912
/**

lib/rules/no-unused-properties.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict'
66

77
const utils = require('../utils')
8-
const eslintUtils = require('eslint-utils')
8+
const eslintUtils = require('@eslint-community/eslint-utils')
99
const { isJSDocComment } = require('../utils/comments.js')
1010
const { getStyleVariablesContext } = require('../utils/style-variables')
1111
const {

lib/rules/no-use-computed-property-like-method.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const eslintUtils = require('eslint-utils')
7+
const eslintUtils = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99

1010
/**

lib/rules/no-watch-after-await.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* See LICENSE file in root directory for full license.
44
*/
55
'use strict'
6-
const { ReferenceTracker } = require('eslint-utils')
6+
const { ReferenceTracker } = require('@eslint-community/eslint-utils')
77
const utils = require('../utils')
88

99
/**

lib/rules/padding-lines-in-component-definition.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
const utils = require('../utils')
13-
const { isCommentToken } = require('eslint-utils')
13+
const { isCommentToken } = require('@eslint-community/eslint-utils')
1414

1515
const AvailablePaddingOptions = {
1616
Never: 'never',

lib/rules/require-explicit-emits.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const {
1515
isOpeningBraceToken,
1616
isClosingBraceToken,
1717
isOpeningBracketToken
18-
} = require('eslint-utils')
18+
} = require('@eslint-community/eslint-utils')
1919
const utils = require('../utils')
2020
const { capitalize } = require('../utils/casing')
2121

lib/rules/require-expose.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const {
88
findVariable,
99
isOpeningBraceToken,
1010
isClosingBraceToken
11-
} = require('eslint-utils')
11+
} = require('@eslint-community/eslint-utils')
1212
const utils = require('../utils')
1313
const { getVueComponentDefinitionType } = require('../utils')
1414

lib/rules/require-slots-as-functions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict'
66

77
const utils = require('../utils')
8-
const { findVariable } = require('eslint-utils')
8+
const { findVariable } = require('@eslint-community/eslint-utils')
99

1010
module.exports = {
1111
meta: {

lib/rules/return-in-computed-property.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Armano
44
*/
55
'use strict'
6-
const { ReferenceTracker } = require('eslint-utils')
6+
const { ReferenceTracker } = require('@eslint-community/eslint-utils')
77
const utils = require('../utils')
88

99
/**

lib/rules/valid-define-emits.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const { findVariable } = require('eslint-utils')
7+
const { findVariable } = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99

1010
module.exports = {

lib/rules/valid-define-props.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
'use strict'
66

7-
const { findVariable } = require('eslint-utils')
7+
const { findVariable } = require('@eslint-community/eslint-utils')
88
const utils = require('../utils')
99

1010
module.exports = {

lib/rules/valid-next-tick.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'use strict'
88

99
const utils = require('../utils')
10-
const { findVariable } = require('eslint-utils')
10+
const { findVariable } = require('@eslint-community/eslint-utils')
1111

1212
/**
1313
* @param {Identifier} identifier

lib/utils/indent-common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {
1717
isClosingBracketToken,
1818
isSemicolonToken,
1919
isNotSemicolonToken
20-
} = require('eslint-utils')
20+
} = require('@eslint-community/eslint-utils')
2121
const {
2222
isComment,
2323
isNotComment,

lib/utils/indent-ts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const {
1111
isNotClosingParenToken,
1212
isClosingBracketToken,
1313
isOpeningBracketToken
14-
} = require('eslint-utils')
14+
} = require('@eslint-community/eslint-utils')
1515
const { isTypeNode } = require('./ts-ast-utils')
1616

1717
/**

lib/utils/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const VUE3_BUILTIN_COMPONENT_NAMES = new Set(
5555
const path = require('path')
5656
const vueEslintParser = require('vue-eslint-parser')
5757
const { traverseNodes, getFallbackKeys, NS } = vueEslintParser.AST
58-
const { findVariable } = require('eslint-utils')
58+
const { findVariable } = require('@eslint-community/eslint-utils')
5959
const {
6060
getComponentPropsFromTypeDefine,
6161
getComponentEmitsFromTypeDefine,
@@ -1859,7 +1859,7 @@ module.exports = {
18591859

18601860
/**
18611861
* Wraps composition API trace map in both 'vue' and '@vue/composition-api' imports
1862-
* @param {import('eslint-utils').TYPES.TraceMap} map
1862+
* @param {import('@eslint-community/eslint-utils').TYPES.TraceMap} map
18631863
*/
18641864
createCompositionApiTraceMap: (map) => ({
18651865
vue: map,

lib/utils/property-references.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict'
77

88
const utils = require('./index')
9-
const eslintUtils = require('eslint-utils')
9+
const eslintUtils = require('@eslint-community/eslint-utils')
1010

1111
/**
1212
* @typedef {import('./style-variables').StyleVariablesContext} StyleVariablesContext

lib/utils/ref-object-references.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict'
77

88
const utils = require('./index')
9-
const eslintUtils = require('eslint-utils')
9+
const eslintUtils = require('@eslint-community/eslint-utils')
1010
const { definePropertyReferenceExtractor } = require('./property-references')
1111
const { ReferenceTracker } = eslintUtils
1212

lib/utils/ts-ast-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { findVariable } = require('eslint-utils')
1+
const { findVariable } = require('@eslint-community/eslint-utils')
22
/**
33
* @typedef {import('@typescript-eslint/types').TSESTree.TypeNode} TypeNode
44
* @typedef {import('@typescript-eslint/types').TSESTree.TSInterfaceBody} TSInterfaceBody

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
5555
},
5656
"dependencies": {
57-
"eslint-utils": "^3.0.0",
57+
"@eslint-community/eslint-utils": "^4.3.0",
5858
"natural-compare": "^1.4.0",
5959
"nth-check": "^2.0.1",
6060
"postcss-selector-parser": "^6.0.9",

typings/eslint-utils/index.d.ts renamed to typings/@eslint-community/eslint-utils/index.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as VAST from '../eslint-plugin-vue/util-types/ast'
2-
import { Token, Comment } from '../eslint-plugin-vue/util-types/node'
3-
import { ParserServices } from '../eslint-plugin-vue/util-types/parser-services'
1+
import * as VAST from '../../eslint-plugin-vue/util-types/ast'
2+
import { Token, Comment } from '../../eslint-plugin-vue/util-types/node'
3+
import { ParserServices } from '../../eslint-plugin-vue/util-types/parser-services'
44
import eslint from 'eslint'
55

66
export function findVariable(

0 commit comments

Comments
 (0)