refactor(tsc): deprecate hooks api (#3793)

vuejs · Dec 12, 2023 · 59a80f8 · 59a80f8
1 parent f0d1af7
commit 59a80f8
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 567 deletions.
diff --git a/packages/language-core/schemas/vue-tsconfig.deprecated.schema.json b/packages/language-core/schemas/vue-tsconfig.deprecated.schema.json
@@ -57,6 +57,12 @@
 				"experimentalRfc436": {
 					"deprecated": true
 				},
+				"hooks": {
+					"deprecated": true,
+					"type": "array",
+					"description": "Deprecated since v2.0.0.",
+					"markdownDescription": "https://github.com/vuejs/language-tools/pull/2217"
+				},
 				"narrowingTypesInInlineHandlers": {
 					"deprecated": true
 				},

diff --git a/packages/language-core/schemas/vue-tsconfig.schema.json b/packages/language-core/schemas/vue-tsconfig.schema.json
@@ -61,10 +61,6 @@
 					"default": [ ],
 					"markdownDescription": "Plugins to be used in the SFC compiler."
 				},
-				"hooks": {
-					"type": "array",
-					"markdownDescription": "https://github.com/vuejs/language-tools/pull/2217"
-				},
 				"optionsWrapper": {
 					"type": "array",
 					"default": [

diff --git a/packages/language-core/src/types.ts b/packages/language-core/src/types.ts
@@ -49,7 +49,6 @@ export interface VueCompilerOptions {
 		withDefaults: string[];
 	};
 	plugins: VueLanguagePlugin[];
-	hooks: string[];
 
 	// experimental
 	experimentalDefinePropProposal: 'kevinEdition' | 'johnsonEdition' | false;

diff --git a/packages/language-core/src/utils/ts.ts b/packages/language-core/src/utils/ts.ts
@@ -178,11 +178,6 @@ function getPartialVueCompilerOptions(
 
 		result.plugins = plugins;
 	}
-	if (rawOptions.hooks) {
-		result.hooks = rawOptions.hooks
-			.map(resolvePath)
-			.filter((hook): hook is NonNullable<typeof hook> => !!hook);
-	}
 	if (rawOptions.experimentalAdditionalLanguageModules) {
 		result.experimentalAdditionalLanguageModules = rawOptions.experimentalAdditionalLanguageModules
 			.map(resolvePath)
@@ -268,7 +263,6 @@ export function resolveVueCompilerOptions(vueOptions: Partial<VueCompilerOptions
 			...vueOptions.macros,
 		},
 		plugins: vueOptions.plugins ?? [],
-		hooks: vueOptions.hooks ?? [],
 
 		// experimental
 		experimentalDefinePropProposal: vueOptions.experimentalDefinePropProposal ?? false,

diff --git a/packages/tsc-eslint-hook/LICENSE b/packages/tsc-eslint-hook/LICENSE
diff --git a/packages/tsc-eslint-hook/README.md b/packages/tsc-eslint-hook/README.md
diff --git a/packages/tsc-eslint-hook/package.json b/packages/tsc-eslint-hook/package.json
diff --git a/packages/tsc-eslint-hook/tsconfig.json b/packages/tsc-eslint-hook/tsconfig.json
diff --git a/packages/tsc/bin/vue-tsc.js b/packages/tsc/bin/vue-tsc.js
@@ -5,7 +5,6 @@ const tsPkg = require('typescript/package.json');
 const readFileSync = fs.readFileSync;
 const tscPath = require.resolve('typescript/lib/tsc');
 const proxyApiPath = require.resolve('../out/index');
-const { state } = require('../out/shared');
 
 fs.readFileSync = (...args) => {
 	if (args[0] === tscPath) {
@@ -56,16 +55,4 @@ fs.readFileSync = (...args) => {
 	return readFileSync(...args);
 };
 
-(function main() {
-	try {
-		require(tscPath);
-	}
-	catch (err) {
-		if (err === 'hook') {
-			state.hook.worker.then(main);
-		}
-		else {
-			throw err;
-		}
-	}
-})();
+require(tscPath);
diff --git a/packages/tsc/src/index.ts b/packages/tsc/src/index.ts
@@ -1,9 +1,6 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as vue from '@vue/language-core';
 import { createLanguage, decorateLanguageService, getDocumentRegistry, getProgram } from '@volar/typescript';
-import { state } from './shared';
-
-export type Hook = (program: _Program) => void;
 
 export type _Program = ts.Program & { __vue: ProgramContext; };
 
@@ -28,11 +25,7 @@ export function createProgram(options: ts.CreateProgramOptions) {
 
 	let program = options.oldProgram as _Program | undefined;
 
-	if (state.hook) {
-		program = state.hook.program;
-		program.__vue.options = options;
-	}
-	else if (!program) {
+	if (!program) {
 
 		const ctx: ProgramContext = {
 			projectVersion: 0,
@@ -145,21 +138,6 @@ export function createProgram(options: ts.CreateProgramOptions) {
 		ctx.projectVersion++;
 	}
 
-	const vueCompilerOptions = program.__vue.vueCompilerOptions;
-	if (vueCompilerOptions?.hooks) {
-		const index = (state.hook?.index ?? -1) + 1;
-		if (index < vueCompilerOptions.hooks.length) {
-			const hookPath = vueCompilerOptions.hooks[index];
-			const hook: Hook = require(hookPath);
-			state.hook = {
-				program,
-				index,
-				worker: (async () => await hook(program))(),
-			};
-			throw 'hook';
-		}
-	}
-
 	for (const rootName of options.rootNames) {
 		// register file watchers
 		options.host.getSourceFile(rootName, ts.ScriptTarget.ESNext);

diff --git a/packages/tsc/src/shared.ts b/packages/tsc/src/shared.ts