TypeScriptToLua
diff --git a/‎src/LuaPrinter.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/LuaPrinter.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/transpilation/transpilation.ts‎
Lines changed: 18 additions & 17 deletions b/‎src/transpilation/transpilation.ts‎
Lines changed: 18 additions & 17 deletions
diff --git a/‎test/util.ts‎
Lines changed: 1 addition & 1 deletion b/‎test/util.ts‎
Lines changed: 1 addition & 1 deletion
@@ -164,7 +164,7 @@ export class LuaPrinter {
             (luaLibImport === LuaLibImportKind.Require && luaLibFeatures.size > 0)
         ) {
             // Require lualib bundle
-            header += 'require("lualib_bundle");\n';
+            header += 'require(__TS__Resolve("<internal>/lualib/lualib_bundle"));\n';
         } else if (luaLibImport === LuaLibImportKind.Inline && luaLibFeatures.size > 0) {
             // Inline lualib features
             header += "-- Lua Library inline imports\n";
 
@@ -5,7 +5,7 @@ import { SourceNode } from "source-map";
 import * as ts from "typescript";
 import { CompilerOptions, isBundleEnabled, LuaTarget } from "../CompilerOptions";
 import { getLuaLibBundle } from "../LuaLib";
-import { assert, cast, isNonNull, normalizeSlashes, trimExtension } from "../utils";
+import { assert, cast, isNonNull, trimExtension } from "../utils";
 import { Chunk, modulesToBundleChunks, modulesToChunks } from "./chunk";
 import { createResolutionErrorDiagnostic } from "./diagnostics";
 import { buildModule, Module } from "./module";
@@ -55,17 +55,6 @@ export class Transpilation {
 
     public emit(): Chunk[] {
         this.modules.forEach(module => this.buildModule(module));
-
-        const lualibRequired = this.modules.some(m => m.source.toString().includes('require("lualib_bundle")'));
-        if (lualibRequired) {
-            const fileName = normalizeSlashes(path.resolve(this.rootDir, "lualib_bundle.lua"));
-            this.modules.unshift({
-                request: fileName,
-                isBuilt: true,
-                source: new SourceNode(null, null, null, getLuaLibBundle(this.host)),
-            });
-        }
-
         return this.mapModulesToChunks(this.modules);
     }
 
@@ -83,6 +72,17 @@ export class Transpilation {
     }
 
     private resolveRequestToModule(issuer: string, request: string) {
+        if (request === "<internal>/lualib/lualib_bundle") {
+            let module = this.modules.find(m => m.request === request);
+            if (!module) {
+                const source = new SourceNode(null, null, null, getLuaLibBundle(this.host));
+                module = { request, isBuilt: true, source };
+                this.modules.push(module);
+            }
+
+            return module;
+        }
+
         let resolvedPath: string;
         try {
             const result = this.resolver.resolveSync({}, path.dirname(issuer), request);
@@ -103,11 +103,8 @@ export class Transpilation {
 
             // TODO: Load source map files
             const code = cast(this.host.readFile(resolvedPath), isNonNull);
-            module = {
-                request: resolvedPath,
-                isBuilt: false,
-                source: new SourceNode(null, null, null, code),
-            };
+            const source = new SourceNode(null, null, null, code);
+            module = { request: resolvedPath, isBuilt: false, source };
 
             this.modules.push(module);
             this.buildModule(module);
@@ -120,6 +117,10 @@ export class Transpilation {
         const pluginResult = applyBailPlugin(this.plugins, p => p.getModuleId?.(module, this));
         if (pluginResult !== undefined) return pluginResult;
 
+        if (module.request.startsWith("<internal>/")) {
+            return module.request.replace("<internal>/", "");
+        }
+
         const result = path.relative(this.rootDir, trimExtension(module.request));
         // TODO: handle files on other drives
         assert(!path.isAbsolute(result), `Invalid path: ${result}`);
 
@@ -257,7 +257,7 @@ export abstract class TestBuilder {
             host.resolutionFileSystem = virtualFS;
             host.getCurrentDirectory = () => "/";
             host.readFile = (fileName, encoding = "utf8") =>
-                fileName.endsWith("lualib_bundle.lua")
+                fileName.includes("/lualib/")
                     ? ts.sys.readFile(fileName, encoding)
                     : (virtualFS.readFileSync(fileName, encoding) as string);
         }
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ export abstract class TestBuilder {`
`257`	`257`	`host.resolutionFileSystem = virtualFS;`
`258`	`258`	`host.getCurrentDirectory = () => "/";`
`259`	`259`	`host.readFile = (fileName, encoding = "utf8") =>`
`260`		`- fileName.endsWith("lualib_bundle.lua")`
	`260`	`+ fileName.includes("/lualib/")`
`261`	`261`	`? ts.sys.readFile(fileName, encoding)`
`262`	`262`	`: (virtualFS.readFileSync(fileName, encoding) as string);`
`263`	`263`	`}`