Skip to content

Commit

Permalink
chore: bump volar
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnsoncodehk
johnsoncodehk committed Mar 28, 2024
1 parent 416882d commit 03e3774
Show file tree
Hide file tree
Showing 12 changed files with 134 additions and 126 deletions.
2 changes: 1 addition & 1 deletion extensions/vscode/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
"devDependencies": {
"@types/semver": "^7.5.3",
"@types/vscode": "^1.82.0",
"@volar/vscode": "~2.2.0-alpha.0",
"@volar/vscode": "~2.2.0-alpha.1",
"@vue/language-core": "2.0.7",
"@vue/language-server": "2.0.7",
"@vue/typescript-plugin": "2.0.7",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"@lerna-lite/cli": "latest",
"@lerna-lite/publish": "latest",
"@volar/language-service": "~2.2.0-alpha.0",
"@volar/language-service": "~2.2.0-alpha.1",
"@volar/tsl-config": "latest",
"tsl": "latest",
"typescript": "latest",
Expand Down
2 changes: 1 addition & 1 deletion packages/component-meta/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"directory": "packages/component-meta"
},
"dependencies": {
"@volar/typescript": "~2.2.0-alpha.0",
"@volar/typescript": "~2.2.0-alpha.1",
"@vue/language-core": "2.0.7",
"path-browserify": "^1.0.1",
"vue-component-type-helpers": "2.0.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/language-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"directory": "packages/language-core"
},
"dependencies": {
"@volar/language-core": "~2.2.0-alpha.0",
"@volar/language-core": "~2.2.0-alpha.1",
"@vue/compiler-dom": "^3.4.0",
"@vue/shared": "^3.4.0",
"computeds": "^0.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/language-plugin-pug/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@vue/language-core": "2.0.7"
},
"dependencies": {
"@volar/source-map": "~2.2.0-alpha.0",
"volar-service-pug": "0.0.35"
"@volar/source-map": "~2.2.0-alpha.1",
"volar-service-pug": "0.0.37"
}
}
4 changes: 2 additions & 2 deletions packages/language-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"directory": "packages/language-server"
},
"dependencies": {
"@volar/language-core": "~2.2.0-alpha.0",
"@volar/language-server": "~2.2.0-alpha.0",
"@volar/language-core": "~2.2.0-alpha.1",
"@volar/language-server": "~2.2.0-alpha.1",
"@vue/language-core": "2.0.7",
"@vue/language-service": "2.0.7",
"@vue/typescript-plugin": "2.0.7",
Expand Down
6 changes: 5 additions & 1 deletion packages/language-service/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,14 @@ export function createDefaultGetTsPluginClient(
if (!context.language.typescript) {
return;
}
const languageService = context.inject<(import('volar-service-typescript').Provide), 'typescript/languageService'>('typescript/languageService');
if (!languageService) {
return;
}
const requestContext = {
typescript: ts,
language: context.language,
languageService: context.inject<(import('volar-service-typescript').Provide), 'typescript/languageService'>('typescript/languageService'),
languageService,
vueOptions: getVueOptions(context.env),
isTsPlugin: false,
getFileId: context.env.typescript!.fileNameToUri,
Expand Down
6 changes: 5 additions & 1 deletion packages/language-service/lib/plugins/vue-template.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ export function create(
if (!isSupportedDocument(document)) {
return;
}
const languageService = context.inject<(import('volar-service-typescript').Provide), 'typescript/languageService'>('typescript/languageService');
if (!languageService) {
return;
}
const decoded = context.decodeEmbeddedDocumentUri(document.uri);
const sourceScript = decoded && context.language.scripts.get(decoded[0]);
if (
Expand All @@ -350,7 +354,7 @@ export function create(
const spans = getComponentSpans.call(
{
files: context.language.scripts,
languageService: context.inject<(import('volar-service-typescript').Provide), 'typescript/languageService'>('typescript/languageService'),
languageService,
typescript: ts,
vueOptions: getVueOptions(context.env),
},
Expand Down
24 changes: 12 additions & 12 deletions packages/language-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
"update-html-data": "node ./scripts/update-html-data.js"
},
"dependencies": {
"@volar/language-core": "~2.2.0-alpha.0",
"@volar/language-service": "~2.2.0-alpha.0",
"@volar/typescript": "~2.2.0-alpha.0",
"@volar/language-core": "~2.2.0-alpha.1",
"@volar/language-service": "~2.2.0-alpha.1",
"@volar/typescript": "~2.2.0-alpha.1",
"@vue/compiler-dom": "^3.4.0",
"@vue/language-core": "2.0.7",
"@vue/shared": "^3.4.0",
"@vue/typescript-plugin": "2.0.7",
"computeds": "^0.0.1",
"path-browserify": "^1.0.1",
"volar-service-css": "0.0.35",
"volar-service-emmet": "0.0.35",
"volar-service-html": "0.0.35",
"volar-service-json": "0.0.35",
"volar-service-pug": "0.0.35",
"volar-service-pug-beautify": "0.0.35",
"volar-service-typescript": "0.0.35",
"volar-service-typescript-twoslash-queries": "0.0.35",
"volar-service-css": "0.0.37",
"volar-service-emmet": "0.0.37",
"volar-service-html": "0.0.37",
"volar-service-json": "0.0.37",
"volar-service-pug": "0.0.37",
"volar-service-pug-beautify": "0.0.37",
"volar-service-typescript": "0.0.37",
"volar-service-typescript-twoslash-queries": "0.0.37",
"vscode-html-languageservice": "^5.1.0",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
},
"devDependencies": {
"@types/node": "latest",
"@types/path-browserify": "latest",
"@volar/kit": "~2.2.0-alpha.0",
"@volar/kit": "~2.2.0-alpha.1",
"vscode-languageserver-protocol": "^3.17.5"
}
}
2 changes: 1 addition & 1 deletion packages/tsc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"vue-tsc": "./bin/vue-tsc.js"
},
"dependencies": {
"@volar/typescript": "~2.2.0-alpha.0",
"@volar/typescript": "~2.2.0-alpha.1",
"@vue/language-core": "2.0.7",
"semver": "^7.5.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"directory": "packages/typescript-plugin"
},
"dependencies": {
"@volar/typescript": "~2.2.0-alpha.0",
"@volar/typescript": "~2.2.0-alpha.1",
"@vue/language-core": "2.0.7",
"@vue/shared": "^3.4.0"
},
Expand Down
Loading

0 comments on commit 03e3774

Please sign in to comment.