fix: ignore css module type-checking on vue-tsc

close #1089
vuejs · Mar 21, 2022 · c10295f · c10295f
1 parent ee58d35
commit c10295f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/packages/typescript-vue-plugin/src/index.ts b/packages/typescript-vue-plugin/src/index.ts
@@ -27,6 +27,7 @@ const init: ts.server.PluginModuleFactory = (modules) => {
 			const tsRuntime = vue.createTypeScriptRuntime({
 				typescript: ts,
 				vueCompilerOptions,
+				baseCssModuleType: 'any',
 				getCssClasses: () => ({}),
 				getCssVBindRanges: () => [],
 				vueLsHost: proxyHost.host,

diff --git a/packages/vue-language-service/src/documentService.ts b/packages/vue-language-service/src/documentService.ts
@@ -154,6 +154,7 @@ export function getDocumentService(
 			vueTsPlugins,
 			{},
 			context.typescript,
+			'Record<string, string>',
 			stylesheetExtra.getCssVBindRanges,
 			stylesheetExtra.getCssClasses,
 		);

diff --git a/packages/vue-language-service/src/languageFuatures/rename.ts b/packages/vue-language-service/src/languageFuatures/rename.ts
@@ -4,7 +4,6 @@ import { languageFeatureWorker } from '../utils/featureWorkers';
 import * as dedupe from '../utils/dedupe';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { VueDocuments } from '../vueDocuments';
-import { EmbeddedFileMappingData } from '@volar/vue-code-gen';
 
 export function register(context: LanguageServiceRuntimeContext) {
 

diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts
@@ -99,6 +99,7 @@ export function createLanguageService(
 	const tsRuntime = createTypeScriptRuntime({
 		typescript: ts,
 		vueCompilerOptions,
+		baseCssModuleType: 'Record<string, string>',
 		getCssClasses: ef => stylesheetExtra.getCssClasses(ef),
 		getCssVBindRanges: ef => stylesheetExtra.getCssVBindRanges(ef),
 		vueLsHost: vueLsHost,

diff --git a/packages/vue-tsc/src/proxy.ts b/packages/vue-tsc/src/proxy.ts
@@ -39,6 +39,7 @@ export function createProgramProxy(
 	};
 	const tsRuntime = createTypeScriptRuntime({
 		typescript: ts,
+		baseCssModuleType: 'any',
 		getCssClasses: () => ({}),
 		getCssVBindRanges: () => [],
 		vueCompilerOptions,

diff --git a/packages/vue-typescript/src/typescriptRuntime.ts b/packages/vue-typescript/src/typescriptRuntime.ts
@@ -22,6 +22,7 @@ export type TypeScriptRuntime = ReturnType<typeof createTypeScriptRuntime>;
 export function createTypeScriptRuntime(options: {
     typescript: typeof import('typescript/lib/tsserverlibrary'),
     vueCompilerOptions: VueCompilerOptions,
+    baseCssModuleType: string,
     getCssVBindRanges: (cssEmbeddeFile: EmbeddedFile) => TextRange[],
     getCssClasses: (cssEmbeddeFile: EmbeddedFile) => Record<string, TextRange[]>,
     vueLsHost: LanguageServiceHost,
@@ -320,6 +321,7 @@ export function createTypeScriptRuntime(options: {
                     plugins,
                     options.vueCompilerOptions,
                     options.typescript,
+                    options.baseCssModuleType,
                     options.getCssVBindRanges,
                     options.getCssClasses,
                 ));

diff --git a/packages/vue-typescript/src/use/useSfcTemplateScript.ts b/packages/vue-typescript/src/use/useSfcTemplateScript.ts
@@ -29,6 +29,7 @@ export function useSfcTemplateScript(
 	sfcStyles: ReturnType<(typeof import('./useSfcStyles'))['useSfcStyles']>['files'],
 	scriptLang: Ref<string>,
 	compilerOptions: VueCompilerOptions,
+	baseCssModuleType: string,
 	getCssVBindRanges: (cssEmbeddeFile: EmbeddedFile) => TextRange[],
 	getCssClasses: (cssEmbeddeFile: EmbeddedFile) => Record<string, TextRange[]>,
 ) {
@@ -97,7 +98,7 @@ export function useSfcTemplateScript(
 		const cssModuleMappingsArr: ReturnType<typeof writeCssClassProperties>[] = [];
 		for (const moduleName in cssModuleClasses.value) {
 			const moduleClasses = cssModuleClasses.value[moduleName];
-			codeGen.addText(`declare var ${moduleName}: Record<string, string> & {\n`);
+			codeGen.addText(`declare var ${moduleName}: ${baseCssModuleType} & {\n`);
 			cssModuleMappingsArr.push(writeCssClassProperties(moduleClasses, true, 'string', false));
 			codeGen.addText('};\n');
 		}

diff --git a/packages/vue-typescript/src/vueFile.ts b/packages/vue-typescript/src/vueFile.ts
@@ -79,6 +79,7 @@ export function createVueFile(
 	plugins: VueLanguagePlugin[],
 	compilerOptions: VueCompilerOptions,
 	ts: typeof import('typescript/lib/tsserverlibrary'),
+	baseCssModuleType: string,
 	getCssVBindRanges: (cssEmbeddeFile: EmbeddedFile) => TextRange[],
 	getCssClasses: (cssEmbeddeFile: EmbeddedFile) => Record<string, TextRange[]>,
 ) {
@@ -210,6 +211,7 @@ export function createVueFile(
 		sfcStyles.files,
 		sfcScriptForScriptLs.lang,
 		compilerOptions,
+		baseCssModuleType,
 		getCssVBindRanges,
 		getCssClasses,
 	);