refactor: reorganize packages (vuejs#3685)

Author: johnsoncodehk

.github/workflows/release.yml

@@ -19,10 +19,10 @@ jobs:
       - run: npm i -g pnpm ovsx
       - run: pnpm install --frozen-lockfile --no-optional
       - run: pnpm run build:minify && pnpm ovsx publish
-        working-directory: packages/vscode-vue
+        working-directory: extensions/vscode
         env:
           OVSX_PAT: ${{ secrets.OVSX_PAT }}
       - run: pnpm ovsx publish
-        working-directory: packages/vscode-typescript-vue-plugin
+        working-directory: extensions/vscode-typescript-plugin
         env:
           OVSX_PAT: ${{ secrets.OVSX_PAT }}

.github/workflows/update-html-data.yml

@@ -21,14 +21,14 @@ jobs:
 
       # update data
       - name: Update HTML Data
-        run: cd packages/vue-language-service && npm run update-html-data
+        run: cd packages/language-service && npm run update-html-data
 
       # commit
       - name: Commit
         uses: EndBug/add-and-commit@v9
         with:
           message: "ci(language-service): update html data"
-          add: "packages/vue-language-service/data"
+          add: "packages/language-service/data"
           default_author: github_actions
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,5 +4,5 @@ node_modules
 *.tsbuildinfo
 *.vsix
 .vscode-test-web
-packages/vscode-vue/meta.json
-packages/vscode-vue/stats.html
+extensions/*/meta.json
+extensions/*/stats.html

.vscode/launch.json

@@ -9,7 +9,7 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				// "--disable-extensions",
-				"--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-vue"
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode"
 			],
 			"outFiles": [
 				"${workspaceRoot}/*/*/out/**/*.js"
@@ -26,7 +26,7 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--disable-extensions",
-				"--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-typescript-vue-plugin"
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-typescript-plugin"
 			],
 			"outFiles": [
 				"${workspaceRoot}/*/*/out/**/*.js"
@@ -43,7 +43,7 @@
 			"request": "launch",
 			"args": [
 				"--disable-extensions",
-				"--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-vue",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode",
 				"--extensionDevelopmentKind=web"
 			],
 			"outFiles": [

.vscode/settings.json

@@ -16,5 +16,5 @@
 	"[jsonc]": {
 		"editor.defaultFormatter": "vscode.json-language-features"
 	},
-	"vue.server.path": "./packages/vscode-vue/server.js",
+	"vue.server.path": "./extensions/vscode/server.js",
 }

CHANGELOG.md

@@ -5,7 +5,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vscode-typescript-vue-plugin"
+		"directory": "extensions/vscode-typescript-plugin"
 	},
 	"sponsor": {
 		"url": "https://github.com/sponsors/johnsoncodehk"

README.md

@@ -6,6 +6,6 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../typescript-vue-plugin/tsconfig.json" },
+		{ "path": "../../packages/typescript-plugin/tsconfig.json" },
 	]
 }

packages/vscode-typescript-vue-plugin/.vscodeignore extensions/vscode-typescript-plugin/.vscodeignore

@@ -5,7 +5,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vscode-vue"
+		"directory": "packages/vscode"
 	},
 	"categories": [
 		"Programming Languages"

packages/vscode-typescript-vue-plugin/CHANGELOG.md extensions/vscode-typescript-plugin/CHANGELOG.md

@@ -43,7 +43,7 @@ export async function register(context: vscode.ExtensionContext, client: BaseLan
 				}
 
 				content += '---\n\n';
-				content += `> Have any questions about the report message? You can see how it is composed by inspecting the [source code](https://github.com/vuejs/language-tools/blob/master/packages/vscode-vue/src/features/doctor.ts).\n\n`;
+				content += `> Have any questions about the report message? You can see how it is composed by inspecting the [source code](https://github.com/vuejs/language-tools/blob/master/extensions/vscode/src/features/doctor.ts).\n\n`;
 
 				return content.trim();
 			}

packages/typescript-vue-plugin/LICENSE extensions/vscode-typescript-plugin/LICENSE

@@ -0,0 +1,11 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "out",
+		"rootDir": "src",
+	},
+	"include": [ "src" ],
+	"references": [
+		{ "path": "../../packages/language-server/tsconfig.json" },
+	],
+}

packages/vscode-typescript-vue-plugin/README.md extensions/vscode-typescript-plugin/README.md

@@ -3,22 +3,22 @@
 	"scripts": {
 		"build": "tsc -b",
 		"build-ci": "tsc -b tsconfig.ci.json",
-		"watch": "npm run build && (npm run watch:base & npm run watch:vue & npm run watch:typescript-vue-plugin)",
+		"watch": "npm run build && (npm run watch:base & npm run watch:vue & npm run watch:ts-plugin)",
 		"watch:base": "tsc -b -w",
-		"watch:vue": "cd ./packages/vscode-vue && npm run watch",
-		"watch:typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run watch",
+		"watch:vue": "cd ./extensions/vscode && npm run watch",
+		"watch:ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run watch",
 		"prerelease": "npm run build && npm run test",
 		"version:test": "lerna version --exact --force-publish --yes --sync-workspace-lock --no-push --no-git-tag-version",
-		"release": "npm run release:base && npm run release:vue && npm run release:typescript-vue-plugin",
+		"release": "npm run release:base && npm run release:vue && npm run release:ts-plugin",
 		"release:base": "lerna publish --exact --force-publish --yes --sync-workspace-lock --no-push",
-		"release:vue": "cd ./packages/vscode-vue && npm run release",
-		"release:typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run release",
-		"release:next": "npm run release:next-base && npm run release:next-vue && npm run release:next-typescript-vue-plugin",
+		"release:vue": "cd ./extensions/vscode && npm run release",
+		"release:ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run release",
+		"release:next": "npm run release:next-base && npm run release:next-vue && npm run release:next-ts-plugin",
 		"release:next-base": "npm run release:base -- --dist-tag next",
-		"release:next-vue": "cd ./packages/vscode-vue && npm run release:next",
-		"release:next-typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run release:next",
+		"release:next-vue": "cd ./extensions/vscode && npm run release:next",
+		"release:next-ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run release:next",
 		"test": "vitest run",
-		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./packages/vscode-vue ../volar-starter"
+		"chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter"
 	},
 	"devDependencies": {
 		"@types/node": "latest",

packages/vscode-typescript-vue-plugin/images/icon.png extensions/vscode-typescript-plugin/images/icon.png

@@ -10,7 +10,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-component-meta"
+		"directory": "packages/component-meta"
 	},
 	"dependencies": {
 		"@volar/typescript": "~1.10.4",

packages/vscode-typescript-vue-plugin/package.json extensions/vscode-typescript-plugin/package.json

@@ -6,6 +6,6 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../vue-language-core/tsconfig.json" },
+		{ "path": "../language-core/tsconfig.json" },
 	],
 }

packages/vscode-typescript-vue-plugin/scripts/build.js extensions/vscode-typescript-plugin/scripts/build.js

@@ -9,6 +9,6 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-component-type-helpers"
+		"directory": "packages/component-type-helpers"
 	}
 }

packages/vscode-typescript-vue-plugin/tsconfig.json extensions/vscode-typescript-plugin/tsconfig.json

@@ -10,7 +10,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-language-core"
+		"directory": "packages/language-core"
 	},
 	"dependencies": {
 		"@volar/language-core": "~1.10.4",

packages/vscode-vue/.vscodeignore extensions/vscode/.vscodeignore

@@ -17,7 +17,7 @@
 				"extensions": {
 					"type": "array",
 					"default": [ ".vue" ],
-					"markdownDescription": "Valid file extensions that should be considered as regular Vue SFC, please note that you should not use this option separately for additional file extensions IDE support, see https://github.com/vuejs/language-tools/tree/master/packages/vscode-vue/README.md#custom-file-extensions."
+					"markdownDescription": "Valid file extensions that should be considered as regular Vue SFC, please note that you should not use this option separately for additional file extensions IDE support, see https://github.com/vuejs/language-tools/tree/master/extensions/vscode/README.md#custom-file-extensions."
 				},
 				"lib": {
 					"default": "",

packages/vscode-vue/CHANGELOG.md extensions/vscode/CHANGELOG.md

@@ -10,7 +10,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-language-plugin-pug"
+		"directory": "packages/language-plugin-pug"
 	},
 	"devDependencies": {
 		"@vue/language-core": "1.8.20"

packages/vscode-typescript-vue-plugin/LICENSE extensions/vscode/LICENSE

@@ -6,6 +6,6 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../vue-language-core/tsconfig.json" },
+		{ "path": "../language-core/tsconfig.json" },
 	],
 }

packages/vscode-vue/README.md extensions/vscode/README.md

@@ -13,7 +13,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-language-server"
+		"directory": "packages/language-server"
 	},
 	"dependencies": {
 		"@volar/language-core": "~1.10.4",

packages/vscode-vue/client.js extensions/vscode/client.js

@@ -6,7 +6,8 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../vue-language-core/tsconfig.json" },
-		{ "path": "../vue-typescript/tsconfig.json" },
+		{ "path": "../language-core/tsconfig.json" },
+		{ "path": "../language-service/tsconfig.json" },
+		{ "path": "../component-meta/tsconfig.json" },
 	],
 }

packages/vscode-vue/images/icon.png extensions/vscode/images/icon.png

@@ -11,7 +11,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-language-service"
+		"directory": "packages/language-service"
 	},
 	"scripts": {
 		"update-html-data": "node ./scripts/update-html-data.js"

packages/vscode-vue/images/split-editors.png extensions/vscode/images/split-editors.png

@@ -6,6 +6,6 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../vue-language-server/tsconfig.json" },
+		{ "path": "../language-core/tsconfig.json" },
 	],
 }

packages/vscode-vue/languages/markdown-language-configuration.json extensions/vscode/languages/markdown-language-configuration.json

@@ -11,7 +11,7 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-tsc-eslint"
+		"directory": "packages/tsc-eslint"
 	},
 	"devDependencies": {
 		"@types/eslint": "latest",

packages/vscode-vue/languages/sfc-template-language-configuration.json extensions/vscode/languages/sfc-template-language-configuration.json

@@ -14,7 +14,7 @@ export = async function (
 		useEslintrc: false,
 	});
 	const fileNames = program.__vue.languageHost.getScriptFileNames();
-	const mapper = program.__vue.languageService.__internal__.context.virtualFiles;
+	const mapper = program.__vue.langaugeContext.virtualFiles;
 	const formatter = await eslint.loadFormatter();
 
 	for (const fileName of fileNames) {

packages/vscode-vue/languages/vue-language-configuration.json extensions/vscode/languages/vue-language-configuration.json

@@ -6,6 +6,6 @@
 	},
 	"include": [ "src" ],
 	"references": [
-		{ "path": "../vue-tsc/tsconfig.json" },
+		{ "path": "../tsc/tsconfig.json" },
 	],
 }

packages/vscode-vue/package.json extensions/vscode/package.json

@@ -11,14 +11,14 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
-		"directory": "packages/vue-tsc"
+		"directory": "packages/tsc"
 	},
 	"bin": {
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
+		"@volar/typescript": "~1.10.4",
 		"@vue/language-core": "1.8.20",
-		"@vue/typescript": "1.8.20",
 		"semver": "^7.5.4"
 	},
 	"peerDependencies": {