Skip to content

Fix using tstl CLI to build lualib #1233

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
Mar 16, 2022
Merged

Fix using tstl CLI to build lualib #1233

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
7 changes: 5 additions & 2 deletions src/LuaLib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,11 @@ export function readLuaLibFeature(feature: LuaLibFeature, emitHost: EmitHost): s
return luaLibFeature;
}

export function resolveRecursiveLualibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): LuaLibFeature[] {
const luaLibModulesInfo = getLuaLibModulesInfo(emitHost);
export function resolveRecursiveLualibFeatures(
features: Iterable<LuaLibFeature>,
emitHost: EmitHost,
luaLibModulesInfo: LuaLibModulesInfo = getLuaLibModulesInfo(emitHost)
): LuaLibFeature[] {
const loadedFeatures = new Set<LuaLibFeature>();
const result: LuaLibFeature[] = [];

Expand Down
2 changes: 1 addition & 1 deletion src/lualib-build/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class LuaLibPlugin implements tstl.Plugin {

// Figure out the order required in the bundle by recursively resolving all dependency features
const allFeatures = Object.values(LuaLibFeature) as LuaLibFeature[];
const orderedFeatures = resolveRecursiveLualibFeatures(allFeatures, emitHost);
const orderedFeatures = resolveRecursiveLualibFeatures(allFeatures, emitHost, luaLibModuleInfo);

// Concatenate lualib files into bundle with exports table and add lualib_bundle.lua to results
let lualibBundle = orderedFeatures.map(f => exportedLualibFeatures.get(LuaLibFeature[f])).join("\n");
Expand Down
2 changes: 1 addition & 1 deletion src/lualib/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"tstl": {
"luaLibImport": "none",
"noHeader": true,
"luaPlugins": [{ "name": "../lualib-build/plugin.ts" }]
"luaPlugins": [{ "name": "../../dist/lualib-build/plugin.js" }]
}
}