Merge branch 'master' into refactor/direct-access

.github/FUNDING.yml

@@ -1,2 +1 @@
 github: johnsoncodehk
-open_collective: volarjs

CHANGELOG.md

@@ -1,5 +1,71 @@
 # Changelog
 
+## 2.1.0-insiders.8 (2024/5/1)
+
+Download Pages: [GitHub Releases](https://github.com/volarjs/insiders/releases/tag/v2.1.0-insiders.8), [爱发电电圈](https://afdian.net/p/f45436ca076d11ef9b7352540025c377)
+
+> [Join the Insiders Program](https://github.com/vuejs/language-tools/wiki/Get-Insiders-Edition) for more exclusive features and updates.
+
+### Other Changes
+
+- Merged [v2.0.16](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md#2016-202451).
+
+## 2.0.16 (2024/5/1)
+
+### Bug Fixes
+
+- **language-core:** virtual document language ID is not updated when changing SFC style block lang
+- **language-core:** correct logic for `defineSlots` destructuring (#4326) - Thanks @zhiyuanzmj
+- **language-core:** ObjectDirective does not work with `defineSlots` (#4327)
+- **language-service:** emmet not working in postcss style block (https://github.com/volarjs/volar.js/issues/169)
+
+### Other Changes
+
+- Upgrade to [Volar 2.2](https://github.com/volarjs/volar.js/releases/tag/v2.2.0)
+- **language-core:** export `VueEmbeddedCode` (#4265) - Thanks @zhiyuanzmj
+- **typescript-plugin:** expose `FileRegistry` to `project.program` (#3963) - Thanks @zcf0508
+- **vscode:** remove outdated formatters section (#4243) - Thanks @BBboy01
+
+## 2.1.0-insiders.7 (2024/4/30)
+
+Download Pages: [GitHub Releases](https://github.com/volarjs/insiders/releases/tag/v2.1.0-insiders.7), [爱发电电圈](https://afdian.net/p/84db515c069b11ef9eaf52540025c377)
+
+> [Join the Insiders Program](https://github.com/vuejs/language-tools/wiki/Get-Insiders-Edition) for more exclusive features and updates.
+
+### Other Changes
+
+- Merged [v2.0.15](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md#2015-2024430).
+
+## 2.0.15 (2024/4/30)
+
+### Features
+
+- Redesign additional extensions, VitePress, PetiteVue support (#4321)
+ - Fix custom file extensions not working in Hybrid Mode (#4251)
+- **vscode:** prompt when Hybrid Mode is explicitly enabled but known incompatible extensions are installed
+- **language-core:** use internal options for directly exposing user props/emits types ([vuejs/core#10801](https://github.com/vuejs/core/pull/10801))
+- **language-core:** support defineSlots destructuring (#4312) - Thanks @zhiyuanzmj
+
+### Bug Fixes
+
+- **vscode:** when enabled VitePress support, extension not activated when opening markdown files
+- **language-core:** auto-complete not working in v-bind
+
+### Performance
+
+- **language-service:** emmet completion should not be blocked by TS type evaluation (#4298)
+- **language-core:** simplify virtual code for intrinsic elements
+
+### Other Changes
+
+- Upgrade Volar from `v2.2.0-alpha.10` to `v2.2.0-alpha.12`:
+ - Avoid extension crash when workspace TSDK does not exist
+ - Fix template variables cannot be renamed at the first character in Hybrid Mode (#4297)
+ - Fix template virtual code mapping is misaligned in Windows in Hybrid Mode (#4297)
+- Add `svelte.svelte-vscode` (>=108.4.0) to Hybrid Mode compatibility whitelist ([sveltejs/language-tools#2317](https://github.com/sveltejs/language-tools/pull/2317))
+- **component-meta:** convert source code to TS
+- **language-core:** export `allCodeFeatures` (#4320) - Thanks @zhiyuanzmj
+
 ## 2.1.0-insiders.6 (2024/4/25)
 
 Download Pages: [GitHub Releases](https://github.com/volarjs/insiders/releases/tag/v2.1.0-insiders.6), [爱发电电圈](https://afdian.net/p/f73a772602ab11efa33652540025c377)

README.md

@@ -319,7 +319,7 @@ flowchart LR
 <p align="center">
  <span>
   <a href="https://stackblitz.com/">
-  <img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/StackBlitz.png" height="80" />
+  <img src="https://raw.githubusercontent.com/johnsoncodehk/sponsors/master/logos/StackBlitz.svg" height="80" />
   <h4 align="center">Boot a fresh environment in milliseconds.</h4>
   </a>
  </span>

extensions/vscode/README.md

@@ -254,8 +254,3 @@ Finally you need to make VS Code recognize your new extension and automatically
 - [angular](https://github.com/angular/angular) shows how TS server plugin working with language service.
 - Syntax highlight is rewritten base on [vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight).
 - [vscode-fenced-code-block-grammar-injection-example](https://github.com/mjbvz/vscode-fenced-code-block-grammar-injection-example) shows how to inject vue syntax highlight to markdown.
-- Out of the box formatting working by (If you would like to use other formatters, checkout https://github.com/vuejs/language-tools-plugins):
- - [vscode-html-languageservice](https://github.com/microsoft/vscode-html-languageservice): html
- - [vscode-css-languageservice](https://github.com/microsoft/vscode-css-languageservice): css, less, scss, postcss
- - [pug-beautify](https://github.com/vingorius/pug-beautify): pug
- - [typescript](https://github.com/microsoft/TypeScript): js, ts, jsx, tsx

extensions/vscode/package.json

@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "volar",
- "version": "2.0.14",
+ "version": "2.0.16",
  "repository": {
  "type": "git",
  "url": "https://github.com/vuejs/language-tools.git",
@@ -515,10 +515,10 @@
  "devDependencies": {
  "@types/semver": "^7.5.3",
  "@types/vscode": "^1.82.0",
- "@volar/vscode": "2.2.0-alpha.10",
- "@vue/language-core": "2.0.14",
- "@vue/language-server": "2.0.14",
- "@vue/typescript-plugin": "2.0.14",
+ "@volar/vscode": "~2.2.0",
+ "@vue/language-core": "2.0.16",
+ "@vue/language-server": "2.0.16",
+ "@vue/typescript-plugin": "2.0.16",
  "esbuild": "latest",
  "esbuild-plugin-copy": "latest",
  "esbuild-visualizer": "latest",

extensions/vscode/src/common.ts

@@ -1,14 +1,14 @@
-import { DiagnosticModel, VueInitializationOptions } from '@vue/language-server';
-import * as vscode from 'vscode';
 import * as lsp from '@volar/vscode';
+import { quickPick } from '@volar/vscode/lib/common';
+import type { VueInitializationOptions } from '@vue/language-server';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as semver from 'semver';
+import * as vscode from 'vscode';
 import { config } from './config';
 import * as doctor from './features/doctor';
 import * as nameCasing from './features/nameCasing';
 import * as splitEditors from './features/splitEditors';
-import * as semver from 'semver';
-import * as fs from 'fs';
-import * as path from 'path';
-import { quickPick } from '@volar/vscode/lib/common';
 
 let client: lsp.BaseLanguageClient;
 
@@ -437,13 +437,8 @@ async function getInitializationOptions(
  hybridMode: boolean,
 ): Promise<VueInitializationOptions> {
  return {
- diagnosticModel: enabledHybridMode ? DiagnosticModel.Pull : DiagnosticModel.Push,
  typescript: { tsdk: (await lsp.getTsdk(context)).tsdk },
  maxFileSize: config.server.maxFileSize,
- semanticTokensLegend: {
- tokenTypes: [],
- tokenModifiers: [],
- },
  vue: {
  hybridMode,
  },

insiders.json

@@ -1,6 +1,22 @@
 {
- "latest": "2.1.0-insiders.6",
+ "latest": "2.1.0-insiders.8",
  "versions": [
+ {
+ "version": "2.1.0-insiders.8",
+ "date": "2024-5-1",
+ "downloads": {
+ "GitHub": "https://github.com/volarjs/insiders/releases/tag/v2.1.0-insiders.8",
+ "AFDIAN": "https://afdian.net/p/f45436ca076d11ef9b7352540025c377"
+ }
+ },
+ {
+ "version": "2.1.0-insiders.7",
+ "date": "2024-4-30",
+ "downloads": {
+ "GitHub": "https://github.com/volarjs/insiders/releases/tag/v2.1.0-insiders.7",
+ "AFDIAN": "https://afdian.net/p/84db515c069b11ef9eaf52540025c377"
+ }
+ },
  {
  "version": "2.1.0-insiders.6",
  "date": "2024-4-25",