.npmrc

@@ -1,4 +1,3 @@
 modules-cache-max-age=0
 prefer-frozen-lockfile=true
 auto-install-peers=false
-resolution-mode=highest

.vscode/settings.json

@@ -15,5 +15,9 @@
 	},
 	"[jsonc]": {
 		"editor.defaultFormatter": "vscode.json-language-features"
-	}
+	},
+	"[vue]": {
+		"editor.defaultFormatter": "Vue.volar"
+	},
+	"vue.server.path": "./packages/vue-language-server/bin/vue-language-server.js",
 }

CHANGELOG.md

@@ -1,21 +1,15 @@
 # Changelog
 
-## 1.8.8 (2023/7/27)
-
-- fix: language server crashed due to importing unexist library ([#3453](https://github.com/vuejs/language-tools/issues/3453)) ([#3454](https://github.com/vuejs/language-tools/issues/3454))
-
-## 1.8.7 (2023/7/27)
+## 1.8.10 (2023/9/6)
 
-- feat: support auto-complete for directives ([#2559](https://github.com/vuejs/language-tools/issues/2559))
-- feat: support extract component for options api
-- feat: re-support external component parsing ([#3328](https://github.com/vuejs/language-tools/issues/3328))
-- feat: support function expression emit event ([#3445](https://github.com/vuejs/language-tools/issues/3445)) - thanks @lvjiaxuan
-- perf: reuse VueFile instances between monorepo packages ([#3450](https://github.com/vuejs/language-tools/issues/3450))
-- fix: handle node next module resolution ([#3159](https://github.com/vuejs/language-tools/issues/3159)) - thanks @kalvenschraut
-- fix: generate valid code when using `__VLS_PropsChildren` ([#3442](https://github.com/vuejs/language-tools/issues/3442)) - thanks @so1ve
-- fix: component auto-import cannot insert import statement
-- fix: extract component cannot extract interpolations
-- fix: allow top-level await in script setup blocks with generics ([#3441](https://github.com/vuejs/language-tools/issues/3441)) - thanks @so1ve
+- feat: added Portuguese integration documentation ([#3535](https://github.com/vuejs/language-tools/issues/3535))
+- feat: exposed `configFileName` for `createParsedCommandLineByJson()` function ([#3456](https://github.com/vuejs/language-tools/issues/3456)) - thanks @qmhc
+- feat: support nested plugins ([#3530](https://github.com/vuejs/language-tools/issues/3530)) - thanks @so1ve
+- feat(vscode): add `vue.server.runtime` setting and support for Bun runtime
+- feat(vscode): add `vue.server.path` setting for customize server module path
+- fix: correctly hyphen-case props ([#3424](https://github.com/vuejs/language-tools/issues/3424)) - thanks @so1ve
+- fix: generic components should respect `strictTemplates` ([#3487](https://github.com/vuejs/language-tools/issues/3487)) - thanks @so1ve
+- fix(vue-component-type-helpers): correctly handle generic components when using `ComponentExposed` ([#3536](https://github.com/vuejs/language-tools/issues/3536)) - thanks @so1ve
 
 ### Full-time Support by
 
@@ -36,9 +30,9 @@
 <tbody>
   <tr>
     <td>
-		<a href="https://volta.net/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/volta.svg" height="60" /></a>
+		<a href="https://nuxt.com/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/nuxt.svg" height="60" /></a>
 	</td>
-    <td>Supercharged GitHub experience</td>
+    <td>The Intuitive Web Framework</td>
   </tr>
   <tr>
     <td>
@@ -71,6 +65,23 @@ JavaScript Framework</td>
 	<a href="https://opencollective.com/volarjs">Open Collective</a>
 </h5>
 
+## 1.8.8 (2023/7/27)
+
+- fix: language server crashed due to importing unexist library ([#3453](https://github.com/vuejs/language-tools/issues/3453)) ([#3454](https://github.com/vuejs/language-tools/issues/3454))
+
+## 1.8.7 (2023/7/27)
+
+- feat: support auto-complete for directives ([#2559](https://github.com/vuejs/language-tools/issues/2559))
+- feat: support extract component for options api
+- feat: re-support external component parsing ([#3328](https://github.com/vuejs/language-tools/issues/3328))
+- feat: support function expression emit event ([#3445](https://github.com/vuejs/language-tools/issues/3445)) - thanks @lvjiaxuan
+- perf: reuse VueFile instances between monorepo packages ([#3450](https://github.com/vuejs/language-tools/issues/3450))
+- fix: handle node next module resolution ([#3159](https://github.com/vuejs/language-tools/issues/3159)) - thanks @kalvenschraut
+- fix: generate valid code when using `__VLS_PropsChildren` ([#3442](https://github.com/vuejs/language-tools/issues/3442)) - thanks @so1ve
+- fix: component auto-import cannot insert import statement
+- fix: extract component cannot extract interpolations
+- fix: allow top-level await in script setup blocks with generics ([#3441](https://github.com/vuejs/language-tools/issues/3441)) - thanks @so1ve
+
 ## 1.8.6 (2023/7/22)
 
 - feat: add support for extract component code action ([#2496](https://github.com/vuejs/language-tools/issues/2496)) - thanks @zardoy

lerna.json

@@ -4,5 +4,5 @@
 	"packages": [
 		"packages/*"
 	],
-	"version": "1.8.8"
+	"version": "1.8.10"
 }

package.json

@@ -1,10 +1,10 @@
 {
 	"private": true,
 	"scripts": {
-		"build": "tsc -b tsconfig.build.json",
-		"build-ci": "tsc -b tsconfig.build-ci.json",
+		"build": "tsc -b",
+		"build-ci": "tsc -b tsconfig.ci.json",
 		"watch": "npm run build && (npm run watch:base & npm run watch:vue & npm run watch:typescript-vue-plugin)",
-		"watch:base": "tsc -b tsconfig.build.json -w",
+		"watch:base": "tsc -b -w",
 		"watch:vue": "cd ./packages/vscode-vue && npm run watch",
 		"watch:typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run watch",
 		"prerelease": "npm run build && npm run test",

packages/typescript-vue-plugin/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "typescript-vue-plugin",
-	"version": "1.8.8",
+	"version": "1.8.10",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/typescript-vue-plugin"
 	},
 	"dependencies": {
-		"@vue/language-core": "1.8.8",
-		"@vue/typescript": "1.8.8",
+		"@vue/language-core": "1.8.10",
+		"@vue/typescript": "1.8.10",
 		"vscode-uri": "^3.0.7"
 	}
 }

packages/typescript-vue-plugin/tsconfig.json

@@ -0,0 +1,12 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "out",
+		"rootDir": "src",
+	},
+	"include": [ "src" ],
+	"references": [
+		{ "path": "../vue-language-core/tsconfig.json" },
+		{ "path": "../vue-typescript/tsconfig.json" },
+	],
+}

packages/vscode-typescript-vue-plugin/README.md

@@ -10,7 +10,7 @@ This plugin proxies TS server requests to provide some extra functionality:
 
 - When finding references in *.ts files, you also get results from *.vue files.
 - When renaming in *.ts files, references on *.vue files also get adjusted.
-- When typing import statements, .vue* files will also appear for autocompletion.
+- When typing import statements, *.vue files will also appear for autocompletion.
 - (And some extra details most people don't need to know...)
 
 ## Sponsors

packages/vscode-typescript-vue-plugin/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "vscode-typescript-vue-plugin",
-	"version": "1.8.8",
+	"version": "1.8.10",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
@@ -37,7 +37,7 @@
 	},
 	"devDependencies": {
 		"esbuild": "0.15.18",
-		"typescript-vue-plugin": "1.8.8",
+		"typescript-vue-plugin": "1.8.10",
 		"vsce": "latest"
 	}
 }

packages/vscode-typescript-vue-plugin/scripts/build.js

@@ -8,7 +8,7 @@ require('esbuild').build({
 	],
 	format: 'cjs',
 	platform: 'node',
-	tsconfig: '../../tsconfig.build.json',
+	tsconfig: './tsconfig.json',
 	minify: process.argv.includes('--minify'),
 	watch: process.argv.includes('--watch'),
 	plugins: [{

packages/vscode-typescript-vue-plugin/tsconfig.json

@@ -0,0 +1,11 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "out",
+		"rootDir": "src",
+	},
+	"include": [ "src" ],
+	"references": [
+		{ "path": "../typescript-vue-plugin/tsconfig.json" },
+	]
+}

packages/vscode-vue/.vscodeignore

@@ -1,7 +1,6 @@
 out
 scripts
 src
-tsconfig.build.json
-tsconfig.build.tsbuildinfo
+tsconfig.*
 meta.json
 stats.html

packages/vscode-vue/README.md

@@ -91,8 +91,7 @@ For Global components, you need to define `GlobalComponents` interface, for exam
 
 ```typescript
 // components.d.ts
-declare module '@vue/runtime-core' {  // Vue 3
-// declare module 'vue' {   // Vue 2.7
+declare module 'vue' {  // Vue >= 2.7
 // declare module '@vue/runtime-dom' {  // Vue <= 2.6.14
   export interface GlobalComponents {
     RouterLink: typeof import('vue-router')['RouterLink']

packages/vscode-vue/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "volar",
-	"version": "1.8.8",
+	"version": "1.8.10",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
@@ -408,6 +408,23 @@
 					"default": "off",
 					"description": "Traces the communication between VS Code and the language server."
 				},
+				"vue.server.path": {
+					"type": [
+						"string",
+						"null"
+					],
+					"default": null,
+					"description": "Path to node_modules/vue-language-server/bin/vue-language-server.js."
+				},
+				"vue.server.runtime": {
+					"type": "string",
+					"enum": [
+						"node",
+						"bun"
+					],
+					"default": "node",
+					"description": "Vue Language Server runtime."
+				},
 				"vue.server.configFilePath": {
 					"type": "string",
 					"default": "./volar.config.js",
@@ -416,7 +433,7 @@
 				"vue.server.maxFileSize": {
 					"type": "number",
 					"default": 20971520,
-					"description": "Maximum file size for Vue Server to load. (default: 20MB)"
+					"description": "Maximum file size for Vue Language Server to load. (default: 20MB)"
 				},
 				"vue.server.petiteVue.supportHtmlFile": {
 					"type": "boolean",
@@ -720,14 +737,14 @@
 		"pack:next": "npm run build && vsce package",
 		"release": "npm run build:minify && vsce publish",
 		"release:next": "npm run build && vsce publish --pre-release",
-		"bundle-size": "npm run build:minify --metafile && esbuild-visualizer --metadata ./meta.json && open ./stats.html"
+		"size": "npm run build:minify -- --metafile && esbuild-visualizer --metadata ./meta.json && open ./stats.html"
 	},
 	"devDependencies": {
 		"@types/semver": "^7.3.13",
 		"@types/vscode": "1.67.0",
 		"@volar/vscode": "~1.10.0",
-		"@vue/language-core": "1.8.8",
-		"@vue/language-server": "1.8.8",
+		"@vue/language-core": "1.8.10",
+		"@vue/language-server": "1.8.10",
 		"esbuild": "0.15.18",
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",

packages/vscode-vue/scripts/build.js

@@ -15,7 +15,7 @@ require('esbuild').build({
 	],
 	format: 'cjs',
 	platform: 'node',
-	tsconfig: '../../tsconfig.build.json',
+	tsconfig: './tsconfig.json',
 	define: { 'process.env.NODE_ENV': '"production"' },
 	minify: process.argv.includes('--minify'),
 	watch: process.argv.includes('--watch'),

packages/vscode-vue/src/common.ts

@@ -143,8 +143,20 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 		activateServerSys(client);
 	}
 
+	async function requestReloadVscode() {
+		const reload = await vscode.window.showInformationMessage(
+			'Please reload VSCode to restart language servers.',
+			'Reload Window'
+		);
+		if (reload === undefined) return; // cancel
+		vscode.commands.executeCommand('workbench.action.reloadWindow');
+	}
+
 	function activateServerMaxOldSpaceSizeChange() {
 		vscode.workspace.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('vue.server.runtime') || e.affectsConfiguration('vue.server.path')) {
+				requestReloadVscode();
+			}
 			if (e.affectsConfiguration('vue')) {
 				vscode.commands.executeCommand('volar.action.restartServer');
 			}

packages/vscode-vue/src/config.ts

@@ -16,6 +16,8 @@ export const config = {
 		return _config().get('doctor')!;
 	},
 	get server(): Readonly<{
+		path: null | string;
+		runtime: 'node' | 'bun';
 		maxOldSpaceSize: number;
 		maxFileSize: number;
 		reverseConfigFilePriority: boolean;

packages/vscode-vue/src/nodeClientMain.ts

@@ -47,7 +47,18 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 		}
 
-		const serverModule = vscode.Uri.joinPath(context.extensionUri, 'server.js');
+		let serverModule = vscode.Uri.joinPath(context.extensionUri, 'server.js');
+
+		if (config.server.path) {
+			try {
+				const roots = (vscode.workspace.workspaceFolders ?? []).map(folder => folder.uri.fsPath);
+				const serverPath = require.resolve(config.server.path, { paths: roots });
+				serverModule = vscode.Uri.file(serverPath);
+			} catch (err) {
+				vscode.window.showWarningMessage(`Cannot find vue language server path: ${config.server.path}`);
+			}
+		}
+
 		const runOptions: lsp.ForkOptions = {};
 		if (config.server.maxOldSpaceSize) {
 			runOptions.execArgv ??= [];
@@ -66,16 +77,15 @@ export async function activate(context: vscode.ExtensionContext) {
 				options: debugOptions
 			},
 		};
-		const bunPath: string | undefined = undefined; // path to .bun/bin/bun
-		if (bunPath) {
+		if (config.server.runtime === 'bun') {
 			serverOptions = {
 				run: {
 					transport: {
 						kind: lsp.TransportKind.socket,
 						port: port + 10,
 					},
 					options: runOptions,
-					command: bunPath,
+					command: 'bun',
 					args: ['--bun', 'run', serverModule.fsPath],
 				},
 				debug: {
@@ -84,7 +94,7 @@ export async function activate(context: vscode.ExtensionContext) {
 						port: port + 10,
 					},
 					options: debugOptions,
-					command: bunPath,
+					command: 'bun',
 					args: ['--bun', 'run', serverModule.fsPath],
 				},
 			};