fix: stylistic overrides

antfu · antfu · commit 6074698314f0 · 2023-09-22T06:28:26.000+08:00
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
     "eslint-define-config": "^1.23.0",
-    "eslint-plugin-antfu": "^1.0.0-beta.1",
+    "eslint-plugin-antfu": "^1.0.0-beta.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-i": "^2.28.1",
     "eslint-plugin-jsdoc": "^46.8.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/configs/markdown.ts b/src/configs/markdown.ts
@@ -46,7 +46,7 @@ export function markdown(options: OptionsComponentExts = {}): FlatESLintConfigIt
         'no-undef': OFF,
         'no-unused-expressions': OFF,
         'no-unused-vars': OFF,
-        
+
         'node/prefer-global/process': OFF,
 
         'ts/comma-dangle': OFF,
diff --git a/src/configs/stylistic.ts b/src/configs/stylistic.ts
@@ -4,7 +4,6 @@ import { pluginStylisticJs, pluginStylisticTs, pluginTs } from '../plugins'
 import { OFF } from '../flags'
 
 const tsPackage = packages.find(i => i.shortId === 'ts')!
-const jsPackage =  packages.find(i => i.shortId === 'js')!
 
 export const javascriptStylistic: FlatESLintConfigItem[] = [
   {
@@ -139,7 +138,7 @@ function stylisticJsToTS(input: Record<string, any>) {
           if (!key.startsWith('style/'))
             return null!
           const basename = key.replace('style/', '')
-          if (jsPackage.rules.find(i => i.name === basename))
+          if (tsPackage.rules.find(i => i.name === basename))
             return [key, OFF]
           return null!
         })
diff --git a/src/configs/typescript.ts b/src/configs/typescript.ts
@@ -54,7 +54,7 @@ export function typescript(options?: OptionsComponentExts): FlatESLintConfigItem
         'no-redeclare': OFF,
         'no-use-before-define': OFF,
         'no-useless-constructor': OFF,
-      
+
         // TS
         'ts/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
         'ts/ban-ts-ignore': OFF,
diff --git a/src/factory.ts b/src/factory.ts
@@ -68,9 +68,9 @@ export function antfu(options: OptionsConfig = {}, ...userConfigs: (FlatESLintCo
   if (options.test ?? true)
     configs.push(test({ isInEditor }))
 
-  if (enableVue) 
-    configs.push(vue({ typescript: !!enableTypeScript })) 
-  
+  if (enableVue)
+    configs.push(vue({ typescript: !!enableTypeScript }))
+
   if (options.jsonc ?? true) {
     configs.push(
       jsonc,
@@ -82,7 +82,7 @@ export function antfu(options: OptionsConfig = {}, ...userConfigs: (FlatESLintCo
   if (options.yaml ?? true)
     configs.push(yml)
 
-  if (options.markdown ?? true) 
+  if (options.markdown ?? true)
     configs.push(markdown({ componentExts }))
 
   return combine(
diff --git a/src/plugins.ts b/src/plugins.ts
@@ -21,4 +21,3 @@ export { default as parserTs } from '@typescript-eslint/parser'
 export { default as parserVue } from 'vue-eslint-parser'
 export { default as parserYml } from 'yaml-eslint-parser'
 export { default as parserJsonc } from 'jsonc-eslint-parser'
-
diff --git a/src/types.ts b/src/types.ts
@@ -73,10 +73,8 @@ export interface OptionsConfig {
    */
   stylistic?: boolean
 
-
   /**
    * Control to disable some rules in editors.
-   * 
    * @default auto-detect based on the process.env
    */
   isInEditor?: boolean
