chore(language-core): only generate __typeProps, __typeEmits for …

…Vue 3.5
vuejs · Apr 27, 2024 · 66bdccc · 66bdccc
1 parent a27caa1
commit 66bdccc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/language-core/lib/codegen/script/component.ts b/packages/language-core/lib/codegen/script/component.ts
@@ -31,7 +31,7 @@ export function* generateComponent(
 	yield `}${endOfLine}`;
 	yield `},${newLine}`;
 	if (!ctx.bypassDefineComponent) {
-		yield* generateScriptSetupOptions(ctx, scriptSetup, scriptSetupRanges);
+		yield* generateScriptSetupOptions(options, ctx, scriptSetup, scriptSetupRanges);
 	}
 	if (options.sfc.script && options.scriptRanges) {
 		yield* generateScriptOptions(options.sfc.script, options.scriptRanges);
@@ -62,6 +62,7 @@ export function* generateScriptOptions(
 }
 
 export function* generateScriptSetupOptions(
+	options: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 	scriptSetup: NonNullable<Sfc['scriptSetup']>,
 	scriptSetupRanges: ScriptSetupRanges,
@@ -113,11 +114,13 @@ export function* generateScriptSetupOptions(
 		yield `>),${newLine}`;
 	}
 
-	// https://github.com/vuejs/core/pull/10801
-	if (scriptSetupRanges.props.define?.typeArg) {
-		yield `__typeProps: typeof __VLS_typeProps,${newLine}`;
-	}
-	if (scriptSetupRanges.emits.define) {
-		yield `__typeEmits: typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'},${newLine}`;
+	if (options.vueCompilerOptions.target >= 3.5) {
+		// https://github.com/vuejs/core/pull/10801
+		if (scriptSetupRanges.props.define?.typeArg) {
+			yield `__typeProps: typeof __VLS_typeProps,${newLine}`;
+		}
+		if (scriptSetupRanges.emits.define?.typeArg) {
+			yield `__typeEmits: typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'},${newLine}`;
+		}
 	}
 }
diff --git a/packages/language-core/lib/codegen/script/internalComponent.ts b/packages/language-core/lib/codegen/script/internalComponent.ts
@@ -48,7 +48,7 @@ export function* generateInternalComponent(
 		yield `}${endOfLine}`; // return {
 		yield `},${newLine}`; // setup() {
 		if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
-			yield* generateScriptSetupOptions(ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
+			yield* generateScriptSetupOptions(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
 		}
 		if (options.sfc.script && options.scriptRanges) {
 			yield* generateScriptOptions(options.sfc.script, options.scriptRanges);

diff --git a/packages/language-core/schemas/vue-tsconfig.schema.json b/packages/language-core/schemas/vue-tsconfig.schema.json
@@ -11,7 +11,8 @@
 						2,
 						2.7,
 						3,
-						3.3
+						3.3,
+						3.5
 					],
 					"markdownDescription": "Target version of Vue."
 				},
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,8 @@ @@
 ,
 .7,
 ,
-.3
+.3,
+.5
     					],
     					"markdownDescription": "Target version of Vue."
     				},
@@ Expand Down @@