Merge branch 'master' into perf/drop-internal-component

Author: KazariEX

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.0.3 (2025-07-18)
+
+### Bug Fixes
+
+- fix(language-core): find `node_modules` based on file's directory (#5525) - Thanks to @KazariEX!
+- fix(language-core): do not spread exposed object (#5526) - Thanks to @KazariEX!
+- fix(vscode): prompt manual reload in remote envs (#5530)
+
+### Other Changes
+
+- refactor(tsc): return the result of runTsc (#5517) - Thanks to @escaton!
+
 ## 3.0.2 (2025-07-18)
 
 ### Features
@@ -30,7 +42,7 @@
 - refactor(vscode): add premium feature settings
 - chore: migrate from `minimatch` to `picomatch` (#5499) - Thanks to @KazariEX!
 - chore: update volar to 2.4.19
-  - fix(typescript): skip source file search when `.d.${ext}.ts` file exists (#277)
+  - fix(typescript): skip source file search when `.d.${ext}.ts` file exists (volarjs/volar.js#277)
 - revert: type support of slot children (#5137) (#5514) - Thanks to @KazariEX!
 
 ## 3.0.1 (2025-07-02)

extensions/vscode/index.ts

@@ -18,6 +18,8 @@ import * as vscode from 'vscode';
 import { config } from './lib/config';
 import { activate as activateWelcome } from './lib/welcome';
 
+let needRestart = false;
+
 const incompatibleExtensionIds = [
 	'johnsoncodehk.vscode-typescript-vue-plugin',
 	'Vue.vscode-typescript-vue-plugin',
@@ -64,6 +66,27 @@ export const { activate, deactivate } = defineExtension(async () => {
 
 		nextTick(() => stop());
 
+		if (needRestart) {
+			if (vscode.env.remoteName) {
+				vscode.window.showInformationMessage(
+					'Please restart the extension host to activate Vue support in remote environments.',
+					'Restart Extension Host',
+					'Reload Window',
+				).then(action => {
+					if (action === 'Restart Extension Host') {
+						vscode.commands.executeCommand('workbench.action.restartExtensionHost');
+					}
+					else if (action === 'Reload Window') {
+						vscode.commands.executeCommand('workbench.action.reloadWindow');
+					}
+				});
+			}
+			else {
+				vscode.commands.executeCommand('workbench.action.restartExtensionHost');
+			}
+			return;
+		}
+
 		watch(() => config.server.includeLanguages, async () => {
 			const reload = await vscode.window.showInformationMessage(
 				'Please restart extension host to apply the new language settings.',
@@ -219,7 +242,7 @@ try {
 	}
 
 	if (tsExtension.isActive) {
-		vscode.commands.executeCommand('workbench.action.restartExtensionHost');
+		needRestart = true;
 	}
 }
 catch {}

extensions/vscode/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "volar",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
@@ -466,8 +466,8 @@
 		"@volar/vscode": "2.4.20",
 		"@vscode/vsce": "^3.2.1",
 		"@vue/compiler-sfc": "^3.5.0",
-		"@vue/language-server": "3.0.2",
-		"@vue/typescript-plugin": "3.0.2",
+		"@vue/language-server": "3.0.3",
+		"@vue/typescript-plugin": "3.0.3",
 		"reactive-vscode": "^0.2.9",
 		"rolldown": "1.0.0-beta.8",
 		"semver": "^7.5.4",

lerna.json

@@ -6,5 +6,5 @@
 		"packages/**",
 		"test-workspace"
 	],
-	"version": "3.0.2"
+	"version": "3.0.3"
 }

packages/component-meta/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.20",
-		"@vue/language-core": "3.0.2",
+		"@vue/language-core": "3.0.3",
 		"path-browserify": "^1.0.1"
 	},
 	"peerDependencies": {

packages/component-type-helpers/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-type-helpers",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",

packages/language-core/lib/codegen/codeFeatures.ts

@@ -72,6 +72,26 @@ const raw = {
 		navigation: true,
 		completion: true,
 	},
+	doNotReportTs2339AndTs2551: {
+		verification: {
+			// https://typescript.tv/errors/#ts2339
+			// https://typescript.tv/errors/#ts2551
+			shouldReport: (_source, code) => String(code) !== '2339' && String(code) !== '2551',
+		},
+	},
+	doNotReportTs2353AndTs2561: {
+		verification: {
+			// https://typescript.tv/errors/#ts2353
+			// https://typescript.tv/errors/#ts2561
+			shouldReport: (_source, code) => String(code) !== '2353' && String(code) !== '2561',
+		},
+	},
+	doNotReportTs6133: {
+		verification: {
+			// https://typescript.tv/errors/#ts6133
+			shouldReport: (_source, code) => String(code) !== '6133',
+		},
+	},
 } satisfies Record<string, VueCodeInformation>;
 
 export const codeFeatures = raw as {

packages/language-core/lib/codegen/globalTypes.ts

@@ -1,29 +1,17 @@
 import type { VueCompilerOptions } from '../types';
 import { getSlotsPropertyName } from '../utils/shared';
 
-export function getGlobalTypesFileName({
-	lib,
-	target,
-	checkUnknownProps,
-	checkUnknownEvents,
-	checkUnknownComponents,
-}: VueCompilerOptions) {
+export function getGlobalTypesFileName(options: VueCompilerOptions) {
 	return [
-		lib,
-		target,
-		checkUnknownProps,
-		checkUnknownEvents,
-		checkUnknownComponents,
+		options.lib,
+		options.target,
+		options.checkUnknownProps,
 	].map(v => (typeof v === 'boolean' ? Number(v) : v)).join('_') + '.d.ts';
 }
 
-export function generateGlobalTypes({
-	lib,
-	target,
-	checkUnknownProps,
-	checkUnknownEvents,
-	checkUnknownComponents,
-}: VueCompilerOptions) {
+export function generateGlobalTypes(options: VueCompilerOptions) {
+	const { lib, target, checkUnknownProps } = options;
+
 	const fnPropsType = `(T extends { $props: infer Props } ? Props : {})${
 		checkUnknownProps ? '' : ' & Record<string, unknown>'
 	}`;
@@ -69,7 +57,7 @@ export function generateGlobalTypes({
 		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
 		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
 		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
-		${checkUnknownComponents ? '{}' : '{ [K in N0]: unknown }'};
+		{};
 	type __VLS_FunctionalComponentCtx<T, K> = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny<K, {}>
 		? K extends { __ctx?: infer Ctx } ? NonNullable<Ctx> : never : any
 		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
@@ -80,12 +68,12 @@ export function generateGlobalTypes({
 		: {};
 	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
 		__ctx?: {
-			attrs?: any,
-			slots?: T extends { ${getSlotsPropertyName(target)}: infer Slots } ? Slots : Record<string, any>,
-			emit?: T extends { $emit: infer Emit } ? Emit : {},
-			props?: ${fnPropsType},
-			expose?: (exposed: T) => void,
-		}
+			attrs?: any;
+			slots?: T extends { ${getSlotsPropertyName(target)}: infer Slots } ? Slots : Record<string, any>;
+			emit?: T extends { $emit: infer Emit } ? Emit : {};
+			props?: ${fnPropsType};
+			expose?: (exposed: T) => void;
+		};
 	};
 	type __VLS_IsFunction<T, K> = K extends keyof T
 		? __VLS_IsAny<T[K]> extends false
@@ -94,15 +82,19 @@ export function generateGlobalTypes({
 		: true
 		: false
 		: false;
-	type __VLS_NormalizeComponentEvent<Props, Emits, onEvent extends keyof Props, Event extends keyof Emits, CamelizedEvent extends keyof Emits> = (
-		__VLS_IsFunction<Props, onEvent> extends true
-			? Props
-			: __VLS_IsFunction<Emits, Event> extends true
-				? { [K in onEvent]?: Emits[Event] }
-				: __VLS_IsFunction<Emits, CamelizedEvent> extends true
-					? { [K in onEvent]?: Emits[CamelizedEvent] }
-					: Props
-	)${checkUnknownEvents ? '' : ' & Record<string, unknown>'};
+	type __VLS_NormalizeComponentEvent<
+		Props,
+		Emits,
+		onEvent extends keyof Props,
+		Event extends keyof Emits,
+		CamelizedEvent extends keyof Emits,
+	> = __VLS_IsFunction<Props, onEvent> extends true
+		? Props
+		: __VLS_IsFunction<Emits, Event> extends true
+			? { [K in onEvent]?: Emits[Event] }
+			: __VLS_IsFunction<Emits, CamelizedEvent> extends true
+				? { [K in onEvent]?: Emits[CamelizedEvent] }
+				: Props;
 	// fix https://github.com/vuejs/language-tools/issues/926
 	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
 	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
@@ -178,7 +170,7 @@ export function generateGlobalTypes({
 		: __VLS_FunctionalComponent<{}>;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
 	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T${
-		checkUnknownComponents ? '' : ' & Record<string, unknown>'
+		checkUnknownProps ? '' : ' & Record<string, unknown>'
 	}) => void;
 	function __VLS_asFunctionalSlot<S>(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable<S>;
 	function __VLS_tryAsConstant<const T>(t: T): T;

packages/language-core/lib/codegen/template/element.ts

@@ -150,7 +150,12 @@ export function* generateComponent(
 		yield* generateCanonicalComponentName(
 			node.tag,
 			tagOffsets[0],
-			ctx.codeFeatures.withoutHighlightAndCompletionAndNavigation,
+			ctx.resolveCodeFeatures({
+				...codeFeatures.semanticWithoutHighlight,
+				...options.vueCompilerOptions.checkUnknownComponents
+					? codeFeatures.verification
+					: codeFeatures.doNotReportTs2339AndTs2551,
+			}),
 		);
 		yield `${endOfLine}`;
 
@@ -205,14 +210,7 @@ export function* generateComponent(
 	yield* wrapWith(
 		node.loc.start.offset,
 		node.loc.end.offset,
-		ctx.resolveCodeFeatures({
-			verification: {
-				shouldReport(_source, code) {
-					// https://typescript.tv/errors/#ts6133
-					return String(code) !== '6133';
-				},
-			},
-		}),
+		ctx.codeFeatures.doNotReportTs6133,
 		componentVNodeVar,
 	);
 	yield ` = ${componentFunctionalVar}`;

packages/language-core/lib/codegen/template/elementEvents.ts

@@ -2,6 +2,7 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import { camelize, capitalize } from '@vue/shared';
 import type * as ts from 'typescript';
 import type { Code, VueCodeInformation } from '../../types';
+import { codeFeatures } from '../codeFeatures';
 import { combineLastMapping, createTsAst, endOfLine, identifierRegex, newLine } from '../utils';
 import { generateCamelized } from '../utils/camelized';
 import { wrapWith } from '../utils/wrapWith';
@@ -61,12 +62,12 @@ export function* generateElementEvents(
 			yield `const ${ctx.getInternalVariable()}: __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${emitsVar}, '${propName}', '${emitName}', '${camelizedEmitName}'> = (${newLine}`;
 			if (prop.name === 'on') {
 				yield `{ `;
-				yield* generateEventArg(ctx, source, start!, emitPrefix.slice(0, -1), ctx.codeFeatures.navigation);
+				yield* generateEventArg(options, ctx, source, start!, emitPrefix.slice(0, -1), ctx.codeFeatures.navigation);
 				yield `: {} as any } as typeof ${emitsVar},${newLine}`;
 			}
 			yield `{ `;
 			if (prop.name === 'on') {
-				yield* generateEventArg(ctx, source, start!, propPrefix.slice(0, -1));
+				yield* generateEventArg(options, ctx, source, start!, propPrefix.slice(0, -1));
 				yield `: `;
 				yield* generateEventExpression(options, ctx, prop);
 			}
@@ -80,15 +81,21 @@ export function* generateElementEvents(
 }
 
 export function* generateEventArg(
+	options: TemplateCodegenOptions,
 	ctx: TemplateCodegenContext,
 	name: string,
 	start: number,
 	directive = 'on',
-	features: VueCodeInformation = {
-		...ctx.codeFeatures.withoutHighlightAndCompletion,
-		...ctx.codeFeatures.navigationWithoutRename,
-	},
+	features?: VueCodeInformation,
 ): Generator<Code> {
+	features ??= ctx.resolveCodeFeatures({
+		...codeFeatures.semanticWithoutHighlight,
+		...codeFeatures.navigationWithoutRename,
+		...options.vueCompilerOptions.checkUnknownEvents
+			? codeFeatures.verification
+			: codeFeatures.doNotReportTs2353AndTs2561,
+	});
+
 	if (directive.length) {
 		name = capitalize(name);
 	}