feat: --use-babel supports outDir config in ts config.

jaywcjlove · Apr 3, 2023 · bf7ec6f · bf7ec6f
1 parent 9636588
commit bf7ec6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/core/src/compile.ts b/packages/core/src/compile.ts
@@ -1,4 +1,4 @@
-import tsCompile from '@tsbb/typescript';
+import tsCompile, { findConfigFile, readConfigFile, reportDiagnostic } from '@tsbb/typescript';
 import { BabelCompileOptions } from '@tsbb/babel';
 import { babelTransform } from './watcher/babelTransform.js';
 import { watcherCopyFiles } from './watcher/copyFiles.js';
@@ -42,5 +42,15 @@ export async function compile(options: CompileOptions = {}) {
     }
     throw new Error(err.join('\n'));
   }
+  const tsConfig = findConfigFile();
+  if (tsConfig) {
+    const { config, error } = readConfigFile(tsConfig);
+    if (error) {
+      return reportDiagnostic(error);
+    }
+    if (config.compilerOptions.outDir && !options.cjs) {
+      options.cjs = config.compilerOptions.outDir;
+    }
+  }
   babelTransform(options);
 }
diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts
@@ -55,6 +55,7 @@ export interface TsCompileOptions {
 }
 
 export const findConfigFile = () => ts.findConfigFile('.', ts.sys.fileExists, 'tsconfig.json');
+export const readConfigFile = (tsConfigPath: string) => ts.readConfigFile(path.resolve(tsConfigPath), ts.sys.readFile);
 
 export default async function compile(options: TsCompileOptions = {}) {
   const { isCopyFiles = true, onWriteFile, onCopyFiles, bail } = options;
@@ -67,7 +68,7 @@ export default async function compile(options: TsCompileOptions = {}) {
     return;
   }
 
-  const { config, error } = ts.readConfigFile(path.resolve(tsConfigPath), ts.sys.readFile);
+  const { config, error } = readConfigFile(tsConfigPath);
   if (error) {
     return reportDiagnostic(error);
   }