diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json index 081562626e..04ae0406a2 100644 --- a/extensions/vscode/package.json +++ b/extensions/vscode/package.json @@ -643,7 +643,7 @@ "devDependencies": { "@types/semver": "^7.5.3", "@types/vscode": "^1.82.0", - "@volar/vscode": "2.0.0-alpha.14", + "@volar/vscode": "~2.0.0", "@vue/language-core": "1.8.27", "@vue/language-server": "1.8.27", "esbuild": "latest", diff --git a/package.json b/package.json index e901901068..b4c6551e03 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,9 @@ "devDependencies": { "@lerna-lite/cli": "latest", "@lerna-lite/publish": "latest", - "@volar/language-service": "2.0.0-alpha.14", + "@volar/language-service": "~2.0.0", "typescript": "latest", "vite": "latest", "vitest": "latest" - }, - "pnpm": { - "overrides": { - "@volar/language-service": "2.0.0-alpha.14" - } } } diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json index ec8226036b..8b3563e5e0 100644 --- 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.14", + "@volar/typescript": "~2.0.0", "@vue/language-core": "1.8.27", "path-browserify": "^1.0.1", "vue-component-type-helpers": "1.8.27" diff --git a/packages/language-core/package.json b/packages/language-core/package.json index e0d2809b0d..507553158d 100644 --- 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.14", + "@volar/language-core": "~2.0.0", "@vue/compiler-dom": "^3.4.0", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json index e2a3f126a8..c01b6b1bd1 100644 --- a/packages/language-plugin-pug/package.json +++ b/packages/language-plugin-pug/package.json @@ -17,7 +17,7 @@ "@vue/language-core": "1.8.27" }, "dependencies": { - "@volar/source-map": "2.0.0-alpha.14", - "volar-service-pug": "0.0.26" + "@volar/source-map": "~2.0.0", + "volar-service-pug": "volar-2.0" } } diff --git a/packages/language-server/package.json b/packages/language-server/package.json index a72df32f0f..d3d0e6df0f 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -16,8 +16,8 @@ "directory": "packages/language-server" }, "dependencies": { - "@volar/language-core": "2.0.0-alpha.14", - "@volar/language-server": "2.0.0-alpha.14", + "@volar/language-core": "~2.0.0", + "@volar/language-server": "~2.0.0", "@vue/language-core": "1.8.27", "@vue/language-service": "1.8.27", "vscode-languageserver-protocol": "^3.17.5", diff --git a/packages/language-server/src/nodeServer.ts b/packages/language-server/src/nodeServer.ts index 22887f28aa..aaf0273d1e 100644 --- a/packages/language-server/src/nodeServer.ts +++ b/packages/language-server/src/nodeServer.ts @@ -41,7 +41,7 @@ connection.onInitialize(params => { const ts = getTsLib(); const [commandLine, vueOptions] = await parseCommandLine(); const resolvedVueOptions = vue.resolveVueCompilerOptions(vueOptions); - const languages = vue.resolveLanguages({}, ts, serviceEnv.typescript.uriToFileName, commandLine?.options ?? {}, resolvedVueOptions, options.codegenStack); + const languages = vue.resolveLanguages({}, ts, serviceEnv.typescript!.uriToFileName, commandLine?.options ?? {}, resolvedVueOptions, options.codegenStack); envToVueOptions.set(serviceEnv, resolvedVueOptions); @@ -129,15 +129,15 @@ connection.onRequest(GetComponentMeta.type, async params => { if (!checker) { checker = componentMeta.baseCreate( getTsLib(), - langaugeService.context.typescript!.configFileName, - langaugeService.context.typescript!.projectHost, + langaugeService.context.language.typescript!.configFileName, + langaugeService.context.language.typescript!.projectHost, envToVueOptions.get(langaugeService.context.env)!, {}, - langaugeService.context.typescript!.languageServiceHost.getCurrentDirectory() + '/tsconfig.json.global.vue', + langaugeService.context.language.typescript!.languageServiceHost.getCurrentDirectory() + '/tsconfig.json.global.vue', ); checkers.set(project, checker); } - return checker?.getComponentMeta(langaugeService.context.env.typescript.uriToFileName(params.uri)); + return checker?.getComponentMeta(langaugeService.context.env.typescript!.uriToFileName(params.uri)); }); function getTsLib() { diff --git a/packages/language-service/package.json b/packages/language-service/package.json index b243ff0dfa..ade201ea01 100644 --- 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.14", - "@volar/language-service": "2.0.0-alpha.14", - "@volar/typescript": "2.0.0-alpha.14", + "@volar/language-core": "~2.0.0", + "@volar/language-service": "~2.0.0", + "@volar/typescript": "~2.0.0", "@vue/compiler-dom": "^3.4.0", "@vue/language-core": "1.8.27", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.26", - "volar-service-emmet": "0.0.26", - "volar-service-html": "0.0.26", - "volar-service-json": "0.0.26", - "volar-service-pug": "0.0.26", - "volar-service-pug-beautify": "0.0.26", - "volar-service-typescript": "0.0.26", - "volar-service-typescript-twoslash-queries": "0.0.26", + "volar-service-css": "volar-2.0", + "volar-service-emmet": "volar-2.0", + "volar-service-html": "volar-2.0", + "volar-service-json": "volar-2.0", + "volar-service-pug": "volar-2.0", + "volar-service-pug-beautify": "volar-2.0", + "volar-service-typescript": "volar-2.0", + "volar-service-typescript-twoslash-queries": "volar-2.0", "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.14", + "@volar/kit": "~2.0.0", "vscode-languageserver-protocol": "^3.17.5", "vscode-uri": "^3.0.8" } diff --git a/packages/language-service/src/ideFeatures/nameCasing.ts b/packages/language-service/src/ideFeatures/nameCasing.ts index c935bb076e..57e4618ccf 100644 --- a/packages/language-service/src/ideFeatures/nameCasing.ts +++ b/packages/language-service/src/ideFeatures/nameCasing.ts @@ -13,7 +13,7 @@ export async function convertTagName( vueCompilerOptions: VueCompilerOptions, ) { - const sourceFile = context.files.get(uri); + const sourceFile = context.language.files.get(uri); if (!sourceFile) return; @@ -65,7 +65,7 @@ export async function convertAttrName( vueCompilerOptions: VueCompilerOptions, ) { - const sourceFile = context.files.get(uri); + const sourceFile = context.language.files.get(uri); if (!sourceFile) return; @@ -141,8 +141,8 @@ export function detect( attr: AttrNameCasing[], } { - const rootFile = context.files.get(uri)?.generated?.code; - if (!(rootFile instanceof VueGeneratedCode) || !context.typescript) { + const rootFile = context.language.files.get(uri)?.generated?.code; + if (!(rootFile instanceof VueGeneratedCode) || !context.language.typescript) { return { tag: [], attr: [], diff --git a/packages/language-service/src/languageService.ts b/packages/language-service/src/languageService.ts index c500260d58..5f7d180f71 100644 --- a/packages/language-service/src/languageService.ts +++ b/packages/language-service/src/languageService.ts @@ -90,7 +90,7 @@ export function resolveServices( for (const map of context.documents.getMaps(virtualCode)) { - const sourceVirtualFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceVirtualFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; if (sourceVirtualFile instanceof VueGeneratedCode) { @@ -177,7 +177,7 @@ export function resolveServices( const componentName = newName ?? item.textEdit.newText; const optionEdit = createAddComponentToOptionEdit(ts, ast, componentName); if (optionEdit) { - const textDoc = context.documents.get(context.documents.getVirtualCodeUri(context.files.getByVirtualCode(virtualCode).id, virtualCode.id), virtualCode.languageId, virtualCode.snapshot); + const textDoc = context.documents.get(context.documents.getVirtualCodeUri(context.language.files.getByVirtualCode(virtualCode).id, virtualCode.id), virtualCode.languageId, virtualCode.snapshot); item.additionalTextEdits.push({ range: { start: textDoc.positionAt(optionEdit.range.start), diff --git a/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts b/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts index 6ef7ec6eb6..3dd1538158 100644 --- a/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts +++ b/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts @@ -26,7 +26,7 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser if (!program) return; - const sourceFile = program.getSourceFile(context.env.typescript.uriToFileName(document.uri)); + const sourceFile = program.getSourceFile(context.env.typescript!.uriToFileName(document.uri)); if (!sourceFile) return; @@ -39,7 +39,7 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser const token = context.inject('typescript/languageServiceHost').getCancellationToken?.(); if (token) { - context.inject('typescript/languageService').getQuickInfoAtPosition(context.env.typescript.uriToFileName(document.uri), node.end); + context.inject('typescript/languageService').getQuickInfoAtPosition(context.env.typescript!.uriToFileName(document.uri), node.end); if (token?.isCancellationRequested()) { return; // check cancel here because type checker do not use cancel token } diff --git a/packages/language-service/src/plugins/vue-template.ts b/packages/language-service/src/plugins/vue-template.ts index 911c815ee8..e19c55b505 100644 --- a/packages/language-service/src/plugins/vue-template.ts +++ b/packages/language-service/src/plugins/vue-template.ts @@ -80,7 +80,7 @@ export function create( if (virtualCode) { for (const map of context.documents.getMaps(virtualCode)) { - const sourceVirtualFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceVirtualFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; if (sourceVirtualFile instanceof VueGeneratedCode) { await provideHtmlData(map, sourceVirtualFile); } @@ -93,7 +93,7 @@ export function create( if (virtualCode) { for (const map of context.documents.getMaps(virtualCode)) { - const sourceVirtualFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceVirtualFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; if (sourceVirtualFile instanceof VueGeneratedCode) { afterHtmlCompletion(htmlComplete, map, sourceVirtualFile); } @@ -120,7 +120,7 @@ export function create( for (const map of context.documents.getMaps(virtualCode)) { - const sourceVirtualFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceVirtualFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; const scanner = options.getScanner(baseServiceInstance, document); if (sourceVirtualFile instanceof VueGeneratedCode && scanner) { @@ -244,7 +244,7 @@ export function create( for (const map of context.documents.getMaps(virtualCode)) { - const sourceVirtualFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceVirtualFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; if (!(sourceVirtualFile instanceof VueGeneratedCode)) continue; @@ -306,7 +306,7 @@ export function create( for (const map of context.documents.getMaps(virtualCode)) { - const sourceFile = context.files.get(map.sourceFileDocument.uri)?.generated?.code; + const sourceFile = context.language.files.get(map.sourceFileDocument.uri)?.generated?.code; if (!(sourceFile instanceof VueGeneratedCode)) continue; diff --git a/packages/language-service/src/plugins/vue-twoslash-queries.ts b/packages/language-service/src/plugins/vue-twoslash-queries.ts index 4b949afc11..7983ae4d46 100644 --- a/packages/language-service/src/plugins/vue-twoslash-queries.ts +++ b/packages/language-service/src/plugins/vue-twoslash-queries.ts @@ -33,7 +33,7 @@ export function create(ts: typeof import('typescript/lib/tsserverlibrary')): Ser for (const [pointerPosition, hoverOffset] of hoverOffsets) { for (const [tsOffset, mapping] of map.map.getGeneratedOffsets(hoverOffset)) { if (vue.isHoverEnabled(mapping.data)) { - const fileName = context.env.typescript.uriToFileName(vueFile.id); + const fileName = context.env.typescript!.uriToFileName(vueFile.id); const quickInfo = languageService.getQuickInfoAtPosition(fileName, tsOffset); if (quickInfo) { inlayHints.push({ diff --git a/packages/language-service/tests/complete.ts b/packages/language-service/tests/complete.ts index db9efc83d0..27d80999e3 100644 --- a/packages/language-service/tests/complete.ts +++ b/packages/language-service/tests/complete.ts @@ -20,7 +20,7 @@ for (const dirName of testDirs) { for (const file in inputFiles) { const filePath = path.join(dir, 'input', file); - const uri = tester.serviceEnv.typescript.fileNameToUri(filePath); + const uri = tester.serviceEnv.typescript!.fileNameToUri(filePath); const fileText = inputFiles[file]; const document = TextDocument.create('', '', 0, fileText); const actions = findCompleteActions(fileText); diff --git a/packages/language-service/tests/findDefinition.ts b/packages/language-service/tests/findDefinition.ts index 504decd76c..35b737f0a8 100644 --- a/packages/language-service/tests/findDefinition.ts +++ b/packages/language-service/tests/findDefinition.ts @@ -17,7 +17,7 @@ for (const dirName of testDirs) { for (const file in inputFiles) { const filePath = path.join(dir, file); - const uri = tester.serviceEnv.typescript.fileNameToUri(filePath); + const uri = tester.serviceEnv.typescript!.fileNameToUri(filePath); const fileText = inputFiles[file]; const document = TextDocument.create('', '', 0, fileText); const actions = findActions(fileText); @@ -41,7 +41,7 @@ for (const dirName of testDirs) { expect(locations).toBeDefined(); const location = locations?.find(loc => - loc.targetUri === tester.serviceEnv.typescript.fileNameToUri(targetFile) + loc.targetUri === tester.serviceEnv.typescript!.fileNameToUri(targetFile) && targetDocument.offsetAt(loc.targetSelectionRange.start) === action.targeRange.start && targetDocument.offsetAt(loc.targetSelectionRange.end) === action.targeRange.end ); diff --git a/packages/language-service/tests/inlayHint.ts b/packages/language-service/tests/inlayHint.ts index 3386005423..4d760eded6 100644 --- a/packages/language-service/tests/inlayHint.ts +++ b/packages/language-service/tests/inlayHint.ts @@ -18,7 +18,7 @@ for (const dirName of testDirs) { for (const file in inputFiles) { const filePath = path.join(dir, file); - const uri = tester.serviceEnv.typescript.fileNameToUri(filePath); + const uri = tester.serviceEnv.typescript!.fileNameToUri(filePath); const fileText = inputFiles[file]; const document = TextDocument.create('', '', 0, fileText); const actions = findActions(fileText); diff --git a/packages/language-service/tests/reference.ts b/packages/language-service/tests/reference.ts index e211822db9..d25ae670e4 100644 --- a/packages/language-service/tests/reference.ts +++ b/packages/language-service/tests/reference.ts @@ -17,7 +17,7 @@ for (const dirName of testDirs) { for (const file in inputFiles) { const filePath = path.join(dir, file); - const uri = tester.serviceEnv.typescript.fileNameToUri(filePath); + const uri = tester.serviceEnv.typescript!.fileNameToUri(filePath); const fileText = inputFiles[file]; const document = TextDocument.create('', '', 0, fileText); const actions = findActions(fileText); diff --git a/packages/language-service/tests/rename.ts b/packages/language-service/tests/rename.ts index 36e0d8770a..69f64ac80a 100644 --- a/packages/language-service/tests/rename.ts +++ b/packages/language-service/tests/rename.ts @@ -18,7 +18,7 @@ for (const dirName of testDirs) { for (const file in inputFiles) { const filePath = path.join(dir, 'input', file); - const uri = tester.serviceEnv.typescript.fileNameToUri(filePath); + const uri = tester.serviceEnv.typescript!.fileNameToUri(filePath); const fileText = inputFiles[file]; const document = TextDocument.create('', '', 0, fileText); const actions = findRenameActions(fileText); diff --git a/packages/language-service/tests/utils/createTester.ts b/packages/language-service/tests/utils/createTester.ts index 287d976c7a..4ae4e9d811 100644 --- a/packages/language-service/tests/utils/createTester.ts +++ b/packages/language-service/tests/utils/createTester.ts @@ -6,14 +6,14 @@ import { URI } from 'vscode-uri'; import { createParsedCommandLine, resolveLanguages, resolveServices, resolveVueCompilerOptions } from '../../out'; import { createMockServiceEnv } from './mockEnv'; -export const rootUri = URI.file(path.resolve(__dirname, '../../../../test-workspace/language-service')); +export const rootUri = URI.file(path.resolve(__dirname, '../../../../test-workspace/language-service')).toString(); export const tester = createTester(rootUri); -function createTester(rootUri: URI) { +function createTester(rootUri: string) { const ts = require('typescript') as typeof import('typescript/lib/tsserverlibrary'); const serviceEnv = createMockServiceEnv(rootUri, () => currentVSCodeSettings ?? defaultVSCodeSettings); - const rootPath = serviceEnv.typescript.uriToFileName(rootUri.toString()); + const rootPath = serviceEnv.typescript!.uriToFileName(rootUri.toString()); const realTsConfig = path.join(rootPath, 'tsconfig.json').replace(/\\/g, '/'); const parsedCommandLine = createParsedCommandLine(ts, ts.sys, realTsConfig); parsedCommandLine.fileNames = parsedCommandLine.fileNames.map(fileName => fileName.replace(/\\/g, '/')); @@ -27,7 +27,7 @@ function createTester(rootUri: URI) { getLanguageId: resolveCommonLanguageId, }; const resolvedVueOptions = resolveVueCompilerOptions(parsedCommandLine.vueOptions); - const languages = resolveLanguages({}, ts, serviceEnv.typescript.uriToFileName, parsedCommandLine.options, resolvedVueOptions); + const languages = resolveLanguages({}, ts, serviceEnv.typescript!.uriToFileName, parsedCommandLine.options, resolvedVueOptions); const services = resolveServices({}, ts, () => resolvedVueOptions); const defaultVSCodeSettings: any = { 'typescript.preferences.quoteStyle': 'single', @@ -44,8 +44,8 @@ function createTester(rootUri: URI) { realTsConfig, projectHost, { - fileIdToFileName: serviceEnv.typescript.uriToFileName, - fileNameToFileId: serviceEnv.typescript.fileNameToUri, + fileIdToFileName: serviceEnv.typescript!.uriToFileName, + fileNameToFileId: serviceEnv.typescript!.fileNameToUri, }, ); const languageService = createLanguageService(language, Object.values(services), serviceEnv); diff --git a/packages/language-service/tests/utils/format.ts b/packages/language-service/tests/utils/format.ts index 1fac5c94ce..1f21136819 100644 --- a/packages/language-service/tests/utils/format.ts +++ b/packages/language-service/tests/utils/format.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest'; import { resolveLanguages, resolveServices, resolveVueCompilerOptions } from '../../out'; const resolvedVueOptions = resolveVueCompilerOptions({}); -const languages = resolveLanguages({}, ts, fileId => formatter.env.typescript.uriToFileName(fileId), {}, resolvedVueOptions); +const languages = resolveLanguages({}, ts, fileId => formatter.env.typescript!.uriToFileName(fileId), {}, resolvedVueOptions); const services = resolveServices({}, ts, () => resolvedVueOptions); const formatter = kit.createFormatter(Object.values(languages), Object.values(services)); diff --git a/packages/language-service/tests/utils/mockEnv.ts b/packages/language-service/tests/utils/mockEnv.ts index cfc98ac783..27eca4021f 100644 --- a/packages/language-service/tests/utils/mockEnv.ts +++ b/packages/language-service/tests/utils/mockEnv.ts @@ -7,7 +7,7 @@ const uriToFileName = (uri: string) => URI.parse(uri).fsPath.replace(/\\/g, '/') const fileNameToUri = (fileName: string) => URI.file(fileName).toString(); export function createMockServiceEnv( - rootUri: URI, + rootUri: string, getSettings = () => ({} as any) ): ServiceEnvironment { return { diff --git a/packages/tsc/package.json b/packages/tsc/package.json index 296277263e..ba5280f118 100644 --- 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.14", + "@volar/typescript": "~2.0.0", "@vue/language-core": "1.8.27", "semver": "^7.5.4" }, diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json index fea4086e62..dea7f104b3 100644 --- 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.14", + "@volar/typescript": "~2.0.0", "@vue/language-core": "1.8.27" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6c7709ceb2..aaac789293 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - '@volar/language-service': 2.0.0-alpha.14 - importers: .: @@ -18,8 +15,8 @@ importers: specifier: latest version: 3.2.1(typescript@5.3.3) '@volar/language-service': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 typescript: specifier: latest version: 5.3.3 @@ -39,8 +36,8 @@ importers: specifier: ^1.82.0 version: 1.85.0 '@volar/vscode': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/language-core': specifier: 1.8.27 version: link:../../packages/language-core @@ -72,8 +69,8 @@ importers: packages/component-meta: dependencies: '@volar/typescript': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/language-core': specifier: 1.8.27 version: link:../language-core @@ -99,8 +96,8 @@ importers: packages/language-core: dependencies: '@volar/language-core': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/compiler-dom': specifier: ^3.4.0 version: 3.4.14 @@ -139,11 +136,11 @@ importers: packages/language-plugin-pug: dependencies: '@volar/source-map': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 volar-service-pug: - specifier: 0.0.26 - version: 0.0.26 + specifier: volar-2.0 + version: 0.0.27 devDependencies: '@types/node': specifier: latest @@ -155,11 +152,11 @@ importers: packages/language-server: dependencies: '@volar/language-core': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@volar/language-server': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/language-core': specifier: 1.8.27 version: link:../language-core @@ -176,14 +173,14 @@ importers: packages/language-service: dependencies: '@volar/language-core': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@volar/language-service': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@volar/typescript': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/compiler-dom': specifier: ^3.4.0 version: 3.4.14 @@ -200,29 +197,29 @@ importers: specifier: ^1.0.1 version: 1.0.1 volar-service-css: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) volar-service-emmet: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) volar-service-html: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) volar-service-json: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) volar-service-pug: - specifier: 0.0.26 - version: 0.0.26 + specifier: volar-2.0 + version: 0.0.27 volar-service-pug-beautify: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) volar-service-typescript: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14)(@volar/typescript@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0)(@volar/typescript@2.0.0) volar-service-typescript-twoslash-queries: - specifier: 0.0.26 - version: 0.0.26(@volar/language-service@2.0.0-alpha.14) + specifier: volar-2.0 + version: 0.0.27(@volar/language-service@2.0.0) vscode-html-languageservice: specifier: ^5.1.0 version: 5.1.1 @@ -237,8 +234,8 @@ importers: specifier: latest version: 1.0.2 '@volar/kit': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14(typescript@5.3.3) + specifier: ~2.0.0 + version: 2.0.0(typescript@5.3.3) vscode-languageserver-protocol: specifier: ^3.17.5 version: 3.17.5 @@ -249,8 +246,8 @@ importers: packages/tsc: dependencies: '@volar/typescript': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/language-core': specifier: 1.8.27 version: link:../language-core @@ -268,8 +265,8 @@ importers: packages/typescript-plugin: dependencies: '@volar/typescript': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 + specifier: ~2.0.0 + version: 2.0.0 '@vue/language-core': specifier: 1.8.27 version: link:../language-core @@ -1314,31 +1311,31 @@ packages: pretty-format: 29.7.0 dev: true - /@volar/kit@2.0.0-alpha.14(typescript@5.3.3): - resolution: {integrity: sha512-Q0M0v7NU8dAErkMoLDKkUL3OJaMYIg/M3y1gLtwsl/ITYX0zUYil70Ccynt2iBjznxy6qqXBwTmHwP42AgIenw==} + /@volar/kit@2.0.0(typescript@5.3.3): + resolution: {integrity: sha512-1l6KjWjX1HT7Hf5kHT4hhDu1KEPNvGPoCr/ypwRbk5jFkBVNNv9eA5H2e8obXztlESLvQ1RDOQxyxv0PIXfg4g==} peerDependencies: typescript: '*' dependencies: - '@volar/language-service': 2.0.0-alpha.14 - '@volar/typescript': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 + '@volar/typescript': 2.0.0 typesafe-path: 0.2.2 typescript: 5.3.3 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 dev: true - /@volar/language-core@2.0.0-alpha.14: - resolution: {integrity: sha512-jNzHp8o15hg+LSyvBsBhsBmxDbh3cc8xEhiw2SDW3rjAwnjCeEi+tkOrsU/tEpKnGsPSaCg/vaZ60bUkLp4/1g==} + /@volar/language-core@2.0.0: + resolution: {integrity: sha512-1L9GB7CwI4LKKwpKOxFSICJ54GdWGwjIUkI7UwAjJpnFIFm8+xteSf86nsEknFh0k7MHScm+Xb0x8eEx/8Qdrg==} dependencies: - '@volar/source-map': 2.0.0-alpha.14 + '@volar/source-map': 2.0.0 - /@volar/language-server@2.0.0-alpha.14: - resolution: {integrity: sha512-v6d3y152YMdhPQS0a8U0f7tvXcAarrvdVdGuKFzTft9/hhH/hXdK3+hFhGwMkDnnBMoRWPic7yeUqjFkvlmMAQ==} + /@volar/language-server@2.0.0: + resolution: {integrity: sha512-sfSXbCgVf7wiyKsGmeCt0y6qpFE4sma45LUd87Rs/Wv6I1UH/B8TP7UZ/6grAKh5YO5GF8WOv2zovn5Nmw7z3g==} dependencies: - '@volar/language-core': 2.0.0-alpha.14 - '@volar/language-service': 2.0.0-alpha.14 - '@volar/snapshot-document': 2.0.0-alpha.14 - '@volar/typescript': 2.0.0-alpha.14 + '@volar/language-core': 2.0.0 + '@volar/language-service': 2.0.0 + '@volar/snapshot-document': 2.0.0 + '@volar/typescript': 2.0.0 '@vscode/l10n': 0.0.16 path-browserify: 1.0.1 request-light: 0.7.0 @@ -1347,35 +1344,35 @@ packages: vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - /@volar/language-service@2.0.0-alpha.14: - resolution: {integrity: sha512-F7RVf/ihG6e6TG8O2zyM7og4KWnA2+I2L3Ls4mF4e+sG25DQyVu46nNN+I2FtFArdV1VGJvEfVNXBtxHXblBpw==} + /@volar/language-service@2.0.0: + resolution: {integrity: sha512-aWalwQ54DAEvJ9dfEyJN/pr6ID5GWL7dBR46CMx6fr9JK/m9NkXaK7qJRcxKXaaSTYtlWA342dEhYESLB2dAYw==} dependencies: - '@volar/language-core': 2.0.0-alpha.14 + '@volar/language-core': 2.0.0 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - /@volar/snapshot-document@2.0.0-alpha.14: - resolution: {integrity: sha512-PBWPiWnc5ggdfZnPDFIem3Wa8GphaCFsumIC3myMHHYvKuP+sr5af3jE0JtQ2c++wMZ6jrNFTTII4jLbrFyuOA==} + /@volar/snapshot-document@2.0.0: + resolution: {integrity: sha512-hf2meJIrJw848KaOr8dCQlCgGS0UWUVd/m4DkTnM4Rlo+fVmzd7CjZoYqjYMiuIqxeu3OxpypcP++fv4Rp28Ew==} dependencies: vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 - /@volar/source-map@2.0.0-alpha.14: - resolution: {integrity: sha512-Igx/uU3gbHtrYDVE5d8YEfFOTrfij5q8fvVkmHNlGOTwhRZc33W3lMY6xIuJJR5r1GAplIXUmyP0KNnrT5pDCw==} + /@volar/source-map@2.0.0: + resolution: {integrity: sha512-WZO1hZPqMGyCmWs9j4ZV090D7jfMjQUwALuz5CCbrMVSCGlvYxv5jhw0M5G39thJmiNV/ttgdgiavzvtOMe5/w==} dependencies: muggle-string: 0.4.1 - /@volar/typescript@2.0.0-alpha.14: - resolution: {integrity: sha512-IH8BvoRg45Fy03tKrOiSMbbwkrvAdZRHmv5IwfP1nRY0lt5Xkxwx0wfW9xhbRQ6DUEsh41zxa1HSsPTBAiWWRg==} + /@volar/typescript@2.0.0: + resolution: {integrity: sha512-6HGiCOMe612taDDRTX1N5938hY2ThjdLdW3TXHsIgcQz8Y+2H8o94BDwXnMOGf+XksektuXMZkDBalgLPFhBbg==} dependencies: - '@volar/language-core': 2.0.0-alpha.14 + '@volar/language-core': 2.0.0 path-browserify: 1.0.1 - /@volar/vscode@2.0.0-alpha.14: - resolution: {integrity: sha512-M5H5naCTD3vBxyAmDBMiajRYylxwxdN4x1CuF4sRvcZRv14Kn/zEIbvEdDkRjcR3kByd86XRdkyR+JK8SunLHw==} + /@volar/vscode@2.0.0: + resolution: {integrity: sha512-FqNMA5MwAARbjP6vZQYJd2a6ydyzUfFO8XTV6+mJPQVzSlCKoxIvV5QbfgEa1P7AGT1DuuiSr/1WcfFEF5/s1A==} dependencies: - '@volar/language-server': 2.0.0-alpha.14 + '@volar/language-server': 2.0.0 path-browserify: 1.0.1 vscode-languageclient: 9.0.1 vscode-nls: 5.2.0 @@ -4846,103 +4843,103 @@ packages: - terser dev: true - /volar-service-css@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-xK4frtUE5yXfiAW0weTMdsAyJnu5ltYVfrGzggYZ4pnHRf4YWb+8iWx+sBxrN7xrupYe4dYq8dkgBxEWviO3WA==} + /volar-service-css@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-wPBj6nUqiLSNwbADRQ5hIX1LoKYROuVTxAKg4IiJGgw1A7MnLxvoOAOef+ruxtVDHW5GCgeN+3QSV68UOIxS/g==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 vscode-css-languageservice: 6.2.11 vscode-uri: 3.0.8 dev: false - /volar-service-emmet@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-G46Srw+gjdVg45VQ8ZJG1KQt7HffnUbKxZilqRxOWdJIXJEdeOIiGzDahrPvh0GuuEyqSukyjClYN7KMLlsRhw==} + /volar-service-emmet@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-8ZOQshjBF75/BSfooTVXlochIDRB4I4g1/o1els2ZLNgkpuLbwIoRYnhu0moF7LxlB2IG646+dce4jb85S3OKg==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 '@vscode/emmet-helper': 2.9.2 - volar-service-html: 0.0.26(@volar/language-service@2.0.0-alpha.14) + volar-service-html: 0.0.27(@volar/language-service@2.0.0) dev: false - /volar-service-html@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-qEYbLw+JO82VAf6Xw17VAwnp4TO5nOCYhJpzJK0vmpF2I+NW9HWNEouggqFfzw5Iy1xwuUoIJPhEc5nhS0lPoA==} + /volar-service-html@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-hyXgNaaiSJhj7f1et7L9BRpTYMzr+3rvlPhGvgZpqurJx+J00Y3wWmlU4adUWglKTXSAswgedKUvSNGn4BGAzw==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 vscode-html-languageservice: 5.1.1 vscode-uri: 3.0.8 dev: false - /volar-service-json@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-2OJYrNhrsoygUKLId4RnL3e4OzMo7gCIyVyZEPYUQ+Hpk3dA59ic0e7VsjBLo/uvOLuyCBPddDeI6XvtC+RSBQ==} + /volar-service-json@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-05MKpBEmwlGzpNaOvjUlVnpB0sPktXR1TMDIYa3/oAnYqL5m75Ckk7ihJe6wa90mH3Uj+ChRXjLlIbIW/DKfhw==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 vscode-json-languageservice: 5.3.7 vscode-uri: 3.0.8 dev: false - /volar-service-pug-beautify@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-UzLh2inHhAlK87vzVE/9YSDZ7YdiJ6iaw0XWZMKvZAt1O6jfhHzPZFFiql1LhjIQDiyc5x8bhf6Tg/nErIOIew==} + /volar-service-pug-beautify@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-KUM4nqNbHFCdNwJlFCU0rW4YpZn9FhDNCGfwLBxNmBuV5VADrrCY2hY8W9K0GR8uAF2dErNnD+kgE5OVG3cS4Q==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: '@johnsoncodehk/pug-beautify': 0.2.2 - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 dev: false - /volar-service-pug@0.0.26: - resolution: {integrity: sha512-QMG3Pf/1/ycJ3suFgelyGo21vAOxnGgJ7BDNOx4vwBh0CN+wYrAHEmBdaUEO9P3hFyO4VYQW2Z1FdwtmudwKNQ==} + /volar-service-pug@0.0.27: + resolution: {integrity: sha512-TYBsMzHYevDKjg3ja5MaFDTPBJsqggqFfc96EIpMv7nM+11VFX3CEW1rd/D3GjvB98zqtJ3P4U/0TKYGZhc1aA==} dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 pug-lexer: 5.0.1 pug-parser: 6.0.0 - volar-service-html: 0.0.26(@volar/language-service@2.0.0-alpha.14) + volar-service-html: 0.0.27(@volar/language-service@2.0.0) vscode-html-languageservice: 5.1.1 vscode-languageserver-textdocument: 1.0.11 dev: false - /volar-service-typescript-twoslash-queries@0.0.26(@volar/language-service@2.0.0-alpha.14): - resolution: {integrity: sha512-IjsnpFAUU9DUkXitt6zXZlS1/j36oIhIEUzMW70WFOY8y5SLUVr9O1OufyrmFisJqgDtkV7liUj9v15gXbVqsA==} + /volar-service-typescript-twoslash-queries@0.0.27(@volar/language-service@2.0.0): + resolution: {integrity: sha512-4kZ4dnDCbf7dJh9FsAgG6gsmTqRGEhesRphE5bZmQ/PCaAfjuYFv+wccvwuoZghFrP5IsXgiO1ZzWku3atlchQ==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 dev: false - /volar-service-typescript@0.0.26(@volar/language-service@2.0.0-alpha.14)(@volar/typescript@2.0.0-alpha.14): - resolution: {integrity: sha512-VpEneB7V1Tb7NOAqePbfXvzRi9bxN1Vd4bDvfyJ1rOvSkZ48anXRw7qqctjfkUNRcDpH+Xn4ZlMmLORsG7OnMw==} + /volar-service-typescript@0.0.27(@volar/language-service@2.0.0)(@volar/typescript@2.0.0): + resolution: {integrity: sha512-O8BEz5NFy4bYU36LKCXEQl08pl9mf6AOV/xpLo3VTiMK1CJiwax7XbPkE6SZKb1QfQe0gn5RbvHeRpzSCz6H5g==} peerDependencies: - '@volar/language-service': 2.0.0-alpha.14 - '@volar/typescript': next + '@volar/language-service': ~2.0 + '@volar/typescript': ~2.0 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.0.0-alpha.14 - '@volar/typescript': 2.0.0-alpha.14 + '@volar/language-service': 2.0.0 + '@volar/typescript': 2.0.0 path-browserify: 1.0.1 semver: 7.5.4 typescript-auto-import-cache: 0.3.2