Merge branch 'master' into feat/v-bind-shorthand

.gitignore

@@ -6,3 +6,10 @@ node_modules
 .vscode-test-web
 extensions/*/meta.json
 extensions/*/stats.html
+
+packages/*/*.d.ts
+packages/*/*.js
+packages/*/*.map
+packages/*/lib/**/*.d.ts
+packages/*/lib/**/*.js
+packages/*/lib/**/*.map

.vscode/launch.json

@@ -12,7 +12,8 @@
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode"
 			],
 			"outFiles": [
-				"${workspaceRoot}/*/*/out/**/*.js"
+				"${workspaceRoot}/*/*/*.js",
+				"${workspaceRoot}/*/*/lib/**/*.js"
 			],
 			"preLaunchTask": {
 				"type": "npm",
@@ -30,7 +31,8 @@
 				"--extensionDevelopmentKind=web"
 			],
 			"outFiles": [
-				"${workspaceRoot}/*/*/out/**/*.js"
+				"${workspaceRoot}/*/*/*.js",
+				"${workspaceRoot}/*/*/lib/**/*.js"
 			],
 			"preLaunchTask": {
 				"type": "npm",
@@ -44,7 +46,8 @@
 			"port": 6009,
 			"restart": true,
 			"outFiles": [
-				"${workspaceRoot}/*/*/out/**/*.js"
+				"${workspaceRoot}/*/*/*.js",
+				"${workspaceRoot}/*/*/lib/**/*.js"
 			]
 		}
 	],

.vscode/settings.json

@@ -17,4 +17,12 @@
 		"editor.defaultFormatter": "vscode.json-language-features"
 	},
 	"vue.server.path": "./extensions/vscode/server.js",
+	"files.exclude": {
+		"packages/*/*.d.ts": true,
+		"packages/*/*.js": true,
+		"packages/*/*.map": true,
+		"packages/*/lib/**/*.d.ts": true,
+		"packages/*/lib/**/*.js": true,
+		"packages/*/lib/**/*.map": true
+	}
 }

extensions/vscode/CHANGELOG.md

@@ -1 +1 @@
-For a full change history, refer to the [CHANGELOG](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) on the Volar GitHub site.
+For a full change history, refer to the [CHANGELOG](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) on the GitHub site.

extensions/vscode/README.md

@@ -13,7 +13,7 @@ Vue Language Features is a language support extension built for Vue, Vitepress a
 - [create-vue](https://github.com/vuejs/create-vue)
 - [Vitesse](https://github.com/antfu/vitesse)
 - [petite](https://github.com/JessicaSachs/petite)
-- [vue3-eslint-stylelint-demo](https://github.com/sethidden/vue3-eslint-stylelint-demo) (Volar + ESLint + stylelint + husky)
+
 - [volar-starter](https://github.com/johnsoncodehk/volar-starter) (For bug report and experiment features testing)
 
 ## Usage

extensions/vscode/package.json

@@ -14,8 +14,8 @@
 		"url": "https://github.com/sponsors/johnsoncodehk"
 	},
 	"icon": "images/icon.png",
-	"displayName": "Vue Language Features (Volar)",
-	"description": "Language support for Vue 3",
+	"displayName": "Vue Language Support - Official",
+	"description": "Language Support for Vue",
 	"author": "johnsoncodehk",
 	"publisher": "Vue",
 	"engines": {
@@ -32,15 +32,6 @@
 		"virtualWorkspaces": {
 			"supported": "limited",
 			"description": "Install https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.vscode-typescript-web to have IntelliSense for .vue files in Web IDE."
-		},
-		"untrustedWorkspaces": {
-			"supported": "limited",
-			"description": "%volar.workspaceTrust.description%",
-			"restrictedConfigurations": [
-				"typescript.tsdk",
-				"typescript.tsserver.pluginPaths",
-				"typescript.npm"
-			]
 		}
 	},
 	"contributes": {
@@ -281,69 +272,8 @@
 		],
 		"configuration": {
 			"type": "object",
-			"title": "Volar",
+			"title": "Vue",
 			"properties": {
-				"volar.format.initialIndent": {
-					"type": "object",
-					"description": "Whether to have initial indent.",
-					"default": {
-						"html": true
-					},
-					"properties": {
-						"html": {
-							"type": "boolean",
-							"default": true
-						},
-						"typescript": {
-							"type": "boolean",
-							"default": false
-						},
-						"javascript": {
-							"type": "boolean",
-							"default": false
-						},
-						"typescriptreact": {
-							"type": "boolean",
-							"default": false
-						},
-						"javascriptreact": {
-							"type": "boolean",
-							"default": false
-						},
-						"css": {
-							"type": "boolean",
-							"default": false
-						},
-						"scss": {
-							"type": "boolean",
-							"default": false
-						},
-						"less": {
-							"type": "boolean",
-							"default": false
-						},
-						"sass": {
-							"type": "boolean",
-							"default": false
-						},
-						"jade": {
-							"type": "boolean",
-							"default": false
-						},
-						"json": {
-							"type": "boolean",
-							"default": false
-						},
-						"jsonc": {
-							"type": "boolean",
-							"default": false
-						},
-						"json5": {
-							"type": "boolean",
-							"default": false
-						}
-					}
-				},
 				"vue.trace.server": {
 					"scope": "window",
 					"type": "string",
@@ -406,11 +336,6 @@
 					"default": null,
 					"description": "Set --max-old-space-size option on server process. If you have problem on frequently \"Request textDocument/** failed.\" error, try setting higher memory(MB) on it."
 				},
-				"vue.server.reverseConfigFilePriority": {
-					"type": "boolean",
-					"default": false,
-					"description": "Reverse priority for tsconfig pickup."
-				},
 				"vue.server.additionalExtensions": {
 					"type": "array",
 					"items": {
@@ -419,11 +344,6 @@
 					"default": [ ],
 					"description": "List any additional file extensions that should be processed as Vue files (requires restart)."
 				},
-				"vue.server.fullCompletionList": {
-					"type": "boolean",
-					"default": false,
-					"description": "Enable this option if you want to get complete CompletionList in language client. (Disable for better performance)"
-				},
 				"vue.doctor.status": {
 					"type": "boolean",
 					"default": true,
@@ -542,29 +462,36 @@
 					"type": "boolean",
 					"default": false,
 					"description": "Show inlay hints for v-bind shorthand."
+				},
+				"vue.format.template.initialIndent": {
+					"type": "boolean",
+					"default": true
+				},
+				"vue.format.style.initialIndent": {
+					"type": "boolean",
+					"default": false
+				},
+				"vue.format.script.initialIndent": {
+					"type": "boolean",
+					"default": false
 				}
 			}
 		},
 		"commands": [
 			{
-				"command": "volar.action.doctor",
+				"command": "vue.action.doctor",
 				"title": "Doctor",
-				"category": "Volar"
+				"category": "Vue"
 			},
 			{
-				"command": "volar.action.writeVirtualFiles",
+				"command": "vue.action.writeVirtualFiles",
 				"title": "Write Virtual Files",
-				"category": "Volar (Debug)"
-			},
-			{
-				"command": "volar.action.showComponentMeta",
-				"title": "Show Component Meta",
-				"category": "Volar"
+				"category": "Vue (Debug)"
 			},
 			{
-				"command": "volar.action.splitEditors",
+				"command": "vue.action.splitEditors",
 				"title": "Split <script>, <template>, <style> Editors",
-				"category": "Volar",
+				"category": "Vue",
 				"icon": "images/split-editors.png"
 			}
 		],
@@ -599,21 +526,21 @@
 					"when": "editorLangId == vue"
 				},
 				{
-					"command": "volar.action.doctor",
-					"when": "volar.activated"
+					"command": "vue.action.doctor",
+					"when": "vue.activated"
 				},
 				{
-					"command": "volar.action.writeVirtualFiles",
-					"when": "volar.activated"
+					"command": "vue.action.writeVirtualFiles",
+					"when": "vue.activated"
 				},
 				{
-					"command": "volar.action.splitEditors",
+					"command": "vue.action.splitEditors",
 					"when": "editorLangId == vue"
 				}
 			],
 			"editor/title": [
 				{
-					"command": "volar.action.splitEditors",
+					"command": "vue.action.splitEditors",
 					"when": "resourceLangId == vue && config.vue.splitEditors.icon",
 					"group": "navigation"
 				}
@@ -648,14 +575,14 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.0.2",
+		"@volar/vscode": "~2.1.0",
 		"@vue/language-core": "1.8.27",
 		"@vue/language-server": "1.8.27",
+		"@vue/typescript-plugin": "1.8.27",
 		"esbuild": "latest",
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",
 		"semver": "^7.5.4",
-		"typescript-vue-plugin": "1.8.27",
 		"vsce": "latest",
 		"vscode-languageclient": "^9.0.1"
 	}

extensions/vscode/scripts/build.js

@@ -64,7 +64,7 @@ require('esbuild').context({
 })
 
 require('esbuild').context({
-	entryPoints: ['./node_modules/typescript-vue-plugin/out/index.js'],
+	entryPoints: ['./node_modules/@vue/typescript-plugin/index.js'],
 	bundle: true,
 	outfile: './node_modules/typescript-vue-plugin-bundle/index.js',
 	external: ['vscode'],