fix: prefer defineComponent -> Vue.extend

close #1584
vuejs · Aug 6, 2022 · 412e985 · 412e985
1 parent b2efb24
commit 412e985
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/packages/vue-language-core/src/plugins/vue-typescript-scripts.ts b/packages/vue-language-core/src/plugins/vue-typescript-scripts.ts
@@ -26,27 +26,27 @@ export default function (
 			let shimComponentOptionsMode: 'defineComponent' | 'Vue.extend' | false = false;
 
 			if (
-				(compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent ?? 'onlyJs') === 'onlyJs'
+				(compilerOptions.experimentalImplicitWrapComponentOptionsWithVue2Extend ?? 'onlyJs') === 'onlyJs'
 					? lang.value === 'js' || lang.value === 'jsx'
-					: !!compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent
+					: !!compilerOptions.experimentalImplicitWrapComponentOptionsWithVue2Extend
 			) {
-				shimComponentOptionsMode = 'defineComponent';
+				shimComponentOptionsMode = 'Vue.extend';
 			}
 			if (
-				(compilerOptions.experimentalImplicitWrapComponentOptionsWithVue2Extend ?? 'onlyJs') === 'onlyJs'
+				(compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent ?? 'onlyJs') === 'onlyJs'
 					? lang.value === 'js' || lang.value === 'jsx'
-					: !!compilerOptions.experimentalImplicitWrapComponentOptionsWithVue2Extend
+					: !!compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent
 			) {
-				shimComponentOptionsMode = 'Vue.extend';
+				shimComponentOptionsMode = 'defineComponent';
 			}
 
 			// true override 'onlyJs'
-			if (compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent === true) {
-				shimComponentOptionsMode = 'defineComponent';
-			}
 			if (compilerOptions.experimentalImplicitWrapComponentOptionsWithVue2Extend === true) {
 				shimComponentOptionsMode = 'Vue.extend';
 			}
+			if (compilerOptions.experimentalImplicitWrapComponentOptionsWithDefineComponent === true) {
+				shimComponentOptionsMode = 'defineComponent';
+			}
 
 			const codeGen = genScript(
 				i === 0 ? 'script' : 'template',