Merge master and resolve conflicts in vue-global-types-error.ts

Author: unsplusmn

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 3.0.5 (2025-08-01)
+
+### Features
+
+- feat(language-core): introduce `compileSFCStyle` to provide style related infomation (#5548) - Thanks to @KazariEX!
+- feat(language-service): completion snippet for `v-for` (#5553) - Thanks to @KazariEX!
+
+### Bug Fixes
+
+- fix(language-core): generate `modelModifiers` for explicitly declared default model name (#5558) - Thanks to @KazariEX!
+- fix(language-service): more responsive `.value` insertion
+- fix(vscode): add `class` scope fallback for `component` semantic tokens (#5559) - Thanks to @KazariEX!
+- fix(vscode): make sure extension is loaded immediately
+- fix(language-service): only check `globalTypesPath` for FS files
+- fix(vscode): handle fail tsserver requests to avoid memory leak
+- fix(vscode): do not delay the execution of `restartExtensionHost`
+- fix(language-core): avoid references highlight of unrelated native element tags (#5563) - Thanks to @KazariEX!
+- fix(language-core): tolerance for incomplete root template tag
+- fix(language-core): enable navigation code feature on directive modifiers - Thanks to @KazariEX!
+
+### Other Changes
+
+- chore(language-service): improve global types error message for JS projects (#5574) - Thanks to @Ciallo-Chiaki!
+
 ## 3.0.4 (2025-07-25)
 
 ### Features

extensions/vscode/package.json

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

lerna.json

@@ -1,10 +1,18 @@
 {
 	"$schema": "https://raw.githubusercontent.com/lerna-lite/lerna-lite/main/packages/cli/schemas/lerna-schema.json",
+	"command": {
+		"version": {
+			"syncWorkspaceLock": true
+		}
+	},
+	"exact": true,
+	"forcePublish": true,
 	"npmClient": "pnpm",
 	"packages": [
 		"extensions/**",
 		"packages/**",
 		"test-workspace"
 	],
-	"version": "3.0.4"
+	"version": "3.0.5",
+	"yes": true
 }

package.json

@@ -7,7 +7,7 @@
 		"watch:base": "tsc -b -w",
 		"watch:vue": "cd ./extensions/vscode && pnpm run watch",
 		"prerelease": "pnpm run build && pnpm run test",
-		"release": "lerna publish --exact --force-publish --yes --sync-workspace-lock",
+		"release": "lerna publish --no-push --no-git-tag-version",
 		"release:next": "pnpm run release --dist-tag next",
 		"test": "vitest run",
 		"test:update": "vitest run --update",

packages/component-meta/package.json

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

packages/component-type-helpers/package.json

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

packages/language-core/lib/codegen/script/component.ts

@@ -132,7 +132,7 @@ export function* generatePropsOption(
 	const typeOptionCodes: Code[] = [];
 
 	if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
-		let attrsType = `Partial<__VLS_InheritedAttrs>`;
+		let attrsType = `__VLS_InheritedAttrs`;
 		if (hasEmitsOption) {
 			attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
 		}

packages/language-core/lib/codegen/script/scriptSetup.ts

@@ -69,7 +69,7 @@ export function* generateScriptSetup(
 		}
 
 		yield `return {} as {${newLine}`
-			+ `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & Partial<__VLS_InheritedAttrs>> & __VLS_BuiltInPublicProps,${newLine}`
+			+ `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & __VLS_InheritedAttrs> & __VLS_BuiltInPublicProps,${newLine}`
 			+ `	expose(exposed: import('${options.vueCompilerOptions.lib}').ShallowUnwrapRef<${
 				scriptSetupRanges.defineExpose ? 'typeof __VLS_exposed' : '{}'
 			}>): void,${newLine}`

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

@@ -123,14 +123,14 @@ function* generateCssVars(options: ScriptCodegenOptions, ctx: TemplateCodegenCon
 	}
 	yield `// CSS variable injection ${newLine}`;
 	for (const style of options.sfc.styles) {
-		for (const cssBind of style.cssVars) {
+		for (const binding of style.bindings) {
 			yield* generateInterpolation(
 				options,
 				ctx,
 				style.name,
 				codeFeatures.all,
-				cssBind.text,
-				cssBind.offset,
+				binding.text,
+				binding.offset,
 			);
 			yield endOfLine;
 		}

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

@@ -113,10 +113,11 @@ function* generateInheritedAttrs(
 	options: TemplateCodegenOptions,
 	ctx: TemplateCodegenContext,
 ): Generator<Code> {
-	yield `type __VLS_InheritedAttrs = {}`;
-	for (const varName of ctx.inheritedAttrVars) {
-		yield ` & typeof ${varName}`;
-	}
+	yield `type __VLS_InheritedAttrs = ${
+		ctx.inheritedAttrVars.size
+			? `Partial<${[...ctx.inheritedAttrVars].map(name => `typeof ${name}`).join(` & `)}>`
+			: `{}`
+	}`;
 	yield endOfLine;
 
 	if (ctx.bindingAttrLocs.length) {
@@ -133,7 +134,7 @@ function* generateInheritedAttrs(
 		}
 		yield `]${endOfLine}`;
 	}
-	return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
+	return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & __VLS_InheritedAttrs`;
 }
 
 function* generateTemplateRefs(