refactor!: rename typescriptWithLanguageServer to typescriptWithTypes

antfu · antfu · commit ffe00e1d9a8d · 2023-09-27T01:49:21.000+08:00
diff --git a/README.md b/README.md
@@ -161,36 +161,32 @@ import {
   ignores,
   imports,
   javascript,
-  javascriptStylistic,
   jsdoc,
   jsonc,
   markdown,
   node,
   sortPackageJson,
   sortTsconfig,
+  stylistic,
   typescript,
-  typescriptStylistic,
   unicorn,
   vue,
   yml,
 } from '@antfu/eslint-config'
 
 export default [
-  ...ignores,
+  ...ignores(),
   ...javascript(),
-  ...comments,
-  ...node,
-  ...jsdoc,
-  ...imports,
-  ...unicorn,
-  ...javascriptStylistic,
-
+  ...comments(),
+  ...node(),
+  ...jsdoc(),
+  ...imports(),
+  ...unicorn(),
   ...typescript(),
-  ...typescriptStylistic,
-
+  ...stylistic(),
   ...vue(),
-  ...jsonc,
-  ...yml,
+  ...jsonc(),
+  ...yml(),
   ...markdown(),
 ]
 ```
diff --git a/src/configs/typescript.ts b/src/configs/typescript.ts
@@ -3,7 +3,7 @@ import type { FlatESLintConfigItem } from 'eslint-define-config'
 import { GLOB_TS, GLOB_TSX } from '../globs'
 import { parserTs, pluginAntfu, pluginImport, pluginTs } from '../plugins'
 import { OFF } from '../flags'
-import type { OptionsComponentExts, OptionsOverrides, OptionsTypeScriptWithLanguageServer } from '../types'
+import type { OptionsComponentExts, OptionsOverrides, OptionsTypeScriptWithTypes } from '../types'
 import { renameRules } from '../utils'
 
 export function typescript(
@@ -105,8 +105,8 @@ export function typescript(
   ]
 }
 
-export function typescriptWithLanguageServer(
-  options: OptionsTypeScriptWithLanguageServer & OptionsComponentExts & OptionsOverrides,
+export function typescriptWithTypes(
+  options: OptionsTypeScriptWithTypes & OptionsComponentExts & OptionsOverrides,
 ): FlatESLintConfigItem[] {
   const {
     componentExts = [],
diff --git a/src/factory.ts b/src/factory.ts
@@ -17,7 +17,7 @@ import {
   stylistic,
   test,
   typescript,
-  typescriptWithLanguageServer,
+  typescriptWithTypes,
   unicorn,
   vue,
   yml,
@@ -95,7 +95,7 @@ export function antfu(options: OptionsConfig & FlatESLintConfigItem = {}, ...use
     }))
 
     if (typeof enableTypeScript !== 'boolean') {
-      configs.push(typescriptWithLanguageServer({
+      configs.push(typescriptWithTypes({
         ...enableTypeScript,
         componentExts,
         overrides: overrides.typescriptWithTypes,
diff --git a/src/types.ts b/src/types.ts
@@ -11,7 +11,7 @@ export interface OptionsComponentExts {
   componentExts?: string[]
 }
 
-export interface OptionsTypeScriptWithLanguageServer {
+export interface OptionsTypeScriptWithTypes {
   tsconfigPath: string
   tsconfigRootDir?: string
 }
@@ -46,7 +46,7 @@ export interface OptionsConfig {
    *
    * @default auto-detect based on the dependencies
    */
-  typescript?: boolean | OptionsTypeScriptWithLanguageServer
+  typescript?: boolean | OptionsTypeScriptWithTypes
 
   /**
    * Enable test support.

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export interface OptionsComponentExts {`
`11`	`11`	`componentExts?: string[]`
`12`	`12`	`}`
`13`	`13`
`14`		`-export interface OptionsTypeScriptWithLanguageServer {`
	`14`	`+export interface OptionsTypeScriptWithTypes {`
`15`	`15`	`tsconfigPath: string`
`16`	`16`	`tsconfigRootDir?: string`
`17`	`17`	`}`
`@@ -46,7 +46,7 @@ export interface OptionsConfig {`
`46`	`46`	`*`
`47`	`47`	`* @default auto-detect based on the dependencies`
`48`	`48`	`*/`
`49`		`- typescript?: boolean \| OptionsTypeScriptWithLanguageServer`
	`49`	`+ typescript?: boolean \| OptionsTypeScriptWithTypes`
`50`	`50`
`51`	`51`	`/**`
`52`	`52`	`* Enable test support.`