From d24c984d13889518f0404a8f673ab6c0c2ca0e70 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Mon, 19 Aug 2024 13:48:22 +0800 Subject: [PATCH] chore: update to Volar 2.4.0 --- extensions/vscode/package.json | 2 +- package.json | 19 +- packages/component-meta/lib/base.ts | 137 ++++----- packages/component-meta/package.json | 2 +- packages/language-core/package.json | 4 +- packages/language-plugin-pug/package.json | 4 +- .../language-server/lib/hybridModeProject.ts | 2 +- packages/language-server/package.json | 4 +- packages/language-service/package.json | 24 +- .../tests/utils/createTester.ts | 1 - packages/tsc/package.json | 2 +- packages/typescript-plugin/package.json | 2 +- pnpm-lock.yaml | 264 ++++++++---------- 13 files changed, 199 insertions(+), 268 deletions(-) diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json index 175ad60522..f8bf2c5aa7 100644 --- a/extensions/vscode/package.json +++ b/extensions/vscode/package.json @@ -548,7 +548,7 @@ "devDependencies": { "@types/semver": "^7.5.3", "@types/vscode": "^1.82.0", - "@volar/vscode": "~2.4.0-alpha.18", + "@volar/vscode": "~2.4.0", "@vscode/vsce": "latest", "@vue/language-core": "2.0.28", "@vue/language-server": "2.0.28", diff --git a/package.json b/package.json index 925cd9ddaa..414132f019 100644 --- a/package.json +++ b/package.json @@ -24,30 +24,13 @@ "@lerna-lite/publish": "latest", "@tsslint/cli": "latest", "@tsslint/config": "latest", - "@volar/language-service": "~2.4.0-alpha.18", + "@volar/language-service": "~2.4.0", "typescript": "latest", "vite": "latest", "vitest": "latest" }, "pnpm": { "overrides": { - "@volar/kit": "https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192", - "@volar/language-core": "https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192", - "@volar/language-server": "https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192", - "@volar/language-service": "https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192", - "@volar/source-map": "https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192", - "@volar/typescript": "https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192", - "@volar/vscode": "https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192", - "volar-service-css": "https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3", - "volar-service-emmet": "https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3", - "volar-service-html": "https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3", - "volar-service-json": "https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3", - "volar-service-markdown": "https://pkg.pr.new/volarjs/services/volar-service-markdown@f520ee3", - "volar-service-prettyhtml": "https://pkg.pr.new/volarjs/services/volar-service-prettyhtml@f520ee3", - "volar-service-pug": "https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3", - "volar-service-pug-beautify": "https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3", - "volar-service-typescript": "https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3", - "volar-service-typescript-twoslash-queries": "https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3", "inquirer": "9.2.23" } } diff --git a/packages/component-meta/lib/base.ts b/packages/component-meta/lib/base.ts index 2b18d45d16..e71738e5e4 100644 --- a/packages/component-meta/lib/base.ts +++ b/packages/component-meta/lib/base.ts @@ -27,7 +27,7 @@ export function createCheckerByJsonConfigBase( checkerOptions: MetaCheckerOptions = {} ) { rootDir = rootDir.replace(windowsPathReg, '/'); - return createCheckerWorker( + return baseCreate( ts, () => vue.createParsedCommandLineByJson(ts, ts.sys, rootDir, json), checkerOptions, @@ -42,7 +42,7 @@ export function createCheckerBase( checkerOptions: MetaCheckerOptions = {} ) { tsconfig = tsconfig.replace(windowsPathReg, '/'); - return createCheckerWorker( + return baseCreate( ts, () => vue.createParsedCommandLine(ts, ts.sys, tsconfig), checkerOptions, @@ -51,75 +51,28 @@ export function createCheckerBase( ); } -function createCheckerWorker( +export function baseCreate( ts: typeof import('typescript'), - loadParsedCommandLine: () => vue.ParsedCommandLine, + getCommandLine: () => vue.ParsedCommandLine, checkerOptions: MetaCheckerOptions, rootPath: string, globalComponentName: string ) { - - /** - * Original Host - */ - - let parsedCommandLine = loadParsedCommandLine(); - let fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/')); + let commandLine = getCommandLine(); + let fileNames = commandLine.fileNames.map(path => path.replace(windowsPathReg, '/')); let projectVersion = 0; - const scriptSnapshots = new Map(); const projectHost: TypeScriptProjectHost = { getCurrentDirectory: () => rootPath, getProjectVersion: () => projectVersion.toString(), - getCompilationSettings: () => parsedCommandLine.options, + getCompilationSettings: () => commandLine.options, getScriptFileNames: () => fileNames, - getProjectReferences: () => parsedCommandLine.projectReferences, - getScriptSnapshot: fileName => { - if (!scriptSnapshots.has(fileName)) { - const fileText = ts.sys.readFile(fileName); - if (fileText !== undefined) { - scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText)); - } - } - return scriptSnapshots.get(fileName); - }, + getProjectReferences: () => commandLine.projectReferences, }; - - return { - ...baseCreate(ts, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName), - updateFile(fileName: string, text: string) { - fileName = fileName.replace(windowsPathReg, '/'); - scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text)); - projectVersion++; - }, - deleteFile(fileName: string) { - fileName = fileName.replace(windowsPathReg, '/'); - fileNames = fileNames.filter(f => f !== fileName); - projectVersion++; - }, - reload() { - parsedCommandLine = loadParsedCommandLine(); - fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/')); - this.clearCache(); - }, - clearCache() { - scriptSnapshots.clear(); - projectVersion++; - }, - }; -} - -export function baseCreate( - ts: typeof import('typescript'), - projectHost: TypeScriptProjectHost, - vueCompilerOptions: vue.VueCompilerOptions, - checkerOptions: MetaCheckerOptions, - globalComponentName: string -) { const globalComponentSnapshot = ts.ScriptSnapshot.fromString(''); - const metaSnapshots: Record = {}; + const scriptSnapshots = new Map(); + const metaSnapshots = new Map(); const getScriptFileNames = projectHost.getScriptFileNames; - const getScriptSnapshot = projectHost.getScriptSnapshot; projectHost.getScriptFileNames = () => { const names = getScriptFileNames(); return [ @@ -129,20 +82,6 @@ export function baseCreate( getMetaFileName(globalComponentName), ]; }; - projectHost.getScriptSnapshot = fileName => { - if (isMetaFileName(fileName)) { - if (!metaSnapshots[fileName]) { - metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName)); - } - return metaSnapshots[fileName]; - } - else if (fileName === globalComponentName) { - return globalComponentSnapshot; - } - else { - return getScriptSnapshot(fileName); - } - }; const vueLanguagePlugin = vue.createVueLanguagePlugin2( ts, @@ -153,7 +92,7 @@ export function baseCreate( ts.sys.useCaseSensitiveFileNames ), projectHost.getCompilationSettings(), - vueCompilerOptions + commandLine.vueOptions ); const language = vue.createLanguage( [ @@ -166,7 +105,30 @@ export function baseCreate( ], new vue.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => { - const snapshot = projectHost.getScriptSnapshot(fileName); + let snapshot = scriptSnapshots.get(fileName); + + if (fileName === globalComponentName) { + snapshot = globalComponentSnapshot; + } + else if (isMetaFileName(fileName)) { + if (!metaSnapshots.has(fileName)) { + metaSnapshots.set(fileName, ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName))); + } + snapshot = metaSnapshots.get(fileName); + } + else { + if (!scriptSnapshots.has(fileName)) { + const fileText = ts.sys.readFile(fileName); + if (fileText !== undefined) { + scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText)); + } + else { + scriptSnapshots.set(fileName, undefined); + } + } + snapshot = scriptSnapshots.get(fileName); + } + if (snapshot) { language.scripts.set(fileName, snapshot); } @@ -182,7 +144,7 @@ export function baseCreate( const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost); languageServiceHost.getScriptKind = fileName => { const scriptKind = getScriptKind!(fileName); - if (vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext))) { + if (commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) { if (scriptKind === ts.ScriptKind.JS) { return ts.ScriptKind.TS; } @@ -199,6 +161,25 @@ export function baseCreate( return { getExportNames, getComponentMeta, + updateFile(fileName: string, text: string) { + fileName = fileName.replace(windowsPathReg, '/'); + scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text)); + projectVersion++; + }, + deleteFile(fileName: string) { + fileName = fileName.replace(windowsPathReg, '/'); + fileNames = fileNames.filter(f => f !== fileName); + projectVersion++; + }, + reload() { + commandLine = getCommandLine(); + fileNames = commandLine.fileNames.map(path => path.replace(windowsPathReg, '/')); + this.clearCache(); + }, + clearCache() { + scriptSnapshots.clear(); + projectVersion++; + }, __internal__: { tsLs, }, @@ -210,7 +191,7 @@ export function baseCreate( function getMetaFileName(fileName: string) { return ( - vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)) + commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext)) ? fileName : fileName.substring(0, fileName.lastIndexOf('.')) ) + '.meta.ts'; @@ -229,7 +210,7 @@ interface ComponentMeta { exposed: ComponentExposed; }; -${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode} +${commandLine.vueOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode} `.trim(); return code; } @@ -321,11 +302,11 @@ ${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode} // fill defaults const printer = ts.createPrinter(checkerOptions.printer); - const snapshot = projectHost.getScriptSnapshot(componentPath)!; + const snapshot = language.scripts.get(componentPath)?.snapshot!; const vueFile = language.scripts.get(componentPath)?.generated?.root; const vueDefaults = vueFile && exportName === 'default' - ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, vueCompilerOptions) : {}) + ? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, commandLine.vueOptions) : {}) : {}; const tsDefaults = !vueFile ? readTsComponentDefaultProps( componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json index a904348e96..054bd20773 100644 --- a/packages/component-meta/package.json +++ b/packages/component-meta/package.json @@ -12,7 +12,7 @@ "directory": "packages/component-meta" }, "dependencies": { - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/typescript": "~2.4.0", "@vue/language-core": "2.0.28", "path-browserify": "^1.0.1", "vue-component-type-helpers": "2.0.28" diff --git a/packages/language-core/package.json b/packages/language-core/package.json index 6efe2a6ee8..6ad5683c03 100644 --- a/packages/language-core/package.json +++ b/packages/language-core/package.json @@ -12,7 +12,7 @@ "directory": "packages/language-core" }, "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.0", "@vue/compiler-dom": "^3.4.0", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", @@ -25,7 +25,7 @@ "@types/minimatch": "^5.1.2", "@types/node": "latest", "@types/path-browserify": "^1.0.1", - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/typescript": "~2.4.0", "@vue/compiler-sfc": "^3.4.0" }, "peerDependencies": { diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json index 89d52962d5..ff722f9c1e 100644 --- a/packages/language-plugin-pug/package.json +++ b/packages/language-plugin-pug/package.json @@ -16,7 +16,7 @@ "@vue/language-core": "2.0.28" }, "dependencies": { - "@volar/source-map": "~2.4.0-alpha.18", - "volar-service-pug": "0.0.59" + "@volar/source-map": "~2.4.0", + "volar-service-pug": "0.0.61" } } diff --git a/packages/language-server/lib/hybridModeProject.ts b/packages/language-server/lib/hybridModeProject.ts index b7e27df265..985ec5a3b5 100644 --- a/packages/language-server/lib/hybridModeProject.ts +++ b/packages/language-server/lib/hybridModeProject.ts @@ -25,7 +25,7 @@ export function createHybridModeProject( setup(_server) { server = _server; onSomePipeReadyCallbacks.push(() => { - server.languageFeatures.refreshDiagnostics(false); + server.languageFeatures.requestRefresh(false); }); server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => { for (const change of changes) { diff --git a/packages/language-server/package.json b/packages/language-server/package.json index 6e6002742e..bd4773003b 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -15,8 +15,8 @@ "directory": "packages/language-server" }, "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-server": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.0", + "@volar/language-server": "~2.4.0", "@vue/language-core": "2.0.28", "@vue/language-service": "2.0.28", "@vue/typescript-plugin": "2.0.28", diff --git a/packages/language-service/package.json b/packages/language-service/package.json index 2f707cefa1..a632909434 100644 --- a/packages/language-service/package.json +++ b/packages/language-service/package.json @@ -16,23 +16,23 @@ "update-html-data": "node ./scripts/update-html-data.js" }, "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-service": "~2.4.0-alpha.18", - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.0", + "@volar/language-service": "~2.4.0", + "@volar/typescript": "~2.4.0", "@vue/compiler-dom": "^3.4.0", "@vue/language-core": "2.0.28", "@vue/shared": "^3.4.0", "@vue/typescript-plugin": "2.0.28", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.59", - "volar-service-emmet": "0.0.59", - "volar-service-html": "0.0.59", - "volar-service-json": "0.0.59", - "volar-service-pug": "0.0.59", - "volar-service-pug-beautify": "0.0.59", - "volar-service-typescript": "0.0.59", - "volar-service-typescript-twoslash-queries": "0.0.59", + "volar-service-css": "0.0.61", + "volar-service-emmet": "0.0.61", + "volar-service-html": "0.0.61", + "volar-service-json": "0.0.61", + "volar-service-pug": "0.0.61", + "volar-service-pug-beautify": "0.0.61", + "volar-service-typescript": "0.0.61", + "volar-service-typescript-twoslash-queries": "0.0.61", "vscode-html-languageservice": "^5.2.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" @@ -40,7 +40,7 @@ "devDependencies": { "@types/node": "latest", "@types/path-browserify": "latest", - "@volar/kit": "~2.4.0-alpha.18", + "@volar/kit": "~2.4.0", "vscode-languageserver-protocol": "^3.17.5" } } diff --git a/packages/language-service/tests/utils/createTester.ts b/packages/language-service/tests/utils/createTester.ts index df4c6b9102..e0c9e6f017 100644 --- a/packages/language-service/tests/utils/createTester.ts +++ b/packages/language-service/tests/utils/createTester.ts @@ -22,7 +22,6 @@ function createTester(rootUri: URI) { getProjectVersion: () => '0', getScriptFileNames: () => parsedCommandLine.fileNames, getCompilationSettings: () => parsedCommandLine.options, - getScriptSnapshot, }; const vueLanguagePlugin = createVueLanguagePlugin2( ts, diff --git a/packages/tsc/package.json b/packages/tsc/package.json index 7ede11d22d..044e74a115 100644 --- a/packages/tsc/package.json +++ b/packages/tsc/package.json @@ -16,7 +16,7 @@ "vue-tsc": "./bin/vue-tsc.js" }, "dependencies": { - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/typescript": "~2.4.0", "@vue/language-core": "2.0.28", "semver": "^7.5.4" }, diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json index 47712f9507..d5d28e4397 100644 --- a/packages/typescript-plugin/package.json +++ b/packages/typescript-plugin/package.json @@ -12,7 +12,7 @@ "directory": "packages/typescript-plugin" }, "dependencies": { - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/typescript": "~2.4.0", "@vue/language-core": "2.0.28", "@vue/shared": "^3.4.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4404c0ab9..af9786a46f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,23 +5,6 @@ settings: excludeLinksFromLockfile: false overrides: - '@volar/kit': https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192 - '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 - '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192 - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 - '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192 - '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - '@volar/vscode': https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192 - volar-service-css: https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3 - volar-service-emmet: https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3 - volar-service-html: https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3 - volar-service-json: https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3 - volar-service-markdown: https://pkg.pr.new/volarjs/services/volar-service-markdown@f520ee3 - volar-service-prettyhtml: https://pkg.pr.new/volarjs/services/volar-service-prettyhtml@f520ee3 - volar-service-pug: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3 - volar-service-pug-beautify: https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3 - volar-service-typescript: https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3 - volar-service-typescript-twoslash-queries: https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3 inquirer: 9.2.23 importers: @@ -41,8 +24,8 @@ importers: specifier: latest version: 1.0.14 '@volar/language-service': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + specifier: ~2.4.0 + version: 2.4.0 typescript: specifier: latest version: 5.5.3 @@ -62,8 +45,8 @@ importers: specifier: ^1.82.0 version: 1.91.0 '@volar/vscode': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vscode/vsce': specifier: latest version: 3.0.0 @@ -92,8 +75,8 @@ importers: packages/component-meta: dependencies: '@volar/typescript': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/language-core': specifier: 2.0.28 version: link:../language-core @@ -119,8 +102,8 @@ importers: packages/language-core: dependencies: '@volar/language-core': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/compiler-dom': specifier: ^3.4.0 version: 3.4.31 @@ -156,8 +139,8 @@ importers: specifier: ^1.0.1 version: 1.0.2 '@volar/typescript': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/compiler-sfc': specifier: ^3.4.0 version: 3.4.31 @@ -165,11 +148,11 @@ importers: packages/language-plugin-pug: dependencies: '@volar/source-map': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192 + specifier: ~2.4.0 + version: 2.4.0 volar-service-pug: - specifier: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3 + specifier: 0.0.61 + version: 0.0.61 devDependencies: '@types/node': specifier: latest @@ -181,11 +164,11 @@ importers: packages/language-server: dependencies: '@volar/language-core': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@volar/language-server': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/language-core': specifier: 2.0.28 version: link:../language-core @@ -205,14 +188,14 @@ importers: packages/language-service: dependencies: '@volar/language-core': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@volar/language-service': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@volar/typescript': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/compiler-dom': specifier: ^3.4.0 version: 3.4.31 @@ -232,29 +215,29 @@ importers: specifier: ^1.0.1 version: 1.0.1 volar-service-css: - specifier: https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-emmet: - specifier: https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-html: - specifier: https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-json: - specifier: https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-pug: - specifier: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3 + specifier: 0.0.61 + version: 0.0.61 volar-service-pug-beautify: - specifier: https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-typescript: - specifier: https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) volar-service-typescript-twoslash-queries: - specifier: https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3 - version: https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + specifier: 0.0.61 + version: 0.0.61(@volar/language-service@2.4.0) vscode-html-languageservice: specifier: ^5.2.0 version: 5.3.0 @@ -272,8 +255,8 @@ importers: specifier: latest version: 1.0.2 '@volar/kit': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192(typescript@5.5.3) + specifier: ~2.4.0 + version: 2.4.0(typescript@5.5.3) vscode-languageserver-protocol: specifier: ^3.17.5 version: 3.17.5 @@ -281,8 +264,8 @@ importers: packages/tsc: dependencies: '@volar/typescript': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/language-core': specifier: 2.0.28 version: link:../language-core @@ -300,8 +283,8 @@ importers: packages/typescript-plugin: dependencies: '@volar/typescript': - specifier: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 - version: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + specifier: ~2.4.0 + version: 2.4.0 '@vue/language-core': specifier: 2.0.28 version: link:../language-core @@ -1108,35 +1091,28 @@ packages: '@vitest/utils@2.0.3': resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==} - '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192} - version: 2.4.0-alpha.18 + '@volar/kit@2.4.0': + resolution: {integrity: sha512-uqwtPKhrbnP+3f8hs+ltDYXLZ6Wdbs54IzkaPocasI4aBhqWLht5qXctE1MqpZU52wbH359E0u9nhxEFmyon+w==} peerDependencies: typescript: '*' - '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192} - version: 2.4.0-alpha.18 + '@volar/language-core@2.4.0': + resolution: {integrity: sha512-FTla+khE+sYK0qJP+6hwPAAUwiNHVMph4RUXpxf/FIPKUP61NFrVZorml4mjFShnueR2y9/j8/vnh09YwVdH7A==} - '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192} - version: 2.4.0-alpha.18 + '@volar/language-server@2.4.0': + resolution: {integrity: sha512-rmGIjAxWekWQiGH97Mosb4juiD/hfFYNQKV5Py9r7vDOLSkbIwRhITbwHm88NJKs8P6TNc6w/PfBXN6yjKadJg==} - '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192} - version: 2.4.0-alpha.18 + '@volar/language-service@2.4.0': + resolution: {integrity: sha512-4P3yeQXIL68mLfS3n6P3m02IRg3GnLHUU9k/1PCHEfm5FG9bySkDOc72dbBn2vAa2BxOqm18bmmZXrsWuQ5AOw==} - '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192} - version: 2.4.0-alpha.18 + '@volar/source-map@2.4.0': + resolution: {integrity: sha512-2ceY8/NEZvN6F44TXw2qRP6AQsvCYhV2bxaBPWxV9HqIfkbRydSksTFObCF1DBDNBfKiZTS8G/4vqV6cvjdOIQ==} - '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192} - version: 2.4.0-alpha.18 + '@volar/typescript@2.4.0': + resolution: {integrity: sha512-9zx3lQWgHmVd+JRRAHUSRiEhe4TlzL7U7e6ulWXOxHH/WNYxzKwCvZD7WYWEZFdw4dHfTD9vUR0yPQO6GilCaQ==} - '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192': - resolution: {tarball: https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192} - version: 2.4.0-alpha.18 + '@volar/vscode@2.4.0': + resolution: {integrity: sha512-VOnUgtmu+xGOqVKouRM8ZSeVOFPqmcTDfi3wif5peXpkOPsCgNdS/zns0xunuh9J6Ck5SV+QffPfmNW9XARnxw==} '@vscode/emmet-helper@2.9.3': resolution: {integrity: sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==} @@ -3297,69 +3273,61 @@ packages: jsdom: optional: true - volar-service-css@https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3} - version: 0.0.59 + volar-service-css@0.0.61: + resolution: {integrity: sha512-Ct9L/w+IB1JU8F4jofcNCGoHy6TF83aiapfZq9A0qYYpq+Kk5dH+ONS+rVZSsuhsunq8UvAuF8Gk6B8IFLfniw==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-emmet@https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3} - version: 0.0.59 + volar-service-emmet@0.0.61: + resolution: {integrity: sha512-iiYqBxjjcekqrRruw4COQHZME6EZYWVbkHjHDbULpml3g8HGJHzpAMkj9tXNCPxf36A+f1oUYjsvZt36qPg4cg==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-html@https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3} - version: 0.0.59 + volar-service-html@0.0.61: + resolution: {integrity: sha512-yFE+YmmgqIL5HI4ORqP++IYb1QaGcv+xBboI0WkCxJJ/M35HZj7f5rbT3eQ24ECLXFbFCFanckwyWJVz5KmN3Q==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-json@https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3} - version: 0.0.59 + volar-service-json@0.0.61: + resolution: {integrity: sha512-9PpEib6XE99gFjjjl8IkITktSvfPW39jFAGsHggT6SdlIb8zC7J0+rMjkyVUAUOpWvY5jPqkByX43LcxZvkrdQ==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-pug-beautify@https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3} - version: 0.0.59 + volar-service-pug-beautify@0.0.61: + resolution: {integrity: sha512-FvZEZJdZ64pa3a0u1Urz08g4gHjuPcdMsEsJGiDLYqJnIZEGZRyhHUjSxfmAxihZCzp738W90tOMQDbgeQMGhA==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-pug@https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3} - version: 0.0.59 + volar-service-pug@0.0.61: + resolution: {integrity: sha512-G6cTxFpwedV98JsmQUFHt7BP9+r/VnT4iq0SruKzEG2lpV0iUH6zVa5fZfoKj0zZOtvXvOI1nJDHzV7eULSwCQ==} - volar-service-typescript-twoslash-queries@https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3} - version: 0.0.59 + volar-service-typescript-twoslash-queries@0.0.61: + resolution: {integrity: sha512-99FICGrEF0r1E2tV+SvprHPw9Knyg7BdW2fUch0tf59kG+KG+Tj4tL6tUg+cy8f23O/VXlmsWFMIE+bx1dXPnQ==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true - volar-service-typescript@https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3: - resolution: {tarball: https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3} - version: 0.0.59 + volar-service-typescript@0.0.61: + resolution: {integrity: sha512-4kRHxVbW7wFBHZWRU6yWxTgiKETBDIJNwmJUAWeP0mHaKpnDGj/astdRFKqGFRYVeEYl45lcUPhdJyrzanjsdQ==} peerDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': ~2.4.0 peerDependenciesMeta: '@volar/language-service': optional: true @@ -4382,24 +4350,24 @@ snapshots: loupe: 3.1.1 tinyrainbow: 1.2.0 - '@volar/kit@https://pkg.pr.new/volarjs/volar.js/@volar/kit@ab44192(typescript@5.5.3)': + '@volar/kit@2.4.0(typescript@5.5.3)': dependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 - '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + '@volar/language-service': 2.4.0 + '@volar/typescript': 2.4.0 typesafe-path: 0.2.2 typescript: 5.5.3 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - '@volar/language-core@https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192': + '@volar/language-core@2.4.0': dependencies: - '@volar/source-map': https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192 + '@volar/source-map': 2.4.0 - '@volar/language-server@https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192': + '@volar/language-server@2.4.0': dependencies: - '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 - '@volar/typescript': https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192 + '@volar/language-core': 2.4.0 + '@volar/language-service': 2.4.0 + '@volar/typescript': 2.4.0 path-browserify: 1.0.1 request-light: 0.7.0 vscode-languageserver: 9.0.1 @@ -4407,24 +4375,24 @@ snapshots: vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - '@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192': + '@volar/language-service@2.4.0': dependencies: - '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 + '@volar/language-core': 2.4.0 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - '@volar/source-map@https://pkg.pr.new/volarjs/volar.js/@volar/source-map@ab44192': {} + '@volar/source-map@2.4.0': {} - '@volar/typescript@https://pkg.pr.new/volarjs/volar.js/@volar/typescript@ab44192': + '@volar/typescript@2.4.0': dependencies: - '@volar/language-core': https://pkg.pr.new/volarjs/volar.js/@volar/language-core@ab44192 + '@volar/language-core': 2.4.0 path-browserify: 1.0.1 vscode-uri: 3.0.8 - '@volar/vscode@https://pkg.pr.new/volarjs/volar.js/@volar/vscode@ab44192': + '@volar/vscode@2.4.0': dependencies: - '@volar/language-server': https://pkg.pr.new/volarjs/volar.js/@volar/language-server@ab44192 + '@volar/language-server': 2.4.0 path-browserify: 1.0.1 vscode-languageclient: 9.0.1 vscode-nls: 5.2.0 @@ -6786,61 +6754,61 @@ snapshots: - supports-color - terser - volar-service-css@https://pkg.pr.new/volarjs/services/volar-service-css@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-css@0.0.61(@volar/language-service@2.4.0): dependencies: vscode-css-languageservice: 6.3.0 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-emmet@https://pkg.pr.new/volarjs/services/volar-service-emmet@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-emmet@0.0.61(@volar/language-service@2.4.0): dependencies: '@emmetio/css-parser': 0.4.0 '@emmetio/html-matcher': 1.3.0 '@vscode/emmet-helper': 2.9.3 vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-html@https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-html@0.0.61(@volar/language-service@2.4.0): dependencies: vscode-html-languageservice: 5.3.0 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-json@https://pkg.pr.new/volarjs/services/volar-service-json@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-json@0.0.61(@volar/language-service@2.4.0): dependencies: vscode-json-languageservice: 5.4.0 vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-pug-beautify@https://pkg.pr.new/volarjs/services/volar-service-pug-beautify@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-pug-beautify@0.0.61(@volar/language-service@2.4.0): dependencies: '@johnsoncodehk/pug-beautify': 0.2.2 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-pug@https://pkg.pr.new/volarjs/services/volar-service-pug@f520ee3: + volar-service-pug@0.0.61: dependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 muggle-string: 0.4.1 pug-lexer: 5.0.1 pug-parser: 6.0.0 - volar-service-html: https://pkg.pr.new/volarjs/services/volar-service-html@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192) + volar-service-html: 0.0.61(@volar/language-service@2.4.0) vscode-html-languageservice: 5.3.0 vscode-languageserver-textdocument: 1.0.11 - volar-service-typescript-twoslash-queries@https://pkg.pr.new/volarjs/services/volar-service-typescript-twoslash-queries@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-typescript-twoslash-queries@0.0.61(@volar/language-service@2.4.0): dependencies: vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 - volar-service-typescript@https://pkg.pr.new/volarjs/services/volar-service-typescript@f520ee3(@volar/language-service@https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192): + volar-service-typescript@0.0.61(@volar/language-service@2.4.0): dependencies: path-browserify: 1.0.1 semver: 7.6.2 @@ -6849,7 +6817,7 @@ snapshots: vscode-nls: 5.2.0 vscode-uri: 3.0.8 optionalDependencies: - '@volar/language-service': https://pkg.pr.new/volarjs/volar.js/@volar/language-service@ab44192 + '@volar/language-service': 2.4.0 vscode-css-languageservice@6.3.0: dependencies: