feat: enabled `experimentalImplicitWrapComponentOptionsWithDefineComp…

…onent` by default for `lang="js"` close #1298
vuejs · May 15, 2022 · 7d257ed · 7d257ed
1 parent ef8a061
commit 7d257ed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/extensions/vscode-vue-language-features/schemas/vue-tsconfig.schema.json b/extensions/vscode-vue-language-features/schemas/vue-tsconfig.schema.json
@@ -17,7 +17,11 @@
 					"markdownDescription": "https://github.com/johnsoncodehk/volar/pull/351"
 				},
 				"experimentalImplicitWrapComponentOptionsWithDefineComponent": {
-					"type": "boolean",
+					"enum": [
+						true,
+						false,
+						"onlyJs"
+					],
 					"markdownDescription": "Implicit wrap object literal component options export with `defineComponent()`."
 				},
 				"experimentalTemplateCompilerOptions": {

diff --git a/packages/vue-typescript/src/types.ts b/packages/vue-typescript/src/types.ts
@@ -12,7 +12,7 @@ export interface ITemplateScriptData {
 
 export interface VueCompilerOptions {
 	experimentalCompatMode?: 2 | 3;
-	experimentalImplicitWrapComponentOptionsWithDefineComponent?: boolean;
+	experimentalImplicitWrapComponentOptionsWithDefineComponent?: boolean | 'onlyJs';
 	experimentalTemplateCompilerOptions?: any;
 	experimentalTemplateCompilerOptionsRequirePath?: string;
 	experimentalDisableTemplateSupport?: boolean;

diff --git a/packages/vue-typescript/src/use/useSfcScriptGen.ts b/packages/vue-typescript/src/use/useSfcScriptGen.ts
@@ -46,7 +46,9 @@ export function useSfcScriptGen<T extends 'template' | 'script'>(
 				return bindTexts;
 			},
 			getVueLibraryName(compilerOptions.experimentalCompatMode === 2),
-			!!compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent,
+			(compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent ?? 'onlyJs') === 'onlyJs'
+				? lang.value === 'js' || lang.value === 'jsx'
+				: !!compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent,
 		)
 	);
 	const file = computed(() => {