Skip to content

Made require overload local to prevent it affecting other lua #757

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
Dec 1, 2019
Merged

Made require overload local to prevent it affecting other lua #757

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
7 changes: 4 additions & 3 deletions src/bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ export function bundleTranspiledFiles(

// Override `require` to read from ____modules table.
const requireOverride = `
local ____modules = {}
local ____moduleCache = {}
local ____originalRequire = require
function require(file)
local function require(file)
if ____moduleCache[file] then
return ____moduleCache[file]
end
Expand All @@ -73,7 +74,7 @@ end\n`;
// return require("<entry module path>")
const entryPoint = `return require("${createModulePath(sourceRootDir, resolvedEntryModule)}")\n`;

const bundleNode = joinSourceChunks([moduleTable, requireOverride, entryPoint]);
const bundleNode = joinSourceChunks([requireOverride, moduleTable, entryPoint]);
const { code, map } = bundleNode.toStringWithSourceMap();

return [
Expand All @@ -99,7 +100,7 @@ function moduleSourceNode(transpiledFile: TranspiledFile, modulePath: string): S
}

function createModuleTableNode(fileChunks: SourceChunk[]): SourceNode {
const tableHead = `local ____modules = {\n`;
const tableHead = `____modules = {\n`;
const tableEnd = `}\n`;

return joinSourceChunks([tableHead, ...fileChunks, tableEnd]);
Expand Down