Skip to content

Commit 4bd1531

Browse files
antfuantfu
committed
chore(lint): sort for imports (#8113)
1 parent 1c2aef0 commit 4bd1531

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+589
-360
lines changed

‎.eslintrc.cjs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module.exports = defineConfig({
88
'plugin:node/recommended',
99
'plugin:@typescript-eslint/recommended'
1010
],
11+
plugins: ['import'],
1112
parser: '@typescript-eslint/parser',
1213
parserOptions: {
1314
sourceType: 'module',
@@ -93,6 +94,18 @@ module.exports = defineConfig({
9394
'@typescript-eslint/consistent-type-imports': [
9495
'error',
9596
{ prefer: 'type-imports' }
97+
],
98+
99+
'import/order': 'error',
100+
'sort-imports': [
101+
'error',
102+
{
103+
ignoreCase: false,
104+
ignoreDeclarationSort: true,
105+
ignoreMemberSort: false,
106+
memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
107+
allowSeparatedGroups: false
108+
}
96109
]
97110
},
98111
overrides: [

‎package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"esbuild": "^0.14.27",
4848
"eslint": "^8.14.0",
4949
"eslint-define-config": "^1.4.0",
50+
"eslint-plugin-import": "^2.26.0",
5051
"eslint-plugin-node": "^11.1.0",
5152
"execa": "^5.1.1",
5253
"fs-extra": "^10.1.0",
@@ -79,10 +80,13 @@
7980
"prettier --write --ignore-unknown"
8081
],
8182
"packages/*/{src,types}/**/*.ts": [
82-
"eslint --ext .ts"
83+
"eslint --fix"
8384
],
8485
"packages/**/*.d.ts": [
85-
"eslint --ext .ts"
86+
"eslint --fix"
87+
],
88+
"playground/**/__tests__/**/*.ts": [
89+
"eslint --fix"
8690
]
8791
},
8892
"packageManager": "pnpm@6.32.11",

‎packages/plugin-react/src/fast-refresh.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { types as t } from '@babel/core'
21
import fs from 'fs'
32
import path from 'path'
3+
import type { types as t } from '@babel/core'
44

55
export const runtimePublicPath = '/@react-refresh'
66

‎packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type * as babelCore from '@babel/core'
2-
import type { types as t, Visitor } from '@babel/core'
2+
import type { Visitor, types as t } from '@babel/core'
33

44
/**
55
* Replace this:

‎packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import babelRestoreJSX from './babel-restore-jsx'
21
import * as babel from '@babel/core'
2+
import babelRestoreJSX from './babel-restore-jsx'
33

44
function jsx(code: string) {
55
return babel.transform(code, {

‎packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { restoreJSX } from './restore-jsx'
21
import * as babel from '@babel/core'
2+
import { restoreJSX } from './restore-jsx'
33

44
async function jsx(sourceCode: string) {
55
const [ast] = await restoreJSX(babel, sourceCode, 'test.js')

‎packages/plugin-vue/src/handleHotUpdate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import _debug from 'debug'
22
import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc'
3+
import type { HmrContext, ModuleNode } from 'vite'
34
import {
45
createDescriptor,
56
getDescriptor,
67
setPrevDescriptor
78
} from './utils/descriptorCache'
89
import { getResolvedScript, setResolvedScript } from './script'
9-
import type { ModuleNode, HmrContext } from 'vite'
1010
import type { ResolvedOptions } from '.'
1111

1212
const debug = _debug('vite:hmr')

‎packages/plugin-vue/src/main.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import path from 'path'
22
import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc'
3-
import type { ResolvedOptions } from '.'
3+
import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup'
4+
import { normalizePath } from '@rollup/pluginutils'
5+
import type { RawSourceMap } from 'source-map'
6+
import { SourceMapConsumer, SourceMapGenerator } from 'source-map'
7+
import { transformWithEsbuild } from 'vite'
48
import {
59
createDescriptor,
610
getPrevDescriptor,
711
setSrcDescriptor
812
} from './utils/descriptorCache'
9-
import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup'
10-
import { normalizePath } from '@rollup/pluginutils'
11-
import { resolveScript, isUseInlineTemplate } from './script'
13+
import { isUseInlineTemplate, resolveScript } from './script'
1214
import { transformTemplateInMain } from './template'
13-
import { isOnlyTemplateChanged, isEqualBlock } from './handleHotUpdate'
14-
import type { RawSourceMap } from 'source-map'
15-
import { SourceMapConsumer, SourceMapGenerator } from 'source-map'
15+
import { isEqualBlock, isOnlyTemplateChanged } from './handleHotUpdate'
1616
import { createRollupError } from './utils/error'
17-
import { transformWithEsbuild } from 'vite'
1817
import { EXPORT_HELPER_ID } from './helper'
18+
import type { ResolvedOptions } from '.'
1919

2020
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
2121
export async function transformMain(

‎packages/plugin-vue/src/script.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { SFCDescriptor, SFCScriptBlock } from 'vue/compiler-sfc'
2-
import type { ResolvedOptions } from '.'
32
import { resolveTemplateCompilerOptions } from './template'
3+
import type { ResolvedOptions } from '.'
44

55
// ssr and non ssr builds would output different script content
66
const clientCache = new WeakMap<SFCDescriptor, SFCScriptBlock | null>()

‎packages/plugin-vue/src/style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { SFCDescriptor } from 'vue/compiler-sfc'
22
import type { ExistingRawSourceMap, TransformPluginContext } from 'rollup'
3-
import type { ResolvedOptions } from '.'
43
import type { RawSourceMap } from 'source-map'
54
import { formatPostcssSourceMap } from 'vite'
5+
import type { ResolvedOptions } from '.'
66

77
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
88
export async function transformStyle(

‎packages/plugin-vue/src/template.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import path from 'path'
22
import slash from 'slash'
33
import type {
4+
CompilerOptions,
45
SFCDescriptor,
56
SFCTemplateCompileOptions,
6-
SFCTemplateCompileResults,
7-
CompilerOptions
7+
SFCTemplateCompileResults
88
} from 'vue/compiler-sfc'
99
import type { PluginContext, TransformPluginContext } from 'rollup'
10-
import type { ResolvedOptions } from '.'
1110
import { getResolvedScript } from './script'
1211
import { createRollupError } from './utils/error'
12+
import type { ResolvedOptions } from '.'
1313

1414
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
1515
export async function transformTemplateAsModule(

‎packages/vite/src/node/__tests__/build.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { resolveLibFilename } from '../build'
21
import { resolve } from 'path'
2+
import { resolveLibFilename } from '../build'
33

44
describe('resolveLibFilename', () => {
55
test('custom filename function', () => {

‎packages/vite/src/node/__tests__/config.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { InlineConfig } from '..'
2-
import type { UserConfigExport, UserConfig } from '../config'
2+
import type { UserConfig, UserConfigExport } from '../config'
33
import { mergeConfig, resolveConfig, resolveEnvPrefix } from '../config'
44

55
describe('mergeConfig', () => {

‎packages/vite/src/node/__tests__/plugins/css.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { cssUrlRE, cssPlugin, hoistAtRules } from '../../plugins/css'
2-
import { resolveConfig } from '../../config'
31
import fs from 'fs'
42
import path from 'path'
3+
import { cssPlugin, cssUrlRE, hoistAtRules } from '../../plugins/css'
4+
import { resolveConfig } from '../../config'
55

66
describe('search css url function', () => {
77
test('some spaces before it', () => {

‎packages/vite/src/node/__tests__/scan.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { scriptRE, commentRE, importsRE } from '../optimizer/scan'
1+
import { commentRE, importsRE, scriptRE } from '../optimizer/scan'
22
import { multilineCommentsRE, singlelineCommentsRE } from '../utils'
33

44
describe('optimizer-scan:script-test', () => {

‎packages/vite/src/node/build.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
import fs from 'fs'
22
import path from 'path'
33
import colors from 'picocolors'
4-
import type { InlineConfig, ResolvedConfig } from './config'
5-
import { resolveConfig } from './config'
64
import type {
5+
ExternalOption,
6+
ModuleFormat,
7+
OutputOptions,
78
Plugin,
89
RollupBuild,
10+
RollupError,
911
RollupOptions,
10-
RollupWarning,
11-
WarningHandler,
12-
OutputOptions,
1312
RollupOutput,
14-
ExternalOption,
15-
WatcherOptions,
13+
RollupWarning,
1614
RollupWatcher,
17-
RollupError,
18-
ModuleFormat
15+
WarningHandler,
16+
WatcherOptions
1917
} from 'rollup'
2018
import type Rollup from 'rollup'
21-
import { buildReporterPlugin } from './plugins/reporter'
22-
import { buildEsbuildPlugin } from './plugins/esbuild'
23-
import { terserPlugin } from './plugins/terser'
2419
import type { Terser } from 'types/terser'
25-
import { copyDir, emptyDir, lookupFile, normalizePath } from './utils'
26-
import { manifestPlugin } from './plugins/manifest'
2720
import commonjsPlugin from '@rollup/plugin-commonjs'
2821
import type { RollupCommonJSOptions } from 'types/commonjs'
2922
import dynamicImportVars from '@rollup/plugin-dynamic-import-vars'
3023
import type { RollupDynamicImportVarsOptions } from 'types/dynamicImportVars'
31-
import type { Logger } from './logger'
3224
import type { TransformOptions } from 'esbuild'
25+
import type { InlineConfig, ResolvedConfig } from './config'
26+
import { resolveConfig } from './config'
27+
import { buildReporterPlugin } from './plugins/reporter'
28+
import { buildEsbuildPlugin } from './plugins/esbuild'
29+
import { terserPlugin } from './plugins/terser'
30+
import { copyDir, emptyDir, lookupFile, normalizePath } from './utils'
31+
import { manifestPlugin } from './plugins/manifest'
32+
import type { Logger } from './logger'
3333
import { dataURIPlugin } from './plugins/dataUri'
3434
import { buildImportAnalysisPlugin } from './plugins/importAnalysisBuild'
3535
import { resolveSSRExternal, shouldExternalizeForSSR } from './ssr/ssrExternal'
3636
import { ssrManifestPlugin } from './ssr/ssrManifestPlugin'
3737
import type { DepOptimizationMetadata } from './optimizer'
38-
import { getDepsCacheDir, findKnownImports } from './optimizer'
38+
import { findKnownImports, getDepsCacheDir } from './optimizer'
3939
import { assetImportMetaUrlPlugin } from './plugins/assetImportMetaUrl'
4040
import { loadFallbackPlugin } from './plugins/loadFallback'
4141
import { watchPackageDataPlugin } from './packages'

‎packages/vite/src/node/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { performance } from 'perf_hooks'
12
import { cac } from 'cac'
23
import colors from 'picocolors'
3-
import { performance } from 'perf_hooks'
44
import type { BuildOptions } from './build'
55
import type { ServerOptions } from './server'
66
import type { LogLevel } from './logger'

‎packages/vite/src/node/config.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
import fs from 'fs'
22
import path from 'path'
3+
import { parse as parseUrl, pathToFileURL } from 'url'
4+
import { performance } from 'perf_hooks'
5+
import colors from 'picocolors'
6+
import dotenv from 'dotenv'
7+
import dotenvExpand from 'dotenv-expand'
8+
import type { Alias, AliasOptions } from 'types/alias'
9+
import { createFilter } from '@rollup/pluginutils'
10+
import aliasPlugin from '@rollup/plugin-alias'
11+
import { build } from 'esbuild'
12+
import type { RollupOptions } from 'rollup'
313
import type { Plugin } from './plugin'
414
import type { BuildOptions } from './build'
515
import { resolveBuildOptions } from './build'
616
import type { ResolvedServerOptions, ServerOptions } from './server'
717
import { resolveServerOptions } from './server'
8-
import type { ResolvedPreviewOptions, PreviewOptions } from './preview'
18+
import type { PreviewOptions, ResolvedPreviewOptions } from './preview'
919
import { resolvePreviewOptions } from './preview'
1020
import type { CSSOptions } from './plugins/css'
1121
import {
1222
arraify,
1323
createDebugger,
24+
dynamicImport,
1425
isExternalUrl,
1526
isObject,
1627
lookupFile,
17-
normalizePath,
18-
dynamicImport
28+
normalizePath
1929
} from './utils'
2030
import { resolvePlugins } from './plugins'
21-
import colors from 'picocolors'
2231
import type { ESBuildOptions } from './plugins/esbuild'
23-
import dotenv from 'dotenv'
24-
import dotenvExpand from 'dotenv-expand'
25-
import type { Alias, AliasOptions } from 'types/alias'
26-
import { CLIENT_ENTRY, ENV_ENTRY, DEFAULT_ASSETS_RE } from './constants'
32+
import { CLIENT_ENTRY, DEFAULT_ASSETS_RE, ENV_ENTRY } from './constants'
2733
import type { InternalResolveOptions, ResolveOptions } from './plugins/resolve'
2834
import { resolvePlugin } from './plugins/resolve'
29-
import type { Logger, LogLevel } from './logger'
35+
import type { LogLevel, Logger } from './logger'
3036
import { createLogger } from './logger'
3137
import type { DepOptimizationOptions } from './optimizer'
32-
import { createFilter } from '@rollup/pluginutils'
33-
import type { ResolvedBuildOptions } from '.'
34-
import { parse as parseUrl, pathToFileURL } from 'url'
3538
import type { JsonOptions } from './plugins/json'
3639
import type { PluginContainer } from './server/pluginContainer'
3740
import { createPluginContainer } from './server/pluginContainer'
38-
import aliasPlugin from '@rollup/plugin-alias'
39-
import { build } from 'esbuild'
40-
import { performance } from 'perf_hooks'
4141
import type { PackageCache } from './packages'
42-
import type { RollupOptions } from 'rollup'
42+
import type { ResolvedBuildOptions } from '.'
4343

4444
const debug = createDebugger('vite:config')
4545

‎packages/vite/src/node/http.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import fs, { promises as fsp } from 'fs'
22
import path from 'path'
33
import type {
4-
OutgoingHttpHeaders as HttpServerHeaders,
5-
Server as HttpServer
4+
Server as HttpServer,
5+
OutgoingHttpHeaders as HttpServerHeaders
66
} from 'http'
77
import type { ServerOptions as HttpsServerOptions } from 'https'
8+
import type { Connect } from 'types/connect'
89
import { isObject } from './utils'
910
import type { ProxyOptions } from './server/middlewares/proxy'
10-
import type { Connect } from 'types/connect'
1111
import type { Logger } from './logger'
1212

1313
export interface CommonServerOptions {

‎packages/vite/src/node/importGlob.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ import path from 'path'
22
import { promises as fsp } from 'fs'
33
import glob from 'fast-glob'
44
import JSON5 from 'json5'
5+
import type { RollupError } from 'rollup'
6+
import colors from 'picocolors'
57
import {
68
isModernFlag,
7-
preloadMethod,
8-
preloadMarker
9+
preloadMarker,
10+
preloadMethod
911
} from './plugins/importAnalysisBuild'
1012
import { isCSSRequest } from './plugins/css'
1113
import {
14+
blankReplacer,
1215
cleanUrl,
13-
singlelineCommentsRE,
1416
multilineCommentsRE,
15-
blankReplacer,
16-
normalizePath
17+
normalizePath,
18+
singlelineCommentsRE
1719
} from './utils'
18-
import type { RollupError } from 'rollup'
1920
import type { Logger } from '.'
20-
import colors from 'picocolors'
2121

2222
interface GlobParams {
2323
base: string

‎packages/vite/src/node/logger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/* eslint no-console: 0 */
22

3-
import colors from 'picocolors'
43
import type { AddressInfo, Server } from 'net'
54
import os from 'os'
65
import readline from 'readline'
6+
import colors from 'picocolors'
77
import type { RollupError } from 'rollup'
8-
import type { ResolvedConfig } from '.'
98
import type { CommonServerOptions } from './http'
109
import type { Hostname } from './utils'
1110
import { resolveHostname } from './utils'
11+
import type { ResolvedConfig } from '.'
1212

1313
export type LogType = 'error' | 'warn' | 'info'
1414
export type LogLevel = LogType | 'silent'

0 commit comments

Comments
 (0)