fix(path-mapping): fix an issue where path mapping for other baseUrls…

… than '.' didn't work. Fixes #96
wessberg · Jul 9, 2020 · 7f6c429 · 7f6c429
1 parent 15d6ee7
commit 7f6c429
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/util/get-forced-compiler-options/get-forced-compiler-options.ts b/src/util/get-forced-compiler-options/get-forced-compiler-options.ts
@@ -43,7 +43,6 @@ export function getForcedCompilerOptions(options: GetForcedCompilerOptionsOption
 		...getForcedModuleKindOption(options),
 		...getForcedScriptTargetOption(options),
 		outDir: getOutDir(options.pluginOptions.cwd, options.rollupOutputOptions),
-		baseUrl: ".",
 		// Rollup, not Typescript, is the decider of where to put files
 		outFile: undefined,
 		// Always generate SourceMaps. Rollup will then decide if it wants to use them or not

diff --git a/src/util/get-parsed-command-line/get-parsed-command-line.ts b/src/util/get-parsed-command-line/get-parsed-command-line.ts
@@ -130,6 +130,15 @@ export function getParsedCommandLine(options: GetParsedCommandLineOptions): Pars
 		}
 	}
 
+	// Ensure that the parsed command line, as well as the original CompilerOptions has a base URL
+	if (parsedCommandLine.options.baseUrl == null) {
+		parsedCommandLine.options.baseUrl = ".";
+	}
+
+	if (originalCompilerOptions.baseUrl == null) {
+		originalCompilerOptions.baseUrl = ".";
+	}
+
 	// Remove all non-declaration files from the default file names since these will be handled separately by Rollup
 	parsedCommandLine.fileNames = parsedCommandLine.fileNames.filter(file => file.endsWith(D_TS_EXTENSION));
 

diff --git a/test/path-mapping.test.ts b/test/path-mapping.test.ts
@@ -212,3 +212,45 @@ test("Supports path mapping. #5", async (t, {typescript}) => {
 		`)
 	);
 });
+
+test("Supports path mapping. #6", async (t, {typescript}) => {
+	const bundle = await generateRollupBundle(
+		[
+			{
+				entry: true,
+				fileName: "index.ts",
+				text: `\
+          		export * from "~utils/foo";
+        	`
+			},
+			{
+				entry: false,
+				fileName: "src/utils/foo.ts",
+				text: `\
+				export const Foo = 2;
+				`
+			}
+		],
+		{
+			typescript,
+			transpileOnly: true,
+			tsconfig: {
+				baseUrl: "src",
+				paths: {
+					"~utils/*": ["utils/*"]
+				}
+			}
+		}
+	);
+	const {
+		declarations: [file]
+	} = bundle;
+
+	t.deepEqual(
+		formatCode(file.code),
+		formatCode(`\
+			declare const Foo = 2;
+			export { Foo };
+		`)
+	);
+});