firefly-compiler 0.6.18 → 0.6.20

package/lux/Lux.ff

@@ -5,6 +5,7 @@ import Css
 capability Lux(
     document: LuxDocument
     jsSystem: JsSystem
+    browserSystem: Option[BrowserSystem]
     mutable dry: Option[Array[DryNode]]
     mutable cssClasses: StringMap[CssClass]
     renderLock: Lock
@@ -31,27 +32,29 @@ class LuxDocument(document: JsValue)
 
 data LuxInvaldNameException(name: String)
 
-capability LuxEffect[I, O](
-    reload: I => Unit, 
-    cancel: () => Unit, 
-    result: Option[O], 
-    loading: Bool, 
-    error: Bool, 
-    internalInput: Option[I]
+capability LuxJob[I, O](
+    mutable rerun: I => Unit
+    mutable cancel: () => Unit
+    mutable cleanups: Int
+    mutable result: Option[O]
+    mutable running: Bool
+    mutable error: Bool
+    mutable internalEffect: (BrowserSystem, I) => O
+    mutable internalInput: Option[I]
 )
 
-extend self[I: Equal, O]: LuxEffect[I, O] {
-    load(input: I) {
+extend self[I: Equal, O]: LuxJob[I, O] {
+    run(input: I) {
         if(!self.internalInput.contains(input)) {
-            self.reload(input)
+            self.rerun(input)
         }
     }
 }
 
-extend self[I, O]: LuxEffect[I, O] {
+extend self[I, O]: LuxJob[I, O] {
     retry() {
         self.internalInput.each {input =>
-            self.reload(input)
+            self.rerun(input)
         }
     }
 }
@@ -59,11 +62,12 @@ extend self[I, O]: LuxEffect[I, O] {
 class DryNode {
     DryElement(tagName: String, attributes: StringMap[String], children: Array[DryNode])
     DryFragment(children: Array[DryNode])
+    DryStyleTags()
     DryText(text: String)
 }
 
 extend self: DryNode {
-    toHtml(): String {
+    toHtml(styleTags: String): String {
         // https://www.w3.org/TR/xml/ - wrt. checkXmmlName, we only accept the ASCII subset
         function checkXmlName(name: String): String {
             if(name.size() == 0) {throw(LuxInvaldNameException(name))}
@@ -90,6 +94,8 @@ extend self: DryNode {
                 "<" + checkXmlName(tagName) + attributeHtml + ">" + childrenHtml + endHtml
             | DryFragment(children) => 
                 children.toList().map {toHtml(_)}.join()
+            | DryStyleTags =>
+                styleTags
             | DryText(text) => 
                 escapeText(text)
         }
@@ -338,7 +344,6 @@ extend self: Lux {
         if(hook.dry()) {body(callback)} else:
         hook.setValue(callback)
         body {a1 =>
-            Log.debug(hook.luxCopy.element.box.element?)
             let latestCallback = hook.grabValue()
             self.renderLock.do {
                 latestCallback(a1)
@@ -407,35 +412,56 @@ extend self: Lux {
         hook.setCleanup {subtask.abort()}
     }
 
-    useEffect[I, O](effect: I => O, body: LuxEffect[I, O] => Unit) {
+    useJob[I, O](effect: (BrowserSystem, I) => O, body: LuxJob[I, O] => Unit) {
+        self.useState(False): flip, setFlip =>
+        self.useCallback1 {_ => setFlip(!flip)}: update =>
         self.useHook: hook =>
-        if(!hook.dry() && !hook.hasValue()) {hook.setValue(Pair[Option[I], Option[O]](None, None))}
-        self.useState(Pair(False, False)): | Pair(loading, error), setState =>
-        let cancel: () => Unit = {
-            if(hook.dry()) {setState(Pair(False, False))} else:
-            hook.cleanup()
-            setState(Pair(False, False))
-        }
-        self.useCallback1 {input =>
-            if(hook.dry()) {setState(Pair(True, False))} else:
-            hook.cleanup()
-            hook.setValue(Pair(Some(input), hook.grabValue().second))
-            setState(Pair(True, error))
-            let subtask = hook.luxCopy.task.spawn {task =>
-                try {
-                    let newResult = effect(input)
-                    hook.setValue(Pair(Some(input), Some(newResult)))
-                    setState(Pair(False, False))
-                } catchAny {error =>
-                    if(error.name() != "AbortError") {
-                        setState(Pair(False, True))
+        let luxJob = if(!hook.dry() && hook.hasValue()) {
+            hook.grabValue()
+        } else {
+            let luxJob = LuxJob({_ => }, {}, 0, None, False, False, effect, None)
+            luxJob.cancel = {
+                if(!hook.dry()) {hook.cleanup()}
+                luxJob.running = False
+                luxJob.error = False
+                if(!hook.dry()):
+                update(Unit)
+            }
+            luxJob.rerun = {input =>
+                if(!hook.dry()) {hook.cleanup()}
+                luxJob.running = True
+                luxJob.error = False
+                luxJob.internalInput = Some(input)
+                if(!hook.dry()):
+                update(Unit)
+                let cleanups = luxJob.cleanups
+                let subtask = hook.luxCopy.task.spawn {task =>
+                    try {
+                        let newResult = luxJob.internalEffect(hook.luxCopy.browserSystem.grab(), input)
+                        if(cleanups == luxJob.cleanups) {
+                            luxJob.running = False
+                            luxJob.error = False
+                            luxJob.result = Some(newResult)
+                            update(Unit)
+                        }
+                    } catchAny {error =>
+                        if(cleanups == luxJob.cleanups) {
+                            luxJob.running = False
+                            luxJob.error = error.name() != "AbortError"
+                            update(Unit)
+                        }
                     }
                 }
+                hook.setCleanup {
+                    luxJob.cleanups += 1
+                    subtask.abort()
+                }
             }
-            hook.setCleanup {subtask.abort()}
-        }: reload =>
-        let pair = if(hook.dry()) {Pair(None, None)} else {hook.grabValue()}
-        body(LuxEffect(reload, cancel, pair.second, loading, error, pair.first))
+            if(!hook.dry()) {hook.setValue(luxJob)}
+            luxJob
+        }
+        luxJob.internalEffect = effect
+        body(luxJob)
     }
 
     useWebSocket(
@@ -517,7 +543,7 @@ extend self[T]: LuxHook[T] {
         let key = "_lux$C" + self.luxCopy.depth
         let cleanupFunction = self.luxCopy.element.box.element.get(key)
         self.luxCopy.element.box.element.set(key, {}!)
-        cleanupFunction?() // Async cleanup is not waited for. Is that ok?
+        Js.await(cleanupFunction?())
     }
 }
 
@@ -684,6 +710,7 @@ render(browserSystem: BrowserSystem, element: JsValue, body: Lux => Unit) {
     }
     let lux = Lux(
         jsSystem = browserSystem.js()
+        browserSystem = Some(browserSystem)
         renderLock = browserSystem.mainTask().lock()
         dry = None
         cssClasses = staticCssClasses
@@ -708,27 +735,29 @@ renderById(browserSystem: BrowserSystem, id: String, body: Lux => Unit) {
     render(browserSystem, element, body)
 }
 
-renderToString(nodeSystem: NodeSystem, body: Lux => Unit): Pair[String, String] {
+renderToString(body: (Lux, () => Unit) => Unit): Pair[String, String] {
     let children = [].toArray()
     let lux = Lux(
-        jsSystem = nodeSystem.js()
-        renderLock = nodeSystem.mainTask().lock()
+        jsSystem = Js.jsSystem()
+        browserSystem = None
+        renderLock = Js.null()?
         dry = Some(children)
         cssClasses = StringMap.new()
-        task = nodeSystem.mainTask()
+        task = Js.null()?
         depth = 0
-        document = LuxDocument(nodeSystem.js().null())
-        element = LuxElement(LuxElementBox(nodeSystem.js().null()), 0, keepChildren = False)
+        document = LuxDocument(Js.null())
+        element = LuxElement(LuxElementBox(Js.null()), 0, keepChildren = False)
         keys = None
         key = ""
         attributes = None
         texts = Array.new()
         renderQueue = Array.new()
     )
-    body(lux)
+    let insertStyleTags = {lux.dry.each {_.push(DryStyleTags)}}
+    body(lux, insertStyleTags)
     patchText(lux)
     let styleTags = lux.cssClasses.values().map {c => 
         "<style lux-class=\"" + c.name() + "\">" + c.show() + "</style>"
     }.join()
-    Pair(children.toList().map {_.toHtml()}.join(), styleTags)
+    Pair(children.toList().map {_.toHtml(styleTags)}.join(), styleTags)
 }

package/output/js/ff/compiler/Bridge.mjs

@@ -0,0 +1,157 @@
+import * as ff_compiler_Bridge from "../../ff/compiler/Bridge.mjs"
+
+import * as ff_compiler_Builder from "../../ff/compiler/Builder.mjs"
+
+import * as ff_compiler_ModuleCache from "../../ff/compiler/ModuleCache.mjs"
+
+import * as ff_core_Any from "../../ff/core/Any.mjs"
+
+import * as ff_core_Array from "../../ff/core/Array.mjs"
+
+import * as ff_core_AssetSystem from "../../ff/core/AssetSystem.mjs"
+
+import * as ff_core_Atomic from "../../ff/core/Atomic.mjs"
+
+import * as ff_core_Bool from "../../ff/core/Bool.mjs"
+
+import * as ff_core_BrowserSystem from "../../ff/core/BrowserSystem.mjs"
+
+import * as ff_core_Buffer from "../../ff/core/Buffer.mjs"
+
+import * as ff_core_BuildSystem from "../../ff/core/BuildSystem.mjs"
+
+import * as ff_core_Channel from "../../ff/core/Channel.mjs"
+
+import * as ff_core_Char from "../../ff/core/Char.mjs"
+
+import * as ff_core_Core from "../../ff/core/Core.mjs"
+
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
+
+import * as ff_core_Date from "../../ff/core/Date.mjs"
+
+import * as ff_core_Duration from "../../ff/core/Duration.mjs"
+
+import * as ff_core_Equal from "../../ff/core/Equal.mjs"
+
+import * as ff_core_Error from "../../ff/core/Error.mjs"
+
+import * as ff_core_FileHandle from "../../ff/core/FileHandle.mjs"
+
+import * as ff_core_Float from "../../ff/core/Float.mjs"
+
+import * as ff_core_HttpClient from "../../ff/core/HttpClient.mjs"
+
+import * as ff_core_Int from "../../ff/core/Int.mjs"
+
+import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
+
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
+import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
+
+import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
+
+import * as ff_core_Json from "../../ff/core/Json.mjs"
+
+import * as ff_core_List from "../../ff/core/List.mjs"
+
+import * as ff_core_Lock from "../../ff/core/Lock.mjs"
+
+import * as ff_core_Log from "../../ff/core/Log.mjs"
+
+import * as ff_core_Map from "../../ff/core/Map.mjs"
+
+import * as ff_core_NodeSystem from "../../ff/core/NodeSystem.mjs"
+
+import * as ff_core_Nothing from "../../ff/core/Nothing.mjs"
+
+import * as ff_core_Option from "../../ff/core/Option.mjs"
+
+import * as ff_core_Ordering from "../../ff/core/Ordering.mjs"
+
+import * as ff_core_Pair from "../../ff/core/Pair.mjs"
+
+import * as ff_core_Path from "../../ff/core/Path.mjs"
+
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
+import * as ff_core_Random from "../../ff/core/Random.mjs"
+
+import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
+
+import * as ff_core_Set from "../../ff/core/Set.mjs"
+
+import * as ff_core_Show from "../../ff/core/Show.mjs"
+
+import * as ff_core_SourceLocation from "../../ff/core/SourceLocation.mjs"
+
+import * as ff_core_Stream from "../../ff/core/Stream.mjs"
+
+import * as ff_core_String from "../../ff/core/String.mjs"
+
+import * as ff_core_StringMap from "../../ff/core/StringMap.mjs"
+
+import * as ff_core_Task from "../../ff/core/Task.mjs"
+
+import * as ff_core_Try from "../../ff/core/Try.mjs"
+
+import * as import$0 from 'esbuild';
+import * as ff_core_Unit from "../../ff/core/Unit.mjs"
+
+export function setGlobalBridge_(nodeSystem_) {
+ff_core_JsSystem.JsSystem_globalThis(globalThis)["$firefly_bridge"] = ff_core_BuildSystem.BuildSystemBridge(((_w1, _w2) => {
+ff_compiler_Bridge.internalCompile_(nodeSystem_, _w1, _w2)
+}), ((_w1, _w2, _w3, _w4) => {
+ff_compiler_Bridge.callEsBuildForBrowser_(nodeSystem_, _w1, _w2, _w3, _w4)
+}))
+}
+
+export function internalCompile_(nodeSystem_, mainFiles_, target_) {
+ff_compiler_Builder.buildViaBuildSystem_(nodeSystem_, ff_core_NodeSystem.NodeSystem_path(nodeSystem_, nodeSystem_["fireflyPath_"]), mainFiles_, target_, ff_compiler_ModuleCache.new_(0), false)
+}
+
+export function callEsBuildForBrowser_(nodeSystem_, mainJsFiles_, outputPath_, minify_, sourceMap_) {
+const esbuild_ = import$0;
+esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}})
+}
+
+export function callEsBuildForNode_(self_, mainJsFile_, outputPath_, minify_) {
+const esbuild_ = import$0;
+esbuild_.build({entryPoints: [mainJsFile_], bundle: true, minify: minify_, sourcemap: true, platform: "node", target: "es2017", external: ["esbuild", "uws.js"], loader: {[".node"]: "copy"}, outdir: outputPath_})
+}
+
+export function callEsBuildContextForNode_(self_, mainJsFile_, outputPath_, minify_) {
+const esbuild_ = import$0;
+return esbuild_.context({entryPoints: [mainJsFile_], bundle: true, minify: minify_, sourcemap: true, platform: "node", target: "es2017", external: ["esbuild", "uws.js"], loader: {[".node"]: "copy"}, outfile: outputPath_})
+}
+
+export async function setGlobalBridge_$(nodeSystem_, $task) {
+ff_core_JsSystem.JsSystem_globalThis(globalThis)["$firefly_bridge"] = ff_core_BuildSystem.BuildSystemBridge((async (_w1, _w2, $task) => {
+(await ff_compiler_Bridge.internalCompile_$(nodeSystem_, _w1, _w2, $task))
+}), (async (_w1, _w2, _w3, _w4, $task) => {
+(await ff_compiler_Bridge.callEsBuildForBrowser_$(nodeSystem_, _w1, _w2, _w3, _w4, $task))
+}))
+}
+
+export async function internalCompile_$(nodeSystem_, mainFiles_, target_, $task) {
+(await ff_compiler_Builder.buildViaBuildSystem_$(nodeSystem_, (await ff_core_NodeSystem.NodeSystem_path$(nodeSystem_, nodeSystem_["fireflyPath_"], $task)), mainFiles_, target_, ff_compiler_ModuleCache.new_(0), false, $task))
+}
+
+export async function callEsBuildForBrowser_$(nodeSystem_, mainJsFiles_, outputPath_, minify_, sourceMap_, $task) {
+const esbuild_ = import$0;
+(await esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}}))
+}
+
+export async function callEsBuildForNode_$(self_, mainJsFile_, outputPath_, minify_, $task) {
+const esbuild_ = import$0;
+(await esbuild_.build({entryPoints: [mainJsFile_], bundle: true, minify: minify_, sourcemap: true, platform: "node", target: "es2017", external: ["esbuild", "uws.js"], loader: {[".node"]: "copy"}, outdir: outputPath_}))
+}
+
+export async function callEsBuildContextForNode_$(self_, mainJsFile_, outputPath_, minify_, $task) {
+const esbuild_ = import$0;
+return (await esbuild_.context({entryPoints: [mainJsFile_], bundle: true, minify: minify_, sourcemap: true, platform: "node", target: "es2017", external: ["esbuild", "uws.js"], loader: {[".node"]: "copy"}, outfile: outputPath_}))
+}
+
+
+//# sourceMappingURL=Bridge.mjs.map

package/output/js/ff/compiler/Bridge.mjs.map

@@ -0,0 +1,47 @@
+{
+    "version": 3,
+    "sources": [
+        "../../../../compiler/Bridge.ff"
+    ],
+    "sourcesContent": [
+        "import Builder\r\nimport ModuleCache\r\n\r\nsetGlobalBridge(nodeSystem: NodeSystem) {\r\n    // To avoid having the generated code for buildMain depend on the Firefly compiler,\r\n    // we provide the bridge through a global symbol that is read by BuildSystem.internalBridge.\r\n    nodeSystem.js().globalThis()->\"$firefly_bridge\" = BuildSystemBridge(\r\n        internalCompile = {internalCompile(nodeSystem, _, _)}\r\n        internalBrowserCallEsBuild = {callEsBuildForBrowser(nodeSystem, _, _, _, _)}\r\n    )!\r\n}\r\n\r\ninternalCompile(nodeSystem: NodeSystem, mainFiles: List[Path], target: String): Unit {\r\n    Builder.buildViaBuildSystem(\r\n        nodeSystem\r\n        nodeSystem.path(nodeSystem!->\"fireflyPath_\"?)\r\n        mainFiles\r\n        target\r\n    )\r\n}\r\n\r\ncallEsBuildForBrowser(\r\n    nodeSystem: NodeSystem\r\n    mainJsFiles: List[String]\r\n    outputPath: String\r\n    minify: Bool\r\n    sourceMap: Bool\r\n): Unit {\r\n    let esbuild = Js.import(\"esbuild\")\r\n    Js.await(esbuild->build(Js->(\r\n        entryPoints = mainJsFiles\r\n        bundle = True\r\n        minify = minify\r\n        sourcemap = sourceMap\r\n        platform = \"browser\"\r\n        target = \"es2017\"\r\n        outdir = outputPath\r\n        outExtension = Js.object().with(\".js\", \".bundle.js\")\r\n    )))\r\n}\r\n\r\ncallEsBuildForNode(\r\n    self: NodeSystem\r\n    mainJsFile: String\r\n    outputPath: String\r\n    minify: Bool\r\n): Unit {\r\n    let esbuild = Js.import(\"esbuild\")\r\n    Js.await(esbuild->build(Js->(\r\n        entryPoints = [mainJsFile]\r\n        bundle = True\r\n        minify = minify\r\n        sourcemap = True\r\n        platform = \"node\"\r\n        target = \"es2017\"\r\n        external = [\"esbuild\", \"uws.js\"]\r\n        loader = Js.object().with(\".node\", \"copy\")\r\n        outdir = outputPath\r\n    )))\r\n}\r\n\r\ncallEsBuildContextForNode(\r\n    self: NodeSystem\r\n    mainJsFile: String\r\n    outputPath: String\r\n    minify: Bool\r\n): JsValue {\r\n    let esbuild = Js.import(\"esbuild\")\r\n    Js.await(esbuild->context(Js->(\r\n        entryPoints = [mainJsFile]\r\n        bundle = True\r\n        minify = minify\r\n        sourcemap = True\r\n        platform = \"node\"\r\n        target = \"es2017\"\r\n        external = [\"esbuild\", \"uws.js\"]\r\n        loader = Js.object().with(\".node\", \"copy\")\r\n        outfile = outputPath\r\n    )))    \r\n}\r\n"
+    ],
+    "names": [
+        "setGlobalBridge",
+        "nodeSystem",
+        "globalThis",
+        "BuildSystemBridge",
+        "w1",
+        "w2",
+        "internalCompile",
+        "w3",
+        "w4",
+        "callEsBuildForBrowser",
+        "mainFiles",
+        "target",
+        "buildViaBuildSystem",
+        "path",
+        "new",
+        "mainJsFiles",
+        "outputPath",
+        "minify",
+        "sourceMap",
+        "esbuild",
+        "build",
+        "entryPoints",
+        "bundle",
+        "sourcemap",
+        "platform",
+        "outdir",
+        "outExtension",
+        "callEsBuildForNode",
+        "self",
+        "mainJsFile",
+        "external",
+        "loader",
+        "callEsBuildContextForNode",
+        "context",
+        "outfile"
+    ],
+    "mappings": "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"
+}

package/output/js/ff/compiler/Builder.mjs

@@ -121,9 +121,9 @@ export function PackageFiles(root_, packageFile_, files_) {
 return {root_, packageFile_, files_};
 }
 
-export function build_(system_, emitTarget_, mainModules_, resolvedDependencies_, compilerModulePath_, jsOutputPath_, printMeasurements_, moduleCache_) {
+export function build_(system_, emitTarget_, mainModules_, resolvedDependencies_, jsOutputPath_, printMeasurements_, moduleCache_) {
 ff_core_Path.Path_createDirectory(jsOutputPath_, true);
-const compiler_ = ff_compiler_Compiler.new_(emitTarget_, ff_core_NodeSystem.NodeSystem_mainTask(system_), compilerModulePath_, jsOutputPath_, resolvedDependencies_, ff_core_Map.new_(), moduleCache_, ff_compiler_LspHook.disabled_());
+const compiler_ = ff_compiler_Compiler.new_(emitTarget_, ff_core_NodeSystem.NodeSystem_mainTask(system_), jsOutputPath_, resolvedDependencies_, ff_core_Map.new_(), moduleCache_, ff_compiler_LspHook.disabled_());
 for(let for_a = mainModules_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const moduleKey_ = for_a[for_i];
 ff_compiler_Compiler.Compiler_emit(compiler_, moduleKey_, true)
@@ -191,7 +191,7 @@ ff_core_Core.panic_("buildViaBuildSystem is currently limited to browser target
 };
 ff_compiler_Builder.build_(system_, ff_compiler_JsEmitter.EmitBrowser(), mainModuleKeys_, (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
-}))(resolvedDependencies_), ff_core_Option.None(), ff_core_Path.Path_slash(ff_core_NodeSystem.NodeSystem_path(system_, ".firefly/output"), target_), printMeasurements_, moduleCache_)
+}))(resolvedDependencies_), ff_core_Path.Path_slash(ff_core_NodeSystem.NodeSystem_path(system_, ".firefly/output"), target_), printMeasurements_, moduleCache_)
 }
 
 export function check_(system_, fireflyPath_, path_, mustContain_, skipFiles_, virtualFiles_, cache_, dependencyLock_, newVersion_, lspHook_, infer_) {
@@ -242,7 +242,7 @@ const fixedResolvedDependencies_ = (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
 }))(resolvedDependencies_);
 const newCache_ = ff_compiler_ModuleCache.ModuleCache_without(cache_, newVersion_, path_);
-const compiler_ = ff_compiler_Compiler.new_(ff_compiler_JsEmitter.EmitNode(), ff_core_NodeSystem.NodeSystem_mainTask(system_), ff_core_Option.None(), ff_core_Path.Path_slash(ff_core_Path.Path_slash(package_.root_, ".firefly"), "temporary"), fixedResolvedDependencies_, virtualFiles_, newCache_, lspHook_);
+const compiler_ = ff_compiler_Compiler.new_(ff_compiler_JsEmitter.EmitNode(), ff_core_NodeSystem.NodeSystem_mainTask(system_), ff_core_Path.Path_slash(ff_core_Path.Path_slash(package_.root_, ".firefly"), "temporary"), fixedResolvedDependencies_, virtualFiles_, newCache_, lspHook_);
 for(let for_a = package_.files_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const file_ = for_a[for_i];
 const packagePair_ = resolvedDependencies_.mainPackagePair_;
@@ -375,9 +375,9 @@ const pkg_ = null;
 pkg_.exec([packageFile_.absolutePath_, "--out-path", outputPath_.absolutePath_, "--target", ff_core_List.List_join(targets_, ",")])
 }
 
-export async function build_$(system_, emitTarget_, mainModules_, resolvedDependencies_, compilerModulePath_, jsOutputPath_, printMeasurements_, moduleCache_, $task) {
+export async function build_$(system_, emitTarget_, mainModules_, resolvedDependencies_, jsOutputPath_, printMeasurements_, moduleCache_, $task) {
 (await ff_core_Path.Path_createDirectory$(jsOutputPath_, true, $task));
-const compiler_ = (await ff_compiler_Compiler.new_$(emitTarget_, (await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), compilerModulePath_, jsOutputPath_, resolvedDependencies_, ff_core_Map.new_(), moduleCache_, ff_compiler_LspHook.disabled_(), $task));
+const compiler_ = (await ff_compiler_Compiler.new_$(emitTarget_, (await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), jsOutputPath_, resolvedDependencies_, ff_core_Map.new_(), moduleCache_, ff_compiler_LspHook.disabled_(), $task));
 for(let for_a = mainModules_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const moduleKey_ = for_a[for_i];
 (await ff_compiler_Compiler.Compiler_emit$(compiler_, moduleKey_, true, $task))
@@ -445,7 +445,7 @@ ff_core_Core.panic_("buildViaBuildSystem is currently limited to browser target
 };
 (await ff_compiler_Builder.build_$(system_, ff_compiler_JsEmitter.EmitBrowser(), mainModuleKeys_, (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
-}))(resolvedDependencies_), ff_core_Option.None(), (await ff_core_Path.Path_slash$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly/output", $task)), target_, $task)), printMeasurements_, moduleCache_, $task))
+}))(resolvedDependencies_), (await ff_core_Path.Path_slash$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly/output", $task)), target_, $task)), printMeasurements_, moduleCache_, $task))
 }
 
 export async function check_$(system_, fireflyPath_, path_, mustContain_, skipFiles_, virtualFiles_, cache_, dependencyLock_, newVersion_, lspHook_, infer_, $task) {
@@ -496,7 +496,7 @@ const fixedResolvedDependencies_ = (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
 }))(resolvedDependencies_);
 const newCache_ = (await ff_compiler_ModuleCache.ModuleCache_without$(cache_, newVersion_, path_, $task));
-const compiler_ = (await ff_compiler_Compiler.new_$(ff_compiler_JsEmitter.EmitNode(), (await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), ff_core_Option.None(), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(package_.root_, ".firefly", $task)), "temporary", $task)), fixedResolvedDependencies_, virtualFiles_, newCache_, lspHook_, $task));
+const compiler_ = (await ff_compiler_Compiler.new_$(ff_compiler_JsEmitter.EmitNode(), (await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(package_.root_, ".firefly", $task)), "temporary", $task)), fixedResolvedDependencies_, virtualFiles_, newCache_, lspHook_, $task));
 for(let for_a = package_.files_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const file_ = for_a[for_i];
 const packagePair_ = resolvedDependencies_.mainPackagePair_;