feat: support array extends for tsconfig

close #2344
vuejs · Feb 22, 2023 · b059d63 · b059d63
1 parent 4134866
commit b059d63
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/vue-language-core/src/utils/ts.ts
@@ -57,16 +57,23 @@ function createParsedCommandLineBase(
 	extendsSet: Set<string>,
 ): ParsedCommandLine {
 
-	let extendsVueOptions = {};
+	extendsSet.add(tsConfigPath);
+
 	const folder = path.dirname(tsConfigPath);
+	const extendsArr = Array.isArray(content.raw.extends)
+		? content.raw.extends
+		: (content.raw.extends ? [content.raw.extends] : []);
 
-	extendsSet.add(tsConfigPath);
+	let extendsVueOptions = {};
 
-	if (content.raw.extends) {
+	for (let extendsPath of extendsArr) {
 		try {
-			const extendsPath = require.resolve(content.raw.extends, { paths: [folder] });
+			extendsPath = require.resolve(extendsPath, { paths: [folder] });
 			if (!extendsSet.has(extendsPath)) {
-				extendsVueOptions = createParsedCommandLine(ts, parseConfigHost, extendsPath, extraFileExtensions, extendsSet).vueOptions;
+				extendsVueOptions = {
+					...extendsVueOptions,
+					...createParsedCommandLine(ts, parseConfigHost, extendsPath, extraFileExtensions, extendsSet).vueOptions,
+				};
 			}
 		}
 		catch (error) {