From 61017cc6e8d11581cb36353a4b01ed27bf50a3c6 Mon Sep 17 00:00:00 2001 From: 1aron Date: Sat, 28 Oct 2023 18:13:52 +0800 Subject: [PATCH] Update ESLint --- packages/eslint-plugin/src/rules/class-collision.ts | 2 +- packages/eslint-plugin/src/utils/are-declarations-equal.ts | 3 --- packages/eslint-plugin/src/utils/define-visitors.ts | 7 ++++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/eslint-plugin/src/rules/class-collision.ts b/packages/eslint-plugin/src/rules/class-collision.ts index a30424a0a..26ea5ea90 100644 --- a/packages/eslint-plugin/src/rules/class-collision.ts +++ b/packages/eslint-plugin/src/rules/class-collision.ts @@ -30,7 +30,7 @@ export default { const nodeStartLine = node.loc.start.line const nodeEndLine = node.loc.end.line const ruleOfClass = {} - + console.log(classNames) classNames .forEach(eachClassName => { ruleOfClass[eachClassName] = createValidRules(eachClassName, { config })[0] diff --git a/packages/eslint-plugin/src/utils/are-declarations-equal.ts b/packages/eslint-plugin/src/utils/are-declarations-equal.ts index 04241a1a0..392d7f627 100644 --- a/packages/eslint-plugin/src/utils/are-declarations-equal.ts +++ b/packages/eslint-plugin/src/utils/are-declarations-equal.ts @@ -13,9 +13,6 @@ export default function areDeclarationsEqual(aDeclarations, bDeclarations) { if (!Object.prototype.hasOwnProperty.call(bDeclarations, key)) { return false } - if (aDeclarations[key] !== bDeclarations[key]) { - return false - } } // 如果所有属性都匹配,返回true diff --git a/packages/eslint-plugin/src/utils/define-visitors.ts b/packages/eslint-plugin/src/utils/define-visitors.ts index c6cc8d5e5..4a52974d8 100644 --- a/packages/eslint-plugin/src/utils/define-visitors.ts +++ b/packages/eslint-plugin/src/utils/define-visitors.ts @@ -1,6 +1,7 @@ import type { RuleListener } from '@typescript-eslint/utils/ts-eslint' +import { Rule } from 'eslint' -export default function defineVisitors({ context, settings }: any, visitNode) { +export default function defineVisitors({ context, settings }: { context: Rule.RuleContext, settings: any }, visitNode) { const isFnNode = (node) => { let calleeName = '' @@ -70,9 +71,9 @@ export default function defineVisitors({ context, settings }: any, visitNode) { }, } - if (context.parserServices == null || context.parserServices.defineTemplateBodyVisitor == null) { + if (context.sourceCode.parserServices == null || context.sourceCode.parserServices.defineTemplateBodyVisitor == null) { return scriptVisitor } else { - return context.parserServices.defineTemplateBodyVisitor(templateBodyVisitor, scriptVisitor) + return context.sourceCode.parserServices.defineTemplateBodyVisitor(templateBodyVisitor, scriptVisitor) } } \ No newline at end of file