Skip to content

Fix bundle modules executing twice if they have no imports or exports #1559

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 14, 2024
Merged

Fix bundle modules executing twice if they have no imports or exports #1559

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
10 changes: 6 additions & 4 deletions src/transpilation/bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const createModulePath = (pathToResolve: string, program: ts.Program) =>
function requireOverride(options: CompilerOptions) {
const runModule =
options.luaTarget === LuaTarget.Lua50
? "(table.getn(arg) > 0) and module(unpack(arg)) or module(file)"
: '(select("#", ...) > 0) and module(...) or module(file)';
? "if (table.getn(arg) > 0) then value = module(unpack(arg)) else value = module(file) end"
: 'if (select("#", ...) > 0) then value = module(...) else value = module(file) end';
return `
local ____modules = {}
local ____moduleCache = {}
Expand All @@ -27,8 +27,10 @@ local function require(file, ...)
end
if ____modules[file] then
local module = ____modules[file]
____moduleCache[file] = { value = ${runModule} }
return ____moduleCache[file].value
local value = nil
${runModule}
____moduleCache[file] = { value = value }
return value
else
if ____originalRequire then
return ____originalRequire(file)
Expand Down