fix: tolerate an undefined baseUrl compiler option

dividab · Apr 20, 2022 · 38e04a8 · 38e04a8
1 parent 98bbcdc
commit 38e04a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/config-loader.ts b/src/config-loader.ts
@@ -22,7 +22,7 @@ export interface ConfigLoaderParams {
 export interface ConfigLoaderSuccessResult {
   resultType: "success";
   configFileAbsolutePath: string;
-  baseUrl: string;
+  baseUrl?: string;
   absoluteBaseUrl: string;
   paths: { [key: string]: Array<string> };
   mainFields?: Array<string>;
@@ -76,21 +76,15 @@ export function configLoader({
     };
   }
 
-  if (!loadResult.baseUrl) {
-    return {
-      resultType: "failed",
-      message: "Missing baseUrl in compilerOptions",
-    };
-  }
-
-  const tsConfigDir = path.dirname(loadResult.tsConfigPath);
-  const absoluteBaseUrl = path.join(tsConfigDir, loadResult.baseUrl);
-
   return {
     resultType: "success",
     configFileAbsolutePath: loadResult.tsConfigPath,
     baseUrl: loadResult.baseUrl,
-    absoluteBaseUrl,
+    absoluteBaseUrl: path.join(
+      path.dirname(loadResult.tsConfigPath),
+      loadResult.baseUrl || ""
+    ),
     paths: loadResult.paths || {},
+    addMatchAll: loadResult.baseUrl !== undefined,
   };
 }
diff --git a/src/register.ts b/src/register.ts
@@ -1,6 +1,7 @@
 import { createMatchPath } from "./match-path-sync";
 import { configLoader, ExplicitParams } from "./config-loader";
 import { options } from "./options";
+import * as path from "path";
 
 const noOp = (): void => void 0;