fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-03 02:41:06 +00:00
Code Issues Projects Releases Wiki Activity

Simplified the preamble

Browse Source
This commit is contained in:
Sharad Chand 2018-04-12 10:31:13 +05:45
parent aa6487b6f1
commit ffdb8a6a32
1 changed files with 6 additions and 17 deletions

23
crates/cli-support/src/js.rs

@ -231,9 +231,9 @@ impl<'a> Context<'a> {
format!("var wasm;") format!("var wasm;")
} else if self.config.no_modules { } else if self.config.no_modules {
format!(" format!("
return fetch('{module}_bg.wasm') window.{module} = fetch('{module}_bg.wasm')
.then(response => response.arrayBuffer()) .then(response => response.arrayBuffer())
.then(buffer => WebAssembly.instantiate(buffer, __js_exports)) .then(buffer => WebAssembly.instantiate(buffer, {{ './{module}': __exports }}))
.then(({{instance}}) => {{ .then(({{instance}}) => {{
wasm = instance.exports; wasm = instance.exports;
return wasm; return wasm;
@ -249,22 +249,11 @@ impl<'a> Context<'a> {
let js = if self.config.no_modules { let js = if self.config.no_modules {
format!(" format!("
(function (root, factory) {{ let wasm;
if (typeof define === 'function' && define.amd) {{ const __exports = {{}};
define([], factory); {globals}
}} else {{ {import_wasm}
root.{module} = factory();
}}
}}(typeof self !== 'undefined' ? self : this, function() {{
let wasm;
const __js_exports = {{}};
const __exports = {{}};
{globals}
__js_exports['./{module}'] = __exports;
{import_wasm}
}}))
", ",
module = module_name,
globals = self.globals, globals = self.globals,
import_wasm = import_wasm, import_wasm = import_wasm,
) )