diff --git a/.changeset/happy-donuts-fold.md b/.changeset/happy-donuts-fold.md new file mode 100644 index 000000000..156e2c903 --- /dev/null +++ b/.changeset/happy-donuts-fold.md @@ -0,0 +1,5 @@ +--- +'eslint-plugin-svelte': patch +--- + +chore: use `context.sourceCode` directly rather than a compatibility helper. diff --git a/packages/eslint-plugin-svelte/eslint.config.mjs b/packages/eslint-plugin-svelte/eslint.config.mjs index a85da9487..be11b7c70 100644 --- a/packages/eslint-plugin-svelte/eslint.config.mjs +++ b/packages/eslint-plugin-svelte/eslint.config.mjs @@ -70,7 +70,7 @@ const config = [ ], 'no-restricted-properties': [ 'error', - { object: 'context', property: 'getSourceCode', message: 'Use src/utils/compat.ts' }, + { object: 'context', property: 'getSourceCode', message: 'Use `context.sourceCode`' }, { object: 'context', property: 'getFilename', message: 'Use src/utils/compat.ts' }, { object: 'context', diff --git a/packages/eslint-plugin-svelte/src/rules/@typescript-eslint/no-unnecessary-condition.ts b/packages/eslint-plugin-svelte/src/rules/@typescript-eslint/no-unnecessary-condition.ts index fba1ac96d..30097faa7 100644 --- a/packages/eslint-plugin-svelte/src/rules/@typescript-eslint/no-unnecessary-condition.ts +++ b/packages/eslint-plugin-svelte/src/rules/@typescript-eslint/no-unnecessary-condition.ts @@ -22,7 +22,6 @@ import { isTupleType } from '../../utils/ts-utils/index.js'; import type { TS, TSTools } from '../../utils/ts-utils/index.js'; -import { getSourceCode } from '../../utils/compat.js'; /** * Returns all types of a union type or an array containing `type` itself if it's no union type. @@ -157,7 +156,7 @@ export default createRule('@typescript-eslint/no-unnecessary-condition', { const { service, ts } = tools; const checker = service.program.getTypeChecker(); - const sourceCode = getSourceCode(context); + const sourceCode = context.sourceCode; const compilerOptions = service.program.getCompilerOptions(); const isStrictNullChecks = compilerOptions.strict ? compilerOptions.strictNullChecks !== false diff --git a/packages/eslint-plugin-svelte/src/rules/block-lang.ts b/packages/eslint-plugin-svelte/src/rules/block-lang.ts index 03eed5b4c..39a95ca9e 100644 --- a/packages/eslint-plugin-svelte/src/rules/block-lang.ts +++ b/packages/eslint-plugin-svelte/src/rules/block-lang.ts @@ -1,7 +1,6 @@ import { createRule } from '../utils/index.js'; import { findAttribute, getLangValue } from '../utils/ast-utils.js'; import type { SvelteScriptElement, SvelteStyleElement } from 'svelte-eslint-parser/lib/ast'; -import { getSourceCode } from '../utils/compat.js'; import type { SuggestionReportDescriptor, SourceCode } from '../types.js'; export default createRule('block-lang', { @@ -59,7 +58,7 @@ export default createRule('block-lang', { hasSuggestions: true }, create(context) { - if (!getSourceCode(context).parserServices.isSvelte) { + if (!context.sourceCode.parserServices.isSvelte) { return {}; } const enforceScriptPresent: boolean = context.options[0]?.enforceScriptPresent ?? false; @@ -91,7 +90,7 @@ export default createRule('block-lang', { message: `The