From 97d4bf849d43ab68fb55c7fdc61524dc09dc434e Mon Sep 17 00:00:00 2001 From: Gustorn Date: Sun, 18 Jul 2021 13:26:20 +0200 Subject: [PATCH 1/3] fix: TS checker should respect custom tsconfig --- .../vite-plugin-checker/src/checkers/typescript/main.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/src/checkers/typescript/main.ts b/packages/vite-plugin-checker/src/checkers/typescript/main.ts index 6290ffb9..7d35aaa0 100644 --- a/packages/vite-plugin-checker/src/checkers/typescript/main.ts +++ b/packages/vite-plugin-checker/src/checkers/typescript/main.ts @@ -120,7 +120,14 @@ export class TscChecker extends Checker<'typescript'> { super({ name: 'typescript', absFilePath: __filename, - build: { buildBin: ['tsc', ['--noEmit']] }, + build: { + buildBin: (config) => { + if (typeof config.typescript === 'object' && config.typescript.tsconfigPath) { + return ['tsc', ['--noEmit', `-p "${config.typescript.tsconfigPath}"`]] + } + return ['tsc', ['--noEmit']] + }, + }, createDiagnostic, }) } From 485f8322bd3ee8b4220aee67cf67bc3a9fc84979 Mon Sep 17 00:00:00 2001 From: Gustorn Date: Sun, 18 Jul 2021 13:32:00 +0200 Subject: [PATCH 2/3] fix: use correct process argument passing --- packages/vite-plugin-checker/src/checkers/typescript/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/src/checkers/typescript/main.ts b/packages/vite-plugin-checker/src/checkers/typescript/main.ts index 7d35aaa0..dc5f8428 100644 --- a/packages/vite-plugin-checker/src/checkers/typescript/main.ts +++ b/packages/vite-plugin-checker/src/checkers/typescript/main.ts @@ -123,7 +123,7 @@ export class TscChecker extends Checker<'typescript'> { build: { buildBin: (config) => { if (typeof config.typescript === 'object' && config.typescript.tsconfigPath) { - return ['tsc', ['--noEmit', `-p "${config.typescript.tsconfigPath}"`]] + return ['tsc', ['--noEmit', '-p', config.typescript.tsconfigPath]] } return ['tsc', ['--noEmit']] }, From 5ec177a1dab3db1a79c33fcddb07480798547573 Mon Sep 17 00:00:00 2001 From: Gustorn Date: Sun, 18 Jul 2021 21:30:01 +0200 Subject: [PATCH 3/3] fix: include root in tsconfig path if specified --- .../vite-plugin-checker/src/checkers/typescript/main.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/src/checkers/typescript/main.ts b/packages/vite-plugin-checker/src/checkers/typescript/main.ts index dc5f8428..3f743b3e 100644 --- a/packages/vite-plugin-checker/src/checkers/typescript/main.ts +++ b/packages/vite-plugin-checker/src/checkers/typescript/main.ts @@ -1,4 +1,5 @@ import os from 'os' +import path from 'path' import invariant from 'tiny-invariant' import ts from 'typescript' import { parentPort } from 'worker_threads' @@ -123,7 +124,10 @@ export class TscChecker extends Checker<'typescript'> { build: { buildBin: (config) => { if (typeof config.typescript === 'object' && config.typescript.tsconfigPath) { - return ['tsc', ['--noEmit', '-p', config.typescript.tsconfigPath]] + const tsconfig = config.typescript.root + ? path.join(config.typescript.root, config.typescript.tsconfigPath) + : config.typescript.tsconfigPath + return ['tsc', ['--noEmit', '-p', tsconfig]] } return ['tsc', ['--noEmit']] },