Skip to content

Commit

Permalink
Merge branch 'master' into katei/improve-js-error-message
Browse files Browse the repository at this point in the history
  • Loading branch information
syrusakbary authored Mar 28, 2022
2 parents 7adcfef + 8b47e10 commit a446f4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C

### Fixed
- [#2829](https://github.com/wasmerio/wasmer/pull/2829) Improve error message oriented from JS object.
- [#2828](https://github.com/wasmerio/wasmer/pull/2828) Fix JsImportObject resolver.

## 2.2.1 - 2022/03/15

Expand Down
2 changes: 1 addition & 1 deletion lib/api/src/js/js_import_object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl JsImportObject {
/// import_object.get_export("module", "name");
/// ```
pub fn get_export(&self, module: &str, name: &str) -> Option<Export> {
let namespace = js_sys::Reflect::get(&self.object, &name.into()).ok()?;
let namespace = js_sys::Reflect::get(&self.object, &module.into()).ok()?;
let js_export = js_sys::Reflect::get(&namespace, &name.into()).ok()?;
match self
.module_imports
Expand Down

0 comments on commit a446f4c

Please sign in to comment.