fix: don't wrap component options to defineComponent

close #780
vuejs · Dec 15, 2021 · d574a18 · d574a18
1 parent c381dd1
commit d574a18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/packages/vscode-vue-languageservice/src/use/useSfcEntryForTemplateLs.ts b/packages/vscode-vue-languageservice/src/use/useSfcEntryForTemplateLs.ts
@@ -35,12 +35,9 @@ export function useSfcEntryForTemplateLs(
 				content += `export { __VLS_component } from './${vueFileName}.__VLS_script';\n`;
 			}
 			else {
-				content += `import __VLS_component_1_ts from './${vueFileName}.${tsScriptFileName}';\n`;
-				content += `import __VLS_component_1 from './${vueFileName}.__VLS_script';\n`;
-				content += `import { __VLS_component as __VLS_component_2_ts } from './${vueFileName}.${tsScriptFileName}';\n`;
-				content += `import { __VLS_component as __VLS_component_2 } from './${vueFileName}.__VLS_script';\n`;
-				content += `declare var __VLS_component_ts: __VLS_types.SelectComponent<typeof __VLS_component_1_ts, typeof __VLS_component_2_ts>;\n`;
-				content += `export declare var __VLS_component: __VLS_types.SelectComponent<typeof __VLS_component_1, typeof __VLS_component_2>;\n`;
+				content += `import __VLS_component_ts from './${vueFileName}.${tsScriptFileName}';\n`;
+				content += `import __VLS_component from './${vueFileName}.__VLS_script';\n`;
+				content += `export { default as __VLS_component } from './${vueFileName}.__VLS_script';\n`;
 			}
 		}
 		else {

diff --git a/packages/vue-code-gen/src/generators/script.ts b/packages/vue-code-gen/src/generators/script.ts
@@ -56,7 +56,7 @@ export function generate(
 		);
 	}
 
-	if (lsType === 'template' || shouldAddExportDefault)
+	if (shouldAddExportDefault)
 		writeExportComponent();
 
 	if (usedTypes.DefinePropsToOptions) {
@@ -208,13 +208,9 @@ export function generate(
 		);
 	}
 	function writeExportComponent() {
-		if (shouldAddExportDefault) {
-			codeGen.addText(`export default (await import('${vueLibName}')).defineComponent({\n`);
-		}
-		else {
-			codeGen.addText(`\n`);
-			codeGen.addText(`export const __VLS_component = (await import('${vueLibName}')).defineComponent({\n`);
-		}
+
+		codeGen.addText(`export default (await import('${vueLibName}')).defineComponent({\n`);
+
 		if (script && scriptRanges?.exportDefault?.args) {
 			const args = scriptRanges.exportDefault.args;
 			codeGen.addText(`...(`);