fix: build command failed with pnpm v7

close #1261

Author: johnsoncodehk

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
 	"typescript.format.semicolons": "insert",
 	"editor.insertSpaces": false,
-	"editor.detectIndentation": false
+	"editor.detectIndentation": false,
+	"typescript.tsdk": "node_modules/typescript/lib"
 }

package.json

@@ -14,9 +14,11 @@
 		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode-vue-language-features ../volar-starter"
 	},
 	"devDependencies": {
+		"@types/node": "latest",
 		"@vscode/test-web": "latest",
 		"lerna": "latest",
 		"typescript": "latest",
-		"vitest": "^0.8.4"
+		"vite": "latest",
+		"vitest": "latest"
 	}
 }

packages/preview/package.json

@@ -17,7 +17,10 @@
 		"volar-preview-vite": "./bin/vite.js",
 		"volar-preview-nuxi": "./bin/nuxi.js"
 	},
+	"devDependencies": {
+		"@types/ws": "^8.5.3"
+	},
 	"dependencies": {
-		"ws": "^8.5.0"
+		"ws": "^8.6.0"
 	}
 }

packages/shared/src/common.ts

@@ -1,5 +1,5 @@
 
-import type * as vscode from 'vscode-languageserver-types';
+import type * as vscode from 'vscode-languageserver-protocol';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 export function sleep(ms: number) {

packages/vue-language-service/src/plugins/json.ts

@@ -19,21 +19,21 @@ export default function (options: {
 			triggerCharacters: ['"', ':'],
 
 			on(document, position, context) {
-				return worker(document, (jsonDocument) => {
-					return jsonLs.doComplete(document, position, jsonDocument);
+				return worker(document, async (jsonDocument) => {
+					return await jsonLs.doComplete(document, position, jsonDocument);
 				});
 			},
 
-			resolve(item) {
-				return jsonLs.doResolve(item);
+			async resolve(item) {
+				return await jsonLs.doResolve(item);
 			},
 		},
 
 		definition: {
 
 			on(document, position) {
-				return worker(document, (jsonDocument) => {
-					return jsonLs.findDefinition(document, position, jsonDocument);
+				return worker(document, async (jsonDocument) => {
+					return await jsonLs.findDefinition(document, position, jsonDocument);
 				});
 			},
 		},
@@ -43,55 +43,55 @@ export default function (options: {
 
 				const documentLanguageSettings = undefined; // await getSettings(); // TODO
 
-				return jsonLs.doValidation(document, jsonDocument, documentLanguageSettings, options.schema) as Promise<vscode.Diagnostic[]>;
+				return await jsonLs.doValidation(document, jsonDocument, documentLanguageSettings, options.schema) as vscode.Diagnostic[];
 			});
 		},
 
 		doHover(document, position) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.doHover(document, position, jsonDocument);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.doHover(document, position, jsonDocument);
 			});
 		},
 
 		findDocumentLinks(document) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.findLinks(document, jsonDocument);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.findLinks(document, jsonDocument);
 			});
 		},
 
 		findDocumentSymbols(document) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.findDocumentSymbols(document, jsonDocument);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.findDocumentSymbols(document, jsonDocument);
 			});
 		},
 
 		findDocumentColors(document) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.findDocumentColors(document, jsonDocument);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.findDocumentColors(document, jsonDocument);
 			});
 		},
 
 		getColorPresentations(document, color, range) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.getColorPresentations(document, jsonDocument, color, range);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.getColorPresentations(document, jsonDocument, color, range);
 			});
 		},
 
 		getFoldingRanges(document) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.getFoldingRanges(document);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.getFoldingRanges(document);
 			});
 		},
 
 		getSelectionRanges(document, positions) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.getSelectionRanges(document, positions, jsonDocument);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.getSelectionRanges(document, positions, jsonDocument);
 			});
 		},
 
 		format(document, range, options) {
-			return worker(document, (jsonDocument) => {
-				return jsonLs.format(document, range, options);
+			return worker(document, async (jsonDocument) => {
+				return await jsonLs.format(document, range, options);
 			});
 		},
 	};