Skip to content

Commit 5626ebc

Browse files
committed
chore: enable @typescript-eslint/consistent-type-imports rule
1 parent cecf83c commit 5626ebc

36 files changed

+44
-40
lines changed

extensions/vscode/src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineConfigObject } from 'reactive-vscode';
2-
import { NestedScopedConfigs, scopedConfigs } from './generated-meta';
2+
import { type NestedScopedConfigs, scopedConfigs } from './generated-meta';
33

44
export const config = defineConfigObject<NestedScopedConfigs>(
55
scopedConfigs.scope,

extensions/vscode/src/features/doctor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseLanguageClient, ExecuteCommandParams, ExecuteCommandRequest, getTsdk } from '@volar/vscode';
1+
import { type BaseLanguageClient, type ExecuteCommandParams, ExecuteCommandRequest, getTsdk } from '@volar/vscode';
22
import type { SFCParseResult } from '@vue/language-server';
33
import { commands } from '@vue/language-server/lib/types';
44
import { executeCommand, extensionContext, useActiveTextEditor, useCommand, useDisposable, useEventEmitter, useStatusBarItem, watchEffect } from 'reactive-vscode';

extensions/vscode/src/features/nameCasing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseLanguageClient, ExecuteCommandParams, ExecuteCommandRequest, TextEdit } from '@volar/vscode';
1+
import { type BaseLanguageClient, type ExecuteCommandParams, ExecuteCommandRequest, type TextEdit } from '@volar/vscode';
22
import { quickPick } from '@volar/vscode/lib/common';
33
import { AttrNameCasing, TagNameCasing, commands } from '@vue/language-server/lib/types';
44
import { reactive, useActiveTextEditor, useCommand, useDisposable, watch, watchEffect } from 'reactive-vscode';

extensions/vscode/src/features/splitEditors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ExecuteCommandParams, ExecuteCommandRequest, type BaseLanguageClient } from '@volar/vscode';
1+
import { ExecuteCommandRequest, type BaseLanguageClient, type ExecuteCommandParams } from '@volar/vscode';
22
import type { SFCParseResult } from '@vue/language-server';
33
import { commands } from '@vue/language-server/lib/types';
44
import { executeCommand, useActiveTextEditor, useCommand } from 'reactive-vscode';

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"release:next-vue": "cd ./extensions/vscode && pnpm run release:next",
1414
"test": "vitest run",
1515
"test:update": "vitest run --update",
16-
"lint": "tsslint --projects {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
16+
"lint": "tsslint --project {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
1717
"lint:fix": "pnpm run lint -- --fix --vscode-settings .vscode/settings.json",
1818
"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter"
1919
},

packages/component-meta/lib/base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TypeScriptProjectHost, createLanguageServiceHost, resolveFileLanguageId } from '@volar/typescript';
1+
import { createLanguageServiceHost, resolveFileLanguageId, type TypeScriptProjectHost } from '@volar/typescript';
22
import * as vue from '@vue/language-core';
33
import { posix as path } from 'path-browserify';
44
import type * as ts from 'typescript';

packages/component-meta/tests/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from 'node:path';
22
import { describe, expect, test } from 'vitest';
3-
import { ComponentMetaChecker, createChecker, createCheckerByJson, MetaCheckerOptions, TypeMeta } from '..';
3+
import { type ComponentMetaChecker, createChecker, createCheckerByJson, type MetaCheckerOptions, TypeMeta } from '..';
44

55
const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describe(`vue-component-meta ${withTsconfig ? 'with tsconfig' : 'without tsconfig'}`, () => {
66

packages/language-core/lib/codegen/localTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type * as ts from 'typescript';
2-
import { VueCompilerOptions } from '../types';
2+
import type { VueCompilerOptions } from '../types';
33
import { getSlotsPropertyName } from '../utils/shared';
44
import { endOfLine } from './utils';
55

packages/language-core/lib/codegen/script/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { InlayHintInfo } from '../inlayHints';
1+
import type { InlayHintInfo } from '../inlayHints';
22
import { getLocalTypesGenerator } from '../localTypes';
33
import type { ScriptCodegenOptions } from './index';
44

packages/language-core/lib/codegen/script/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { generateGlobalTypes, getGlobalTypesFileName } from '../globalTypes';
88
import type { TemplateCodegenContext } from '../template/context';
99
import { endOfLine, generateSfcBlockSection, newLine } from '../utils';
1010
import { generateComponentSelf } from './componentSelf';
11-
import { createScriptCodegenContext, ScriptCodegenContext } from './context';
11+
import { createScriptCodegenContext, type ScriptCodegenContext } from './context';
1212
import { generateScriptSetup, generateScriptSetupImports } from './scriptSetup';
1313
import { generateSrc } from './src';
1414
import { generateTemplate } from './template';

packages/language-core/lib/codegen/template/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as CompilerDOM from '@vue/compiler-dom';
22
import type { Code, VueCodeInformation } from '../../types';
33
import { codeFeatures } from '../codeFeatures';
4-
import { InlayHintInfo } from '../inlayHints';
4+
import type { InlayHintInfo } from '../inlayHints';
55
import { endOfLine, newLine } from '../utils';
66
import { wrapWith } from '../utils/wrapWith';
77
import type { TemplateCodegenOptions } from './index';

packages/language-core/lib/codegen/template/elementChildren.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as CompilerDOM from '@vue/compiler-dom';
1+
import type * as CompilerDOM from '@vue/compiler-dom';
22
import type { Code } from '../../types';
33
import type { TemplateCodegenContext } from './context';
44
import type { TemplateCodegenOptions } from './index';

packages/language-core/lib/codegen/template/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Code, Sfc, VueCompilerOptions } from '../../types';
44
import { getSlotsPropertyName } from '../../utils/shared';
55
import { endOfLine, newLine } from '../utils';
66
import { wrapWith } from '../utils/wrapWith';
7-
import { TemplateCodegenContext, createTemplateCodegenContext } from './context';
7+
import { createTemplateCodegenContext, type TemplateCodegenContext } from './context';
88
import { generateObjectProperty } from './objectProperty';
99
import { generateStyleScopedClassReferences } from './styleScopedClasses';
1010
import { generateTemplateChild, getVForNode } from './templateChild';

packages/language-core/lib/codegen/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as CompilerDOM from '@vue/compiler-dom';
1+
import type * as CompilerDOM from '@vue/compiler-dom';
22
import type * as ts from 'typescript';
33
import type { Code, SfcBlock, VueCodeInformation } from '../../types';
44
import { getNodeText } from '../../utils/shared';

packages/language-core/lib/languagePlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference types="@volar/typescript" />
22

3-
import { forEachEmbeddedCode, LanguagePlugin } from '@volar/language-core';
3+
import { forEachEmbeddedCode, type LanguagePlugin } from '@volar/language-core';
44
import * as CompilerDOM from '@vue/compiler-dom';
55
import type * as ts from 'typescript';
66
import { createPlugins } from './plugins';

packages/language-core/lib/plugins.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import vueTemplateHtmlPlugin from './plugins/vue-template-html';
1111
import vueTemplateInlineCssPlugin from './plugins/vue-template-inline-css';
1212
import vueTemplateInlineTsPlugin from './plugins/vue-template-inline-ts';
1313
import vueTsx from './plugins/vue-tsx';
14-
import { validVersions, VueLanguagePlugin } from './types';
14+
import { validVersions, type VueLanguagePlugin } from './types';
1515

1616
export * from './plugins/shared';
1717

packages/language-core/lib/plugins/file-md.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { CodeInformation, Mapping, defaultMapperFactory } from '@volar/language-core';
1+
import { type CodeInformation, type Mapping, defaultMapperFactory } from '@volar/language-core';
22
import type { SFCBlock } from '@vue/compiler-sfc';
3-
import { Segment, toString } from 'muggle-string';
3+
import { type Segment, toString } from 'muggle-string';
44
import type { VueLanguagePlugin } from '../types';
55
import { buildMappings } from '../utils/buildMappings';
66
import { parse } from '../utils/parseSfc';

packages/language-server/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { LanguageServer } from '@volar/language-server';
22
import { createLanguageServiceEnvironment } from '@volar/language-server/lib/project/simpleProject';
33
import { createConnection, createServer, loadTsdkByPath } from '@volar/language-server/node';
44
import { createLanguage, createParsedCommandLine, createVueLanguagePlugin, getDefaultCompilerOptions } from '@vue/language-core';
5-
import { createLanguageService, createUriMap, getHybridModeLanguageServicePlugins, LanguageService } from '@vue/language-service';
5+
import { createLanguageService, createUriMap, getHybridModeLanguageServicePlugins, type LanguageService } from '@vue/language-service';
66
import type * as ts from 'typescript';
77
import { URI } from 'vscode-uri';
88
import type { VueInitializationOptions } from './lib/types';

packages/language-server/tests/completions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextDocument } from '@volar/language-server';
1+
import type { TextDocument } from '@volar/language-server';
22
import { afterEach, expect, test } from 'vitest';
33
import { URI } from 'vscode-uri';
44
import { getLanguageServer, testWorkspacePath } from './server.js';

packages/language-server/tests/definitions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextDocument } from '@volar/language-server';
1+
import type { TextDocument } from '@volar/language-server';
22
import { afterEach, expect, test } from 'vitest';
33
import { URI } from 'vscode-uri';
44
import { getLanguageServer, testWorkspacePath } from './server.js';

packages/language-server/tests/inlayHints.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextDocument } from '@volar/language-server';
1+
import type { TextDocument } from '@volar/language-server';
22
import { afterEach, expect, test } from 'vitest';
33
import { URI } from 'vscode-uri';
44
import { getLanguageServer, testWorkspacePath } from './server.js';

packages/language-server/tests/references.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextDocument } from '@volar/language-server';
1+
import type { TextDocument } from '@volar/language-server';
22
import { afterEach, expect, test } from 'vitest';
33
import { URI } from 'vscode-uri';
44
import { getLanguageServer, testWorkspacePath } from './server.js';

packages/language-server/tests/renaming.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TextDocument } from '@volar/language-server';
1+
import type { TextDocument } from '@volar/language-server';
22
import { afterEach, expect, test } from 'vitest';
33
import { URI } from 'vscode-uri';
44
import { getLanguageServer, testWorkspacePath } from './server.js';

packages/language-server/tests/server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { launchServer } from '@typescript/server-harness';
2-
import { ConfigurationRequest, PublishDiagnosticsNotification, TextDocument } from '@volar/language-server';
2+
import { ConfigurationRequest, PublishDiagnosticsNotification, type TextDocument } from '@volar/language-server';
33
import type { LanguageServerHandle } from '@volar/test-utils';
44
import { startLanguageServer } from '@volar/test-utils';
55
import * as path from 'node:path';
66
import { URI } from 'vscode-uri';
7-
import { VueInitializationOptions } from '../lib/types';
7+
import type { VueInitializationOptions } from '../lib/types';
88

99
let serverHandle: LanguageServerHandle | undefined;
1010
let tsserver: import('@typescript/server-harness').Server;

packages/language-service/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { create as createVueSfcPlugin } from './lib/plugins/vue-sfc';
3131
import { create as createVueTemplatePlugin } from './lib/plugins/vue-template';
3232
import { create as createVueTwoslashQueriesPlugin } from './lib/plugins/vue-twoslash-queries';
3333

34-
import { parse, VueCompilerOptions } from '@vue/language-core';
34+
import { parse, type VueCompilerOptions } from '@vue/language-core';
3535
import { proxyLanguageServiceForVue } from '@vue/typescript-plugin/lib/common';
3636
import { collectExtractProps } from '@vue/typescript-plugin/lib/requests/collectExtractProps';
3737
import { getComponentDirectives } from '@vue/typescript-plugin/lib/requests/getComponentDirectives';

packages/language-service/lib/nameCasing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { LanguageServiceContext, ProviderResult, VirtualCode } from '@volar/language-service';
2-
import * as CompilerDOM from '@vue/compiler-dom';
2+
import type * as CompilerDOM from '@vue/compiler-dom';
33
import { forEachElementNode, hyphenateAttr, hyphenateTag, VueVirtualCode } from '@vue/language-core';
44
import { computed } from 'alien-signals';
55
import type * as vscode from 'vscode-languageserver-protocol';

packages/language-service/lib/plugins/css.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { LanguageServicePlugin, VirtualCode } from '@volar/language-service';
22
import { VueVirtualCode } from '@vue/language-core';
33
import { create as baseCreate, type Provide } from 'volar-service-css';
4-
import * as css from 'vscode-css-languageservice';
4+
import type * as css from 'vscode-css-languageservice';
55
import type { TextDocument } from 'vscode-languageserver-textdocument';
66
import { URI } from 'vscode-uri';
77

packages/language-service/lib/plugins/vue-compiler-dom-errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { VueVirtualCode } from '@vue/language-core';
22
import type * as vscode from 'vscode-languageserver-protocol';
33
import type { TextDocument } from 'vscode-languageserver-textdocument';
44
import { URI } from 'vscode-uri';
5-
import { LanguageServicePlugin } from '../types';
5+
import type { LanguageServicePlugin } from '../types';
66

77
export function create(): LanguageServicePlugin {
88
return {

packages/language-service/lib/plugins/vue-complete-define-assignment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { LanguageServicePlugin } from '@volar/language-service';
2-
import { TextRange, tsCodegen, VueVirtualCode } from '@vue/language-core';
2+
import { type TextRange, tsCodegen, VueVirtualCode } from '@vue/language-core';
33
import type * as vscode from 'vscode-languageserver-protocol';
44
import { URI } from 'vscode-uri';
55
import { isTsDocument } from './utils';

packages/language-service/lib/plugins/vue-document-drop.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getUserPreferences } from 'volar-service-typescript/lib/configs/getUser
55
import type * as vscode from 'vscode-languageserver-protocol';
66
import { URI } from 'vscode-uri';
77
import { createAddComponentToOptionEdit, getLastImportNode } from '../plugins/vue-extract-file';
8-
import { LanguageServiceContext, LanguageServicePlugin, TagNameCasing } from '../types';
8+
import { type LanguageServiceContext, type LanguageServicePlugin, TagNameCasing } from '../types';
99

1010
export function create(
1111
ts: typeof import('typescript'),

packages/language-service/lib/plugins/vue-document-links.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { LanguageServicePlugin } from '@volar/language-service';
2-
import { Sfc, VueVirtualCode, tsCodegen } from '@vue/language-core';
2+
import { type Sfc, tsCodegen, VueVirtualCode } from '@vue/language-core';
33
import type * as vscode from 'vscode-languageserver-protocol';
44
import { URI } from 'vscode-uri';
55

packages/language-service/lib/plugins/vue-extract-file.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CreateFile, LanguageServiceContext, LanguageServicePlugin, TextDocumentEdit, TextEdit } from '@volar/language-service';
22
import type { ExpressionNode, TemplateChildNode } from '@vue/compiler-dom';
3-
import { Sfc, VueVirtualCode, tsCodegen } from '@vue/language-core';
3+
import { type Sfc, tsCodegen, VueVirtualCode } from '@vue/language-core';
44
import type * as ts from 'typescript';
55
import type * as vscode from 'vscode-languageserver-protocol';
66
import { URI } from 'vscode-uri';

packages/language-service/lib/plugins/vue-missing-props-hints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type * as vscode from 'vscode-languageserver-protocol';
55
import type { TextDocument } from 'vscode-languageserver-textdocument';
66
import { URI } from 'vscode-uri';
77
import { getNameCasing } from '../nameCasing';
8-
import { AttrNameCasing, LanguageServicePlugin } from '../types';
8+
import { AttrNameCasing, type LanguageServicePlugin } from '../types';
99

1010
export function create(
1111
getTsPluginClient?: (context: LanguageServiceContext) => import('@vue/typescript-plugin/lib/requests').Requests | undefined

packages/language-service/lib/plugins/vue-template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type * as vscode from 'vscode-languageserver-protocol';
99
import type { TextDocument } from 'vscode-languageserver-textdocument';
1010
import { URI, Utils } from 'vscode-uri';
1111
import { getNameCasing } from '../nameCasing';
12-
import { AttrNameCasing, LanguageServicePlugin, TagNameCasing } from '../types';
12+
import { AttrNameCasing, type LanguageServicePlugin, TagNameCasing } from '../types';
1313
import { loadModelModifiersData, loadTemplateData } from './data';
1414

1515
type InternalItemId =

packages/typescript-plugin/lib/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { forEachElementNode, hyphenateTag, Language, VueCompilerOptions, VueVirtualCode } from '@vue/language-core';
1+
import { forEachElementNode, hyphenateTag, type Language, type VueCompilerOptions, VueVirtualCode } from '@vue/language-core';
22
import { capitalize } from '@vue/shared';
33
import type * as ts from 'typescript';
44
import { _getComponentNames } from './requests/getComponentNames';

tsslint.config.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import { defineConfig } from '@tsslint/config';
2-
import { convertConfig } from '@tsslint/eslint';
2+
import { convertRules } from '@tsslint/eslint';
33
import * as path from 'node:path';
4-
import type * as ts from 'typescript';
4+
import type ts from 'typescript';
55

66
export default defineConfig({
77
rules: {
88
semantic: {
9-
...convertConfig({
9+
...await convertRules({
10+
'@typescript-eslint/consistent-type-imports': ['warn', {
11+
disallowTypeAnnotations: false,
12+
fixStyle: 'inline-type-imports',
13+
}],
1014
'@typescript-eslint/no-unnecessary-type-assertion': 'warn',
1115
}),
1216
},

0 commit comments

Comments
 (0)