Merge branch 'main' into wit-generator-args

juancastillo0 · Oct 9, 2023 · 953dc99 · 953dc99
2 parents 9ad5205 + 644cb3d
commit 953dc99
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,8 +43,8 @@ build/
 packages/wasm_run/coverage
 packages/rust_wasi_example/Cargo.lock
 scripts/config_api.exe
-packages/flutter_wasmi/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
-packages/flutter_wasmi/example/ios/Flutter/Generated.xcconfig
+packages/flutter_wasmi/example/macos/Flutter/ephemeral/flutter_export_environment.sh
 packages/flutter_wasmi/example/ios/Flutter/flutter_export_environment.sh
 packages/flutter_wasmi/example/android/local.properties
-packages/flutter_wasmi/example/macos/Flutter/ephemeral/flutter_export_environment.sh
+packages/flutter_wasmi/example/ios/Flutter/Generated.xcconfig
+packages/flutter_wasmi/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
diff --git a/...wasmi/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/...wasmi/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -17,12 +17,12 @@ public final class GeneratedPluginRegistrant {
   public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     try {
       flutterEngine.getPlugins().add(new dev.flutter.plugins.integration_test.IntegrationTestPlugin());
-    } catch(Exception e) {
+    } catch (Exception e) {
       Log.e(TAG, "Error registering plugin integration_test, dev.flutter.plugins.integration_test.IntegrationTestPlugin", e);
     }
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
-    } catch(Exception e) {
+    } catch (Exception e) {
       Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
     }
   }

diff --git a/packages/wasm_run/CHANGELOG.md b/packages/wasm_run/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.0.1+2
+
+ - Restrict flutter_rust_bridge: ">=1.72.2 <1.80.0" due to breaking change
+ - Improve `undefined` (empty) returns in wasm functions in web for Dart 3
+
+## 0.0.1+1
+
+ - Fix web asset loading for Flutter web
+
 ## 0.0.1
 
  - Initial version 2023-05-22

diff --git a/packages/wasm_run/lib/src/wasm_bindings/_wasm_interop_web.dart b/packages/wasm_run/lib/src/wasm_bindings/_wasm_interop_web.dart
@@ -626,7 +626,8 @@ WasmExternal _makeWasmFunction(Function value, String? name) {
     call: ([args]) {
       final result = js_util.callMethod<Object?>(value, 'apply', [null, args]);
       if (result is List) return result;
-      if (js_util.typeofEquals<dynamic>(result, 'undefined')) return const [];
+      if (js_util.typeofEquals<dynamic>(result, 'undefined') ||
+          isVoidReturn(result)) return const [];
       return List.filled(1, result);
     },
     // results is not supported on web https://github.com/WebAssembly/js-types/blob/main/proposals/js-types/Overview.md

diff --git a/packages/wasm_run/pubspec.yaml b/packages/wasm_run/pubspec.yaml
@@ -1,6 +1,6 @@
 name: wasm_run
 description: Web Assembly executor. Uses Rust's wasmtime optimizing runtime or wasmi interpreter.
-version: 0.0.1
+version: 0.0.1+2
 homepage: https://github.com/juancastillo0/wasm_run
 
 topics:

diff --git a/packages/wasm_run_flutter/CHANGELOG.md b/packages/wasm_run_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+1
+
+ - Fix web asset loading for Flutter web
+
 ## 0.0.1
 
  - Initial version 2023-05-22
diff --git a/packages/wasm_run_flutter/pubspec.yaml b/packages/wasm_run_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: wasm_run_flutter
 description: |
   This library contains the necessary platform bindings for executing `package:wasm_run`'s Web Assembly executor.
   Uses Rust's wasmtime optimizing runtime or wasmi interpreter.
-version: 0.0.1
+version: 0.0.1+1
 homepage: https://github.com/juancastillo0/wasm_run
 
 topics:
@@ -22,7 +22,7 @@ dependencies:
   plugin_platform_interface: ^2.0.2
   flutter_web_plugins:
     sdk: flutter
-  wasm_run: ^0.0.1
+  wasm_run: ^0.0.1+1
 
 dev_dependencies:
   ffi: ^2.0.1