Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to match the changes in wasm-bindgen #31

Merged
merged 1 commit into from Jun 1, 2020
Merged

Update to match the changes in wasm-bindgen #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions WASMbindgenAsset.js
View file
Open in desktop
Expand Up @@ -133,14 +133,14 @@ class WASMbindgenAsset extends Asset {
outDir,
rustName,
loc: path.join(cargoDir, 'target', RUST_TARGET, 'release')
}
}
} catch (e) {
throw `Building failed... Please install wasm-pack and try again.`
}
}

async wasmPostProcess({cargoDir, loc, outDir, rustName, target_folder}) {
let js_content = (await lib.readFile(path.join(outDir, rustName + '.js'))).toString()
let js_content = (await lib.readFile(path.join(outDir, rustName + '_bg.js'))).toString()
let wasm_path = path.relative(path.dirname(this.name), path.join(loc, rustName + '_bg.wasm'))
if (wasm_path[0] !== '.')
wasm_path = './' + wasm_path
Expand Down Expand Up @@ -188,11 +188,11 @@ class WASMbindgenAsset extends Asset {
const fetchPromise = fetch(wasm_path);
let resultPromise;
if (typeof WebAssembly.instantiateStreaming === 'function') {
resultPromise = WebAssembly.instantiateStreaming(fetchPromise, { './${rustName}.js': __exports });
resultPromise = WebAssembly.instantiateStreaming(fetchPromise, { './${rustName}_bg.js': __exports });
} else {
resultPromise = fetchPromise
.then(response => response.arrayBuffer())
.then(buffer => WebAssembly.instantiate(buffer, { './${rustName}.js': __exports }));
.then(buffer => WebAssembly.instantiate(buffer, { './${rustName}_bg.js': __exports }));
}
return resultPromise.then(({instance}) => {
wasm = init.wasm = instance.exports;
Expand All @@ -211,7 +211,7 @@ class WASMbindgenAsset extends Asset {
}
});
})
.then(data => WebAssembly.instantiate(data, { './${rustName}': __exports }))
.then(data => WebAssembly.instantiate(data, { './${rustName}_bg': __exports }))
.then(({instance}) => {
wasm = init.wasm = instance.exports;
__exports.wasm = wasm;
Expand Down