Merge remote-tracking branch 'upstream' into perf/drop-internal-component

Author: KazariEX

CHANGELOG.md

@@ -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",

changelogs/CHANGELOG-v0.md

@@ -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
 }

changelogs/CHANGELOG-v1.md

@@ -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",

changelogs/CHANGELOG-v2.md

@@ -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": {

extensions/vscode/package.json

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

lerna.json

@@ -35,18 +35,20 @@ export function* generateComponent(
 		if (scriptSetupRanges.defineProps) {
 			const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
 			// NOTE: defineProps is inaccurate for $props
-			returns.push(`typeof ${name} & { $props: Partial<typeof ${name}> }`);
+			returns.push(name, `{} as { $props: Partial<typeof ${name}> }`);
 		}
 		// fill $emit
 		if (scriptSetupRanges.defineEmits) {
-			returns.push(`{ $emit: typeof ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'} }`);
+			returns.push(`{} as { $emit: typeof ${scriptSetupRanges.defineEmits.name ?? `__VLS_emit`} }`);
 		}
 	}
 	if (scriptSetupRanges.defineExpose) {
-		returns.push(`typeof __VLS_exposed`);
+		returns.push(`__VLS_exposed`);
 	}
 	if (returns.length) {
-		yield `setup: () => ({} as ${returns.join(` & `)}),${newLine}`;
+		yield `setup: () => (`;
+		yield* generateSpreadMerge(returns);
+		yield `),${newLine}`;
 	}
 
 	if (!ctx.bypassDefineComponent) {