Skip to content

Revert resolving lualib_bundle from node_modules #1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 1 commit into from
Jun 24, 2022
Merged

Revert resolving lualib_bundle from node_modules #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/transpilation/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 1 addition & 4 deletions test/transpile/module-resolution.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down