chore: bump volar

vuejs · Dec 21, 2023 · 3053cf1 · 3053cf1
1 parent 02d0ef4
commit 3053cf1
Show file tree

Hide file tree

Showing 14 changed files with 133 additions and 140 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -659,7 +659,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "2.0.0-alpha.10",
+		"@volar/vscode": "2.0.0-alpha.12",
 		"@vue/language-core": "1.8.26",
 		"@vue/language-server": "1.8.26",
 		"esbuild": "latest",

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
-		"@volar/language-service": "2.0.0-alpha.10",
+		"@volar/language-service": "2.0.0-alpha.12",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"

diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.12",
 		"@vue/language-core": "1.8.26",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "1.8.26"

diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.10",
+		"@volar/language-core": "2.0.0-alpha.12",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",

diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
@@ -17,7 +17,7 @@
 		"@vue/language-core": "1.8.26"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.0.0-alpha.10",
-		"volar-service-pug": "0.0.24"
+		"@volar/source-map": "2.0.0-alpha.12",
+		"volar-service-pug": "0.0.25"
 	}
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,9 +16,9 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.10",
-		"@volar/language-server": "2.0.0-alpha.10",
-		"@volar/typescript": "2.0.0-alpha.10",
+		"@volar/language-core": "2.0.0-alpha.12",
+		"@volar/language-server": "2.0.0-alpha.12",
+		"@volar/typescript": "2.0.0-alpha.12",
 		"@vue/language-core": "1.8.26",
 		"@vue/language-service": "1.8.26",
 		"vscode-languageserver-protocol": "^3.17.5",

diff --git a/packages/language-server/src/nodeServer.ts b/packages/language-server/src/nodeServer.ts
@@ -32,33 +32,29 @@ connection.onInitialize(params => {
 		options.vue?.hybridMode ? createSimpleProjectProvider : createTypeScriptProjectProvider,
 		{
 			watchFileExtensions: ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json', ...vueFileExtensions],
-			getServerCapabilitiesSetup() {
+			getServicePlugins() {
 				const ts = getTsLib();
 				const services = vue.resolveServices({}, ts, env => envToVueOptions.get(env)!);
-				return {
-					servicePlugins: Object.values(services),
-				};
+
+				return Object.values(services);
 			},
-			async getProjectSetup(serviceEnv, projectContext) {
+			async getLanguagePlugins(serviceEnv, projectContext) {
 				const ts = getTsLib();
 				const [commandLine, vueOptions] = await parseCommandLine();
 				const resolvedVueOptions = vue.resolveVueCompilerOptions(vueOptions);
-				envToVueOptions.set(serviceEnv, resolvedVueOptions);
-				const services = vue.resolveServices({}, ts, env => envToVueOptions.get(env)!);
 				const languages = vue.resolveLanguages({}, ts, commandLine?.options ?? {}, resolvedVueOptions, options.codegenStack);
 
-				return {
-					languagePlugins: Object.values(languages),
-					servicePlugins: Object.values(services),
-				};
+				envToVueOptions.set(serviceEnv, resolvedVueOptions);
+
+				return Object.values(languages);
 
 				async function parseCommandLine() {
 
 					let commandLine: vue2.ParsedCommandLine | undefined;
 					let vueOptions: Partial<vue.VueCompilerOptions> = {};
 
 					if (projectContext.typescript) {
-						const sys = createSys(ts, serviceEnv, serviceEnv.uriToFileName(serviceEnv.workspaceFolder.uri.toString()));
+						const sys = createSys(ts, serviceEnv, serviceEnv.uriToFileName(serviceEnv.workspaceFolder.toString()));
 						let sysVersion: number | undefined;
 						let newSysVersion = await sys.sync();
 

diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -17,29 +17,29 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.10",
-		"@volar/language-service": "2.0.0-alpha.10",
-		"@volar/typescript": "2.0.0-alpha.10",
+		"@volar/language-core": "2.0.0-alpha.12",
+		"@volar/language-service": "2.0.0-alpha.12",
+		"@volar/typescript": "2.0.0-alpha.12",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/language-core": "1.8.26",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.24",
-		"volar-service-emmet": "0.0.24",
-		"volar-service-html": "0.0.24",
-		"volar-service-json": "0.0.24",
-		"volar-service-pug": "0.0.24",
-		"volar-service-pug-beautify": "0.0.24",
-		"volar-service-typescript": "0.0.24",
-		"volar-service-typescript-twoslash-queries": "0.0.24",
+		"volar-service-css": "0.0.25",
+		"volar-service-emmet": "0.0.25",
+		"volar-service-html": "0.0.25",
+		"volar-service-json": "0.0.25",
+		"volar-service-pug": "0.0.25",
+		"volar-service-pug-beautify": "0.0.25",
+		"volar-service-typescript": "0.0.25",
+		"volar-service-typescript-twoslash-queries": "0.0.25",
 		"vscode-html-languageservice": "^5.1.0",
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "2.0.0-alpha.10",
+		"@volar/kit": "2.0.0-alpha.12",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	}

diff --git a/packages/language-service/tests/utils/mockEnv.ts b/packages/language-service/tests/utils/mockEnv.ts
@@ -11,10 +11,7 @@ export function createMockServiceEnv(
 	getSettings = () => ({} as any)
 ): ServiceEnvironment {
 	return {
-		workspaceFolder: {
-			uri: rootUri,
-			name: 'test-root',
-		},
+		workspaceFolder: rootUri,
 		uriToFileName,
 		fileNameToUri,
 		async getConfiguration(section: string) {

diff --git a/packages/tsc/package.json b/packages/tsc/package.json
@@ -17,7 +17,7 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.12",
 		"@vue/language-core": "1.8.26",
 		"semver": "^7.5.4"
 	},

diff --git a/packages/tsc/src/index.ts b/packages/tsc/src/index.ts
@@ -1,4 +1,4 @@
-import { runTsc } from '@volar/typescript/lib/starters/runTsc';
+import { runTsc } from '@volar/typescript/lib/quickstart/runTsc';
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 

diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.12",
 		"@vue/language-core": "1.8.26"
 	}
 }
diff --git a/packages/typescript-plugin/src/index.ts b/packages/typescript-plugin/src/index.ts
@@ -1,4 +1,4 @@
-import { createTSServerPlugin } from '@volar/typescript/lib/starters/createTSServerPlugin';
+import { createTSServerPlugin } from '@volar/typescript/lib/quickstart/createTSServerPlugin';
 import * as vue from '@vue/language-core';
 // @ts-expect-error
 import type * as ts from 'typescript/lib/tsserverlibrary';