fix: script block less component virtual ext should not be .js

close #1452, clsoe #1455, close #1417
vuejs · Jun 16, 2022 · 8e4324a · 8e4324a
1 parent 714fd49
commit 8e4324a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/packages/vue-test-workspace/tsconfig.json b/packages/vue-test-workspace/tsconfig.json
@@ -5,8 +5,6 @@
 			"dom"
 		],
 		"strict": true,
-		"allowJs": true,
-		"checkJs": true,
 		"noUncheckedIndexedAccess": true,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,

diff --git a/packages/vue-test-workspace/typeChecks/no_script_block.vue b/packages/vue-test-workspace/typeChecks/no_script_block.vue
@@ -0,0 +1,3 @@
+<!-- should no error even no set allowJs -->
+<!-- https://github.com/johnsoncodehk/volar/issues/1452 -->
+<template></template>
diff --git a/packages/vue-typescript/src/plugins/petite-vue-script.ts b/packages/vue-typescript/src/plugins/petite-vue-script.ts
@@ -58,8 +58,8 @@ export default function (
 					codeGen.addText('{}');
 				}
 				codeGen.addText(';\n');
-				codeGen.addText(`const __VLS_ctx = (await import('vue')).defineComponent({});\n`);
-				codeGen.addText(`declare const __VLS_export: new () => typeof __VLS_scope & import('./__VLS_types').PickNotAny<InstanceType<typeof __VLS_ctx>, {}>;\n`);
+				codeGen.addText(`const __VLS_component = (await import('vue')).defineComponent({});\n`);
+				codeGen.addText(`declare const __VLS_export: new () => typeof __VLS_scope & import('./__VLS_types').PickNotAny<InstanceType<typeof __VLS_component>, {}>;\n`);
 				codeGen.addText('export default __VLS_export;\n');
 
 				const file: EmbeddedFile = {

diff --git a/packages/vue-typescript/src/plugins/vue-typescript-template.ts b/packages/vue-typescript/src/plugins/vue-typescript-template.ts
@@ -65,7 +65,7 @@ export default function (
 
 				writeImportTypes();
 
-				tsxCodeGen.addText(`declare var __VLS_ctx: ${useGlobalThisTypeInCtx ? 'typeof globalThis &' : ''} __VLS_types.PickNotAny<InstanceType<typeof __VLS_component>, {}> & {\n`);
+				tsxCodeGen.addText(`declare var __VLS_ctx: ${useGlobalThisTypeInCtx ? 'typeof globalThis &' : ''} InstanceType<__VLS_types.PickNotAny<typeof __VLS_component, new () => {}>> & {\n`);
 				/* CSS Module */
 				for (const cssModule of cssModuleClasses.value) {
 					tsxCodeGen.addText(`${cssModule.style.module}: Record<string, string>`);

diff --git a/packages/vue-typescript/src/sourceFile.ts b/packages/vue-typescript/src/sourceFile.ts
@@ -219,7 +219,7 @@ export function createSourceFile(
 			: undefined
 	);
 	const scriptLang = computed(() => {
-		return !sfc.script && !sfc.scriptSetup ? 'js'
+		return !sfc.script && !sfc.scriptSetup ? 'ts'
 			: sfc.scriptSetup && sfc.scriptSetup.lang !== 'js' ? sfc.scriptSetup.lang
 				: sfc.script && sfc.script.lang !== 'js' ? sfc.script.lang
 					: 'js';