diff --git a/capi/bind_gen/src/wasm_bindgen.rs b/capi/bind_gen/src/wasm_bindgen.rs index c436177a..060a41c9 100644 --- a/capi/bind_gen/src/wasm_bindgen.rs +++ b/capi/bind_gen/src/wasm_bindgen.rs @@ -338,22 +338,34 @@ fn write_fn(mut writer: W, function: &Function, type_script: bool) -> pub fn write_preload(mut writer: W, type_script: bool) -> Result<()> { let content = if type_script { - r#"import init, { InitOutput } from "./livesplit_core.js"; + r#"import init, { type InitOutput } from "./livesplit_core.js"; let promise: Promise | null = null; export async function preloadWasm(): Promise { if (!promise) { - promise = init(); + const precompiled = (globalThis as any).__lscPreload; + if (precompiled) { + delete (globalThis as any).__lscPreload; + promise = init({ module_or_path: precompiled }); + } else { + promise = init(); + } } return await promise; }"# } else { - r#"import init from "./livesplit_core.js + r#"import init from "./livesplit_core.js"; let promise = null; export async function preloadWasm() { if (!promise) { - promise = init(); + const precompiled = (globalThis).__lscPreload; + if (precompiled) { + delete (globalThis).__lscPreload; + promise = init({ module_or_path: precompiled }); + } else { + promise = init(); + } } return await promise; }"# diff --git a/crates/livesplit-hotkey/src/modifiers.rs b/crates/livesplit-hotkey/src/modifiers.rs index dee293e3..b41d675a 100644 --- a/crates/livesplit-hotkey/src/modifiers.rs +++ b/crates/livesplit-hotkey/src/modifiers.rs @@ -57,7 +57,7 @@ impl FromStr for Modifiers { match modifier { "Ctrl" => modifiers.insert(Modifiers::CONTROL), "Alt" => modifiers.insert(Modifiers::ALT), - /// Option as alias for Alt used on MacOS + // Option as alias for Alt used on MacOS "Option" => modifiers.insert(Modifiers::ALT), "Meta" => modifiers.insert(Modifiers::META), "Shift" => modifiers.insert(Modifiers::SHIFT),