Skip to content

Commit 5001dd8

Browse files
authored
Fix bundle edge case (#1559)
1 parent 16a8eb3 commit 5001dd8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/transpilation/bundle.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const createModulePath = (pathToResolve: string, program: ts.Program) =>
1515
function requireOverride(options: CompilerOptions) {
1616
const runModule =
1717
options.luaTarget === LuaTarget.Lua50
18-
? "(table.getn(arg) > 0) and module(unpack(arg)) or module(file)"
19-
: '(select("#", ...) > 0) and module(...) or module(file)';
18+
? "if (table.getn(arg) > 0) then value = module(unpack(arg)) else value = module(file) end"
19+
: 'if (select("#", ...) > 0) then value = module(...) else value = module(file) end';
2020
return `
2121
local ____modules = {}
2222
local ____moduleCache = {}
@@ -27,8 +27,10 @@ local function require(file, ...)
2727
end
2828
if ____modules[file] then
2929
local module = ____modules[file]
30-
____moduleCache[file] = { value = ${runModule} }
31-
return ____moduleCache[file].value
30+
local value = nil
31+
${runModule}
32+
____moduleCache[file] = { value = value }
33+
return value
3234
else
3335
if ____originalRequire then
3436
return ____originalRequire(file)

0 commit comments

Comments
 (0)