Skip to content

Commit f6f8775

Browse files
committed
feat: improve sort imports & exports
1 parent 48c1f7c commit f6f8775

21 files changed

+68
-60
lines changed

src/cli/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* eslint-disable no-console */
22
import process from 'node:process'
33
import c from 'picocolors'
4-
import { hideBin } from 'yargs/helpers'
54
import yargs from 'yargs'
6-
import { run } from './run'
5+
import { hideBin } from 'yargs/helpers'
76
import { CROSS, version } from './constants'
7+
import { run } from './run'
88

99
function header() {
1010
console.log(`\n${c.green(`@coderwyd/eslint-config `)}${c.dim(`v${version}`)}`)

src/cli/run.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ import fs from 'node:fs'
33
import fsp from 'node:fs/promises'
44
import path from 'node:path'
55
import process from 'node:process'
6-
import prompts from 'prompts'
7-
import c from 'picocolors'
8-
96
// @ts-expect-error missing types
107
import parse from 'parse-gitignore'
8+
import c from 'picocolors'
9+
10+
import prompts from 'prompts'
1111
import {
1212
ARROW,
1313
CHECK,
14-
WARN,
1514
eslintVersion,
1615
version,
1716
vscodeSettingsString,
17+
WARN,
1818
} from './constants'
1919
import { isGitClean } from './utils'
2020

src/configs/command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import createCommand from 'eslint-plugin-command/config'
22
import type { TypedFlatConfigItem } from '../types'
33

4-
export async function command(): Promise<TypedFlatConfigItem[]> {
4+
export function command(): TypedFlatConfigItem[] {
55
return [
66
{
77
...createCommand(),

src/configs/comments.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { pluginComments } from '../plugins'
22
import type { TypedFlatConfigItem } from '../types'
33

4-
export async function comments(): Promise<TypedFlatConfigItem[]> {
4+
export function comments(): TypedFlatConfigItem[] {
55
return [
66
{
77
name: 'coderwyd/eslint-comments/rules',

src/configs/formatter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import {
1010
GLOB_YAML,
1111
} from '../constants/glob'
1212
import { ensurePackages, interopDefault, parserPlain } from '../shared'
13-
import { StylisticConfigDefaults } from './stylistic'
1413
import type {
1514
OptionsFormatters,
1615
PartialPrettierExtendedOptions,
1716
PrettierParser,
1817
StylisticConfig,
1918
TypedFlatConfigItem,
2019
} from '../types'
20+
import { StylisticConfigDefaults } from './stylistic'
2121

2222
export async function formatter(
2323
options: OptionsFormatters | true = {},

src/configs/ignores.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { GLOB_EXCLUDE } from '../constants/glob'
22
import type { TypedFlatConfigItem } from '../types'
33

4-
export async function ignores(): Promise<TypedFlatConfigItem[]> {
4+
export function ignores(): TypedFlatConfigItem[] {
55
return [
66
{
77
ignores: GLOB_EXCLUDE,

src/configs/imports.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { pluginAntfu, pluginImport } from '../plugins'
21
import { GLOB_SRC_EXT } from '../constants/glob'
2+
import { pluginAntfu, pluginImport } from '../plugins'
33
import type { OptionsStylistic, TypedFlatConfigItem } from '../types'
44

5-
export async function imports(
5+
export function imports(
66
options: OptionsStylistic = {},
7-
): Promise<TypedFlatConfigItem[]> {
7+
): TypedFlatConfigItem[] {
88
const { stylistic = true } = options
99
return [
1010
{
@@ -24,23 +24,6 @@ export async function imports(
2424
'import/no-named-default': 'error',
2525
'import/no-self-import': 'error',
2626
'import/no-webpack-loader-syntax': 'error',
27-
'import/order': [
28-
'error',
29-
{
30-
groups: [
31-
'builtin',
32-
'external',
33-
'internal',
34-
'parent',
35-
'sibling',
36-
'index',
37-
'object',
38-
'type',
39-
],
40-
pathGroups: [{ group: 'internal', pattern: '{{@,~}/,#}**' }],
41-
pathGroupsExcludedImportTypes: ['type'],
42-
},
43-
],
4427

4528
...(stylistic
4629
? {

src/configs/javascript.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import globals from 'globals'
2-
import { pluginUnusedImports } from '../plugins'
32
import { GLOB_SRC, GLOB_SRC_EXT } from '../constants/glob'
3+
import { pluginUnusedImports } from '../plugins'
44
import type {
55
OptionsIsInEditor,
66
OptionsOverrides,
77
TypedFlatConfigItem,
88
} from '../types'
99

10-
export async function javascript(
10+
export function javascript(
1111
options: OptionsIsInEditor & OptionsOverrides = {},
12-
): Promise<TypedFlatConfigItem[]> {
12+
): TypedFlatConfigItem[] {
1313
const { isInEditor = false, overrides = {} } = options
1414

1515
return [
@@ -218,16 +218,8 @@ export async function javascript(
218218
'prefer-rest-params': 'error',
219219
'prefer-spread': 'error',
220220
'prefer-template': 'error',
221-
'sort-imports': [
222-
'error',
223-
{
224-
allowSeparatedGroups: false,
225-
ignoreCase: false,
226-
ignoreDeclarationSort: true,
227-
ignoreMemberSort: false,
228-
memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
229-
},
230-
],
221+
'require-await': 'error',
222+
'require-yield': 'error',
231223

232224
'symbol-description': 'error',
233225
'unicode-bom': ['error', 'never'],

src/configs/jsx.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { GLOB_JSX, GLOB_TSX } from '../constants/glob'
22
import type { TypedFlatConfigItem } from '../types'
33

4-
export async function jsx(): Promise<TypedFlatConfigItem[]> {
4+
export function jsx(): TypedFlatConfigItem[] {
55
return [
66
{
77
files: [GLOB_JSX, GLOB_TSX],

src/configs/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { pluginNode } from '../plugins'
22
import type { TypedFlatConfigItem } from '../types'
33

4-
export async function node(): Promise<TypedFlatConfigItem[]> {
4+
export function node(): TypedFlatConfigItem[] {
55
return [
66
{
77
name: 'coderwyd/node/rules',

0 commit comments

Comments
 (0)