TypeScriptToLua
diff --git a/‎package.json‎
Lines changed: 1 addition & 0 deletions b/‎package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/LuaLib.ts‎
Lines changed: 2 additions & 2 deletions b/‎src/LuaLib.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/lualib-build/plugin.ts‎
Lines changed: 23 additions & 1 deletion b/‎src/lualib-build/plugin.ts‎
Lines changed: 23 additions & 1 deletion
@@ -21,6 +21,7 @@
         "dist/lualib/**/*.json",
         "src/lualib/**/*.ts",
         "src/lualib/**/*.json",
+        "src/lualib-build/**/*.ts",
         "language-extensions/index.d.ts"
     ],
     "main": "dist/index.js",
 
@@ -285,8 +285,8 @@ function recompileLuaLibFiles(sourceOptions: CompilerOptions, emitHost: EmitHost
     if (!transpiledFiles) {
         const tsconfigPath =
             sourceOptions.luaTarget === LuaTarget.Lua50
-                ? path.join(__dirname, "./lualib/tsconfig.lua50.json")
-                : path.join(__dirname, "./lualib/tsconfig.json");
+                ? path.join(__dirname, "../src/lualib/tsconfig.lua50.json")
+                : path.join(__dirname, "../src/lualib/tsconfig.json");
         const config = parseConfigFileWithSystem(tsconfigPath);
         const options = config.options;
         options.luaPlugins = [...(options.luaPlugins ?? []), ...(sourceOptions.luaPlugins ?? [])];
 
@@ -18,7 +18,8 @@ import {
     isImport,
     isRequire,
 } from "./util";
-import { createDiagnosticFactoryWithCode } from "../utils";
+import { createDiagnosticFactoryWithCode, normalizeSlashes } from "../utils";
+import type { CompilerOptions } from "..";
 
 export const lualibDiagnostic = createDiagnosticFactoryWithCode(200000, (message: string, file?: ts.SourceFile) => ({
     messageText: message,
@@ -168,6 +169,27 @@ class LuaLibPlugin implements tstl.Plugin {
         }
         return { result: result as LuaLibModulesInfo, diagnostics };
     }
+
+    public moduleResolution(
+        moduleIdentifier: string,
+        requiringFile: string,
+        _options: CompilerOptions,
+        emitHost: EmitHost
+    ): string | undefined {
+        const tstlRoot = path.resolve(__dirname, "../..");
+        const relativeRequiringFile = normalizeSlashes(path.relative(tstlRoot, requiringFile));
+        if (!relativeRequiringFile.startsWith("src/lualib/")) {
+            return;
+        }
+
+        const tryingPaths = ["./", "./universal/"];
+        for (const tryingPath of tryingPaths) {
+            const possiblePath = path.join(tstlRoot, "src", "lualib", tryingPath, `${moduleIdentifier}.ts`);
+            if (emitHost.fileExists(possiblePath)) {
+                return possiblePath;
+            }
+        }
+    }
 }
 
 class LuaLibPrinter extends tstl.LuaPrinter {