Fix using tstl CLI to build lualib (#1233)

GlassBricks · web-flow · commit 6a200c9df4f9 · 2022-03-16T18:32:19.000+01:00
diff --git a/src/LuaLib.ts b/src/LuaLib.ts
@@ -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[] = [];
 
diff --git a/src/lualib-build/plugin.ts b/src/lualib-build/plugin.ts
@@ -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");
diff --git a/src/lualib/tsconfig.json b/src/lualib/tsconfig.json
@@ -12,6 +12,6 @@
     "tstl": {
         "luaLibImport": "none",
         "noHeader": true,
-        "luaPlugins": [{ "name": "../lualib-build/plugin.ts" }]
+        "luaPlugins": [{ "name": "../../dist/lualib-build/plugin.js" }]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`"tstl": {`
`13`	`13`	`"luaLibImport": "none",`
`14`	`14`	`"noHeader": true,`
`15`		`- "luaPlugins": [{ "name": "../lualib-build/plugin.ts" }]`
	`15`	`+ "luaPlugins": [{ "name": "../../dist/lualib-build/plugin.js" }]`
`16`	`16`	`}`
`17`	`17`	`}`