Revert resolving lualib_bundle from node_modules (#1293)

Perryvw · web-flow · commit 3b75b04fe17c · 2022-06-24T17:31:30.000+02:00
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -138,8 +138,8 @@ function resolveFileDependencies(file: ProcessedFile, context: ResolutionContext
     const diagnostics: ts.Diagnostic[] = [];
 
     for (const required of findRequiredPaths(file.code)) {
-        // Do no resolve lualib, unless it is included from node_modules
-        if (required === "lualib_bundle" && !isNodeModulesFile(file.fileName)) {
+        // Do no resolve lualib - always use the lualib of the application entry point, not the lualib from external packages
+        if (required === "lualib_bundle") {
             dependencies.push({ fileName: "lualib_bundle", code: "" });
             continue;
         }
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -254,14 +254,11 @@ describe("module resolution project with dependencies built by tstl library mode
             .expectToEqual(expectedResult)
             .getLuaResult();
 
-        // Assert lualib_bundle from node_module is include
-        const expectedLualibBundle = path.join("lua_modules", "dependency1", "lualib_bundle.lua");
-        expect(transpileResult.transpiledFiles.some(f => f.outPath.endsWith(expectedLualibBundle))).toBe(true);
         // Assert node_modules file requires the correct lualib_bundle
         const requiringLuaFile = path.join("lua_modules", "dependency1", "index.lua");
         const lualibRequiringFile = transpileResult.transpiledFiles.find(f => f.outPath.endsWith(requiringLuaFile));
         expect(lualibRequiringFile).toBeDefined();
-        expect(lualibRequiringFile?.lua).toContain('require("lua_modules.dependency1.lualib_bundle")');
+        expect(lualibRequiringFile?.lua).toContain('require("lualib_bundle")');
     });
 
     test("can resolve dependencies and bundle", () => {
