diff --git a/packages/vue-language-core/src/plugins/vue-typescript-scripts.ts b/packages/vue-language-core/src/plugins/vue-typescript-scripts.ts index 63c48089b..42565c3a0 100644 --- 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',