Fix issue leading to wrong bundle entry requires (#1332)

Perryvw · web-flow · commit f8228586b1d3 · 2022-08-17T21:09:33.000+02:00
* Fix issue leading to wrong bundle entry requires

* Resolve bundle entry module from project root instead of source directory

* Use TS to figure out actual entry point filename
diff --git a/src/transpilation/bundle.ts b/src/transpilation/bundle.ts
@@ -5,7 +5,7 @@ import { CompilerOptions } from "../CompilerOptions";
 import { escapeString, tstlHeader } from "../LuaPrinter";
 import { cast, formatPathToLuaPath, isNonNull, trimExtension } from "../utils";
 import { couldNotFindBundleEntryPoint } from "./diagnostics";
-import { getEmitOutDir, getEmitPathRelativeToOutDir, getSourceDir } from "./transpiler";
+import { getEmitOutDir, getEmitPathRelativeToOutDir, getProjectRoot } from "./transpiler";
 import { EmitFile, ProcessedFile } from "./utils";
 
 const createModulePath = (pathToResolve: string, program: ts.Program) =>
@@ -85,10 +85,12 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
     const entryModule = cast(options.luaBundleEntry, isNonNull);
 
     // Resolve project settings relative to project file.
-    const resolvedEntryModule = path.resolve(getSourceDir(program), entryModule);
+    const resolvedEntryModule = path.resolve(getProjectRoot(program), entryModule);
     const outputPath = path.resolve(getEmitOutDir(program), bundleFile);
+    const entryModuleFilePath =
+        program.getSourceFile(entryModule)?.fileName ?? program.getSourceFile(resolvedEntryModule)?.fileName;
 
-    if (program.getSourceFile(resolvedEntryModule) === undefined && program.getSourceFile(entryModule) === undefined) {
+    if (entryModuleFilePath === undefined) {
         diagnostics.push(couldNotFindBundleEntryPoint(entryModule));
     }
 
@@ -99,7 +101,7 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
     const moduleTable = createModuleTableNode(moduleTableEntries);
 
     // return require("<entry module path>")
-    const entryPoint = `return require(${createModulePath(entryModule, program)}, ...)\n`;
+    const entryPoint = `return require(${createModulePath(entryModuleFilePath ?? entryModule, program)}, ...)\n`;
 
     const footers: string[] = [];
     if (options.sourceMapTraceback) {
