feat: upgrade volar and update rules api

vuejs · May 4, 2023 · 0364210 · 0364210
1 parent cfad0ad
commit 0364210
Show file tree

Hide file tree

Showing 11 changed files with 138 additions and 163 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
  },
  "devDependencies": {
  "@types/node": "latest",
- "@volar/language-service": "1.5.0",
+ "@volar/language-service": "1.5.1",
  "typescript": "latest",
  "vite": "latest",
  "vitest": "0.25.8"

diff --git a/packages/vscode-vue/package.json b/packages/vscode-vue/package.json
@@ -741,8 +741,8 @@
  "devDependencies": {
  "@types/semver": "^7.3.13",
  "@types/vscode": "1.67.0",
- "@volar/source-map": "1.5.0",
- "@volar/vscode": "1.5.0",
+ "@volar/source-map": "1.5.1",
+ "@volar/vscode": "1.5.1",
  "@volar/vue-language-core": "1.6.4",
  "@volar/vue-language-server": "1.6.4",
  "esbuild": "0.15.18",

diff --git a/packages/vue-component-meta/package.json b/packages/vue-component-meta/package.json
@@ -13,7 +13,7 @@
  "directory": "packages/vue-component-meta"
  },
  "dependencies": {
- "@volar/language-core": "1.5.0",
+ "@volar/language-core": "1.5.1",
  "@volar/vue-language-core": "1.6.4",
  "typesafe-path": "^0.2.2",
  "vue-component-type-helpers": "1.6.4"

diff --git a/packages/vue-language-core/package.json b/packages/vue-language-core/package.json
@@ -13,8 +13,8 @@
  "directory": "packages/vue-language-core"
  },
  "dependencies": {
- "@volar/language-core": "1.5.0",
- "@volar/source-map": "1.5.0",
+ "@volar/language-core": "1.5.1",
+ "@volar/source-map": "1.5.1",
  "@vue/compiler-dom": "^3.3.0-beta.3",
  "@vue/compiler-sfc": "^3.3.0-beta.3",
  "@vue/reactivity": "^3.3.0-beta.3",

diff --git a/packages/vue-language-plugin-pug/package.json b/packages/vue-language-plugin-pug/package.json
@@ -16,8 +16,8 @@
  "@volar/vue-language-core": "1.6.4"
  },
  "dependencies": {
- "@volar/language-service": "1.5.0",
- "@volar/source-map": "1.5.0",
- "volar-service-pug": "0.0.0"
+ "@volar/language-service": "1.5.1",
+ "@volar/source-map": "1.5.1",
+ "volar-service-pug": "0.0.1"
  }
 }
diff --git a/packages/vue-language-server/package.json b/packages/vue-language-server/package.json
@@ -16,8 +16,8 @@
  "directory": "packages/vue-language-server"
  },
  "dependencies": {
- "@volar/language-core": "1.5.0",
- "@volar/language-server": "1.5.0",
+ "@volar/language-core": "1.5.1",
+ "@volar/language-server": "1.5.1",
  "@volar/vue-language-core": "1.6.4",
  "@volar/vue-language-service": "1.6.4",
  "vscode-languageserver-protocol": "^3.17.3",

diff --git a/packages/vue-language-service/package.json b/packages/vue-language-service/package.json
@@ -17,21 +17,21 @@
  "update-html-data": "node ./scripts/update-html-data.js"
  },
  "dependencies": {
- "@volar/language-core": "1.5.0",
- "@volar/language-service": "1.5.0",
- "@volar/source-map": "1.5.0",
+ "@volar/language-core": "1.5.1",
+ "@volar/language-service": "1.5.1",
+ "@volar/source-map": "1.5.1",
  "@volar/vue-language-core": "1.6.4",
  "@vue/compiler-dom": "^3.3.0-beta.3",
  "@vue/reactivity": "^3.3.0-beta.3",
  "@vue/shared": "^3.3.0-beta.3",
- "volar-service-css": "0.0.0",
- "volar-service-emmet": "0.0.0",
- "volar-service-html": "0.0.0",
- "volar-service-json": "0.0.0",
- "volar-service-pug": "0.0.0",
- "volar-service-pug-beautify": "0.0.0",
- "volar-service-typescript": "0.0.0",
- "volar-service-typescript-twoslash-queries": "0.0.0",
+ "volar-service-css": "0.0.1",
+ "volar-service-emmet": "0.0.1",
+ "volar-service-html": "0.0.1",
+ "volar-service-json": "0.0.1",
+ "volar-service-pug": "0.0.1",
+ "volar-service-pug-beautify": "0.0.1",
+ "volar-service-typescript": "0.0.1",
+ "volar-service-typescript-twoslash-queries": "0.0.1",
  "vscode-html-languageservice": "^5.0.4",
  "vscode-json-languageservice": "^5.2.0",
  "vscode-languageserver-protocol": "^3.17.3",

diff --git a/packages/vue-language-service/src/index.ts b/packages/vue-language-service/src/index.ts
@@ -2,3 +2,4 @@ export * from '@volar/language-service';
 export * from './ideFeatures/nameCasing';
 export * from './languageService';
 export * from './types';
+export { rulesInjectionKey } from './plugins/vue';
diff --git a/packages/vue-language-service/src/plugins/vue.ts b/packages/vue-language-service/src/plugins/vue.ts
@@ -1,4 +1,4 @@
-import { Service } from '@volar/language-service';
+import { InjectionKey, Service } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import * as vscode from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
@@ -8,6 +8,10 @@ import { loadLanguageBlocks } from './data';
 
 let sfcDataProvider: html.IHTMLDataProvider | undefined;
 
+export const rulesInjectionKey: InjectionKey<{
+ vueFile: vue.VueFile;
+}> = Symbol();
+
 export default (): Service => (context) => {
 
  const htmlPlugin = createHtmlPlugin({ validLang: 'vue', disableCustomData: true })(context);
@@ -23,22 +27,22 @@ export default (): Service => (context) => {
 
  return {
 
- ...htmlPlugin,
-
- resolveRuleContext(context) {
- worker(context.document, (vueSourceFile) => {
- if (vueSourceFile.parsedSfc) {
- context.vue = {
- sfc: vueSourceFile.parsedSfc,
- templateAst: vueSourceFile.sfc.templateAst,
- scriptAst: vueSourceFile.sfc.scriptAst,
- scriptSetupAst: vueSourceFile.sfc.scriptSetupAst,
- };
- }
- });
- return context;
+ rules: {
+ provide: {
+ vue(document) {
+ return worker(document, (vueSourceFile) => {
+ if (vueSourceFile) {
+ return {
+ vueFile: vueSourceFile,
+ };
+ }
+ });
+ },
+ }
  },
 
+ ...htmlPlugin,
+
  provideSemanticDiagnostics(document) {
  return worker(document, (vueSourceFile) => {
 

diff --git a/packages/vue-typescript/package.json b/packages/vue-typescript/package.json
@@ -13,7 +13,7 @@
  "directory": "packages/vue-typescript"
  },
  "dependencies": {
- "@volar/typescript": "1.5.0",
+ "@volar/typescript": "1.5.1",
  "@volar/vue-language-core": "1.6.4"
  },
  "peerDependencies": {