From 19604f7da4f661be48fe16329f650b8dc21f67a8 Mon Sep 17 00:00:00 2001 From: qmhc <544022268@qq.com> Date: Sat, 29 Jul 2023 18:36:09 +0800 Subject: [PATCH 1/3] chore: support custom configPath for createParsedCommandLineByJson --- packages/vue-language-core/src/utils/ts.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/vue-language-core/src/utils/ts.ts index ef8d8e525..0a2f8cdb3 100644 --- a/packages/vue-language-core/src/utils/ts.ts +++ b/packages/vue-language-core/src/utils/ts.ts @@ -11,10 +11,11 @@ export function createParsedCommandLineByJson( parseConfigHost: ts.ParseConfigHost, rootDir: string, json: any, + configPath = rootDir + '/jsconfig.json' ): ParsedCommandLine { const proxyHost = proxyParseConfigHostForExtendConfigPaths(parseConfigHost); - ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, rootDir + '/jsconfig.json'); + ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configPath); let vueOptions: Partial = {}; From 90ddeaa21efd9aee8e05254fb1a8797e77f84564 Mon Sep 17 00:00:00 2001 From: qmhc <544022268@qq.com> Date: Sat, 29 Jul 2023 18:43:01 +0800 Subject: [PATCH 2/3] chore: update --- packages/vue-language-core/src/utils/ts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/vue-language-core/src/utils/ts.ts index 0a2f8cdb3..c75165b3b 100644 --- a/packages/vue-language-core/src/utils/ts.ts +++ b/packages/vue-language-core/src/utils/ts.ts @@ -33,7 +33,7 @@ export function createParsedCommandLineByJson( proxyHost.host, rootDir, {}, - rootDir + '/jsconfig.json', + configPath, undefined, (vueOptions.extensions ?? ['.vue']).map(extension => ({ extension: extension.slice(1), From 39501dd3b2f5882970ca033874379fae42485039 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Wed, 6 Sep 2023 11:44:24 +0800 Subject: [PATCH 3/3] Update ts.ts --- packages/vue-language-core/src/utils/ts.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/vue-language-core/src/utils/ts.ts index c75165b3b..fda56b696 100644 --- a/packages/vue-language-core/src/utils/ts.ts +++ b/packages/vue-language-core/src/utils/ts.ts @@ -11,11 +11,11 @@ export function createParsedCommandLineByJson( parseConfigHost: ts.ParseConfigHost, rootDir: string, json: any, - configPath = rootDir + '/jsconfig.json' + configFileName = rootDir + '/jsconfig.json' ): ParsedCommandLine { const proxyHost = proxyParseConfigHostForExtendConfigPaths(parseConfigHost); - ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configPath); + ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configFileName); let vueOptions: Partial = {}; @@ -33,7 +33,7 @@ export function createParsedCommandLineByJson( proxyHost.host, rootDir, {}, - configPath, + configFileName, undefined, (vueOptions.extensions ?? ['.vue']).map(extension => ({ extension: extension.slice(1),