Skip to content

Commit

Permalink
fix: improve rules
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Sep 23, 2023
1 parent 7b18a03 commit 9ffcf2b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion eslint.config.js
Expand Up @@ -10,7 +10,7 @@ export default antfu(
],
},
{
files: ['**/eslint-config/src/**/*.ts'],
files: ['src/**/*.ts'],
plugins: {
'@stylistic/migrate': stylisticMigrate,
'sort-keys': sortKeys,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -35,7 +35,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.5",
"eslint-plugin-antfu": "^1.0.0-beta.6",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-i": "^2.28.1",
"eslint-plugin-jsdoc": "^46.8.2",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/configs/javascript.ts
Expand Up @@ -3,6 +3,7 @@ import globals from 'globals'
import { pluginAntfu, pluginUnusedImports } from '../plugins'
import { OFF } from '../flags'
import type { OptionsIsInEditor } from '../types'
import { GLOB_SRC, GLOB_SRC_EXT } from '../globs'

export function javascript(options: OptionsIsInEditor = {}): FlatESLintConfigItem[] {
return [
Expand Down Expand Up @@ -48,7 +49,7 @@ export function javascript(options: OptionsIsInEditor = {}): FlatESLintConfigIte
'max-statements-per-line': ['error', { max: 1 }],
'new-cap': ['error', { capIsNew: false, newIsCap: true, properties: true }],
'new-parens': 'error',
'no-alert': 'warn',
'no-alert': 'error',
'no-array-constructor': 'error',
'no-async-promise-executor': 'error',
'no-caller': 'error',
Expand All @@ -58,7 +59,6 @@ export function javascript(options: OptionsIsInEditor = {}): FlatESLintConfigIte
'no-cond-assign': ['error', 'always'],
'no-console': ['error', { allow: ['warn', 'error'] }],
'no-const-assign': 'error',
'no-constant-condition': 'warn',
'no-control-regex': 'error',
'no-debugger': 'error',
'no-delete-var': 'error',
Expand Down Expand Up @@ -213,7 +213,7 @@ export function javascript(options: OptionsIsInEditor = {}): FlatESLintConfigIte

'unused-imports/no-unused-imports': options.isInEditor ? OFF : 'error',
'unused-imports/no-unused-vars': [
'warn',
'error',
{ args: 'after-used', argsIgnorePattern: '^_', vars: 'all', varsIgnorePattern: '^_' },
],

Expand All @@ -225,7 +225,7 @@ export function javascript(options: OptionsIsInEditor = {}): FlatESLintConfigIte
},
},
{
files: ['scripts/**/*.*', 'cli.*'],
files: [`scripts/${GLOB_SRC}`, `cli.${GLOB_SRC_EXT}`],
rules: {
'no-console': OFF,
},
Expand Down
2 changes: 1 addition & 1 deletion src/configs/stylistic.ts
Expand Up @@ -11,8 +11,8 @@ export const javascriptStylistic: FlatESLintConfigItem[] = [
style: pluginStylisticJs,
},
rules: {
'antfu/if-newline': 'error',
'antfu/consistent-list-newline': 'error',
'antfu/if-newline': 'error',

'comma-dangle': ['error', 'always-multiline'],
'curly': ['error', 'multi-or-nest', 'consistent'],
Expand Down
5 changes: 2 additions & 3 deletions src/configs/typescript.ts
Expand Up @@ -54,8 +54,6 @@ 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,
'ts/consistent-indexed-object-style': OFF,
Expand All @@ -66,13 +64,14 @@ export function typescript(options?: OptionsComponentExts): FlatESLintConfigItem
'ts/explicit-module-boundary-types': OFF,
'ts/naming-convention': OFF,
'ts/no-dupe-class-members': 'error',
'ts/no-dynamic-delete': OFF,
'ts/no-empty-function': OFF,
'ts/no-empty-interface': OFF,
'ts/no-explicit-any': OFF,
'ts/no-extra-parens': ['error', 'functions'],
'ts/no-invalid-this': 'error',
'ts/no-loss-of-precision': 'error',
'ts/no-invalid-void-type': OFF,
'ts/no-loss-of-precision': 'error',
'ts/no-non-null-assertion': OFF,
'ts/no-redeclare': 'error',
'ts/no-require-imports': 'error',
Expand Down
7 changes: 3 additions & 4 deletions src/configs/vue.ts
Expand Up @@ -29,6 +29,8 @@ export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[]
...pluginVue.configs['vue3-strongly-recommended'].rules as any,
...pluginVue.configs['vue3-recommended'].rules as any,

'node/prefer-global/process': OFF,

'vue/array-bracket-spacing': ['error', 'never'],
'vue/arrow-spacing': ['error', { after: true, before: true }],
'vue/block-order': ['error', {
Expand All @@ -42,8 +44,8 @@ export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[]
'vue/brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
'vue/comma-dangle': ['error', 'always-multiline'],
'vue/comma-spacing': ['error', { after: true, before: false }],
'vue/comma-style': ['error', 'last'],

'vue/comma-style': ['error', 'last'],
'vue/component-name-in-template-casing': ['error', 'PascalCase'],
'vue/component-options-name-casing': ['error', 'PascalCase'],
'vue/custom-event-name-casing': ['error', 'camelCase'],
Expand All @@ -60,7 +62,6 @@ export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[]
'vue/keyword-spacing': ['error', { after: true, before: true }],
'vue/max-attributes-per-line': OFF,
'vue/multi-word-component-names': OFF,
'vue/no-constant-condition': 'warn',
'vue/no-dupe-keys': OFF,
'vue/no-empty-pattern': 'error',
'vue/no-extra-parens': ['error', 'functions'],
Expand All @@ -73,8 +74,6 @@ export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[]
'WithStatement',
],
'vue/no-restricted-v-bind': ['error', '/^v-/'],

// reactivity transform
'vue/no-setup-props-reactivity-loss': OFF,
'vue/no-sparse-arrays': 'error',
'vue/no-unused-refs': 'error',
Expand Down

0 comments on commit 9ffcf2b

Please sign in to comment.