Merge pull request #767 from ocsigen/wasm

Wasm support
ocsigen · Sep 28, 2024 · ab6ca34 · ab6ca34
2 parents b264bf9 + 876eb2f
commit ab6ca34
Show file tree

Hide file tree

Showing 14 changed files with 894 additions and 70 deletions.
diff --git a/dune-project b/dune-project
@@ -24,13 +24,13 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   ocamlfind
   ppx_deriving
   (ppxlib (>= 0.15.0))
-  (js_of_ocaml-compiler (>= 3.6.0))
-  (js_of_ocaml (>= 3.6.0))
-  (js_of_ocaml-lwt (>= 3.6.0))
+  (js_of_ocaml-compiler (>= 5.5.0))
+  (js_of_ocaml (>= 5.5.0))
+  (js_of_ocaml-lwt (>= 5.5.0))
   (js_of_ocaml-ocamlbuild :build)
-  (js_of_ocaml-ppx (>= 3.6.0))
-  (js_of_ocaml-ppx_deriving_json (>= 3.6.0))
-  (js_of_ocaml-tyxml (>= 3.6.0))
+  (js_of_ocaml-ppx (>= 5.5.0))
+  (js_of_ocaml-ppx_deriving_json (>= 5.5.0))
+  (js_of_ocaml-tyxml (>= 5.5.0))
   lwt_log
   (lwt_ppx (>= 1.2.3))
   (tyxml (and (>= 4.6.0) (< 4.7.0)))

diff --git a/eliom.opam b/eliom.opam
@@ -22,13 +22,13 @@ depends: [
   "ocamlfind"
   "ppx_deriving"
   "ppxlib" {>= "0.15.0"}
-  "js_of_ocaml-compiler" {>= "3.6.0"}
-  "js_of_ocaml" {>= "3.6.0"}
-  "js_of_ocaml-lwt" {>= "3.6.0"}
+  "js_of_ocaml-compiler" {>= "5.5.0"}
+  "js_of_ocaml" {>= "5.5.0"}
+  "js_of_ocaml-lwt" {>= "5.5.0"}
   "js_of_ocaml-ocamlbuild" {build}
-  "js_of_ocaml-ppx" {>= "3.6.0"}
-  "js_of_ocaml-ppx_deriving_json" {>= "3.6.0"}
-  "js_of_ocaml-tyxml" {>= "3.6.0"}
+  "js_of_ocaml-ppx" {>= "5.5.0"}
+  "js_of_ocaml-ppx_deriving_json" {>= "5.5.0"}
+  "js_of_ocaml-tyxml" {>= "5.5.0"}
   "lwt_log"
   "lwt_ppx" {>= "1.2.3"}
   "tyxml" {>= "4.6.0" & < "4.7.0"}

diff --git a/src/lib/client/eliom_client.js b/src/lib/client/eliom_client.js
@@ -3,7 +3,7 @@
 //Provides: caml_unwrap_value_from_string
 //Requires: caml_failwith, caml_marshal_constants
 //Requires: caml_int64_float_of_bits, caml_int64_of_bytes, caml_new_string
-//Requires: caml_jsbytes_of_string
+//Requires: caml_jsbytes_of_string, caml_callback
 var caml_unwrap_value_from_string = function (){
   function StringReader (s, i) { this.s = caml_jsbytes_of_string(s); this.i = i; }
   StringReader.prototype = {
@@ -222,7 +222,7 @@ var caml_unwrap_value_from_string = function (){
         if (v[0] === 0 && size >= 2 &&
             v[size] instanceof Array && v[size].length == 3 &&
             v[size][2] === intern_obj_table[2] /*unwrap_mark*/) {
-          var unwrapped_v = apply_unwrapper(v[size], v);
+          var unwrapped_v = caml_callback(apply_unwrapper, [v[size], v]);
           if (unwrapped_v === 0) {
             // No unwrapper is registered, so replace the unwrap
             // marker v[size] by a late_unwrap marker