rustwasm/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/rustwasm/wasm-bindgen.git synced 2024-11-27 19:28:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #969 from alexcrichton/no-modules-moudle

Browse Source 
Allow passing a `WebAssembly.Module` in `--no-modules`
This commit is contained in:
Alex Crichton 2018-10-16 14:24:25 -05:00 committed by GitHub
commit 995aefa87e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/cli-support/src/js/mod.rs
View File

@ -422,17 +422,22 @@ impl<'a> Context<'a> {
var wasm;
const __exports = {{}};
{globals}
function init(wasm_path) {{
const fetchPromise = fetch(wasm_path);
let resultPromise;
if (typeof WebAssembly.instantiateStreaming === 'function') {{
resultPromise = WebAssembly.instantiateStreaming(fetchPromise, {{ './{module}': __exports }});
function init(path_or_module) {{
let instantiation;
const imports = {{ './{module}': __exports }};
if (path_or_module instanceof WebAssembly.Module) {{
instantiation = WebAssembly.instantiate(path_or_module, imports);
}} else {{
resultPromise = fetchPromise
const data = fetch(path_or_module);
if (typeof WebAssembly.instantiateStreaming === 'function') {{
instantiation = WebAssembly.instantiateStreaming(data, imports);
}} else {{
instantiation = data
.then(response => response.arrayBuffer())
.then(buffer => WebAssembly.instantiate(buffer, {{ './{module}': __exports }}));
.then(buffer => WebAssembly.instantiate(buffer, imports));
}}
return resultPromise.then(({{instance}}) => {{
}}
return instantiation.then(({{instance}}) => {{
wasm = init.wasm = instance.exports;
return;
}});

12
guide/src/reference/no-esm.md
View File

@ -59,14 +59,14 @@ for the wasm-module-to-be. The page is configured with one exported global, in
this case `wasm_bindgen`. The name of this global can be configured with the
`--no-modules-global` option.
The global `wasm_bindgen` is a function that takes one argument, the path to the
wasm file. When invoked `wasm_bindgen` will return a promise for when the wasm
file is ready-to-go. After that all exported functionality on
`wasm_bindgen` will be functional.
The global `wasm_bindgen` is a function that takes one argument: either the path
to the wasm file to fetch or a `WebAssembly.Module`. When invoked `wasm_bindgen`
will return a promise for when the wasm module is ready-to-go. After that all
exported functionality on `wasm_bindgen` will be functional.
In the example above, after calling `wasm_bindgen('./hello_bg.wasm')` we wait
for the wasm module to be compiled, and afterwards we're invoking our `greet`
export.
for the wasm module to be fetched and compiled, and afterwards we're invoking
our `greet` export.
Note that exports are available for binding before the wasm module has been
instantiated, for example this would have also worked: