ocsigen · balat · Aug 22, 2025 · Aug 27, 2025 · Aug 26, 2025 · Aug 26, 2025
diff --git a/.ocamlformat b/.ocamlformat
@@ -1,5 +1,6 @@
-version=0.27.0
+version=0.28.1
 parse-docstrings = false
+wrap-comments = false
 break-cases = fit
 break-collection-expressions = fit-or-vertical
 break-fun-decl = wrap

diff --git a/.ocp-indent b/.ocp-indent
@@ -1,4 +1,4 @@
 normal
 with=0
-syntax=lwt mll
+syntax=mll
 max_indent=2
diff --git a/dune-project b/dune-project
@@ -1,7 +1,7 @@
 (lang dune 3.19)
 
 (name eliom)
-(version 11.1.1)
+(version 12.0.0~dev)
 (maintainers dev@ocsigen.org)
 (authors dev@ocsigen.org)
 (license "LGPL-2.1-only WITH OCaml-LGPL-linking-exception")
@@ -28,7 +28,6 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   (ppxlib (>= 0.15))
   (js_of_ocaml-compiler (>= 6.0))
   (js_of_ocaml (>= 6.0))
-  (js_of_ocaml-lwt (>= 6.0))
   (js_of_ocaml-ocamlbuild :build)
   (js_of_ocaml-ppx (>= 6.0))
   (js_of_ocaml-ppx_deriving_json (>= 6.0))
@@ -41,4 +40,5 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   base-bytes
   (ocsipersist (and (>= 2.0) (< 3.0)))
   ppx_optcomp
-  (xml-light (>= "2.5"))))
+  (xml-light (>= "2.5"))
+  js_of_ocaml-eio))
diff --git a/eliom.opam b/eliom.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "11.1.1"
+version: "12.0.0~dev"
 synopsis: "Advanced client/server Web and mobile framework"
 description: """
 Eliom is a framework for implementing Web sites and client/server Web and mobile applications.
@@ -24,7 +24,6 @@ depends: [
   "ppxlib" {>= "0.15"}
   "js_of_ocaml-compiler" {>= "6.0"}
   "js_of_ocaml" {>= "6.0"}
-  "js_of_ocaml-lwt" {>= "6.0"}
   "js_of_ocaml-ocamlbuild" {build}
   "js_of_ocaml-ppx" {>= "6.0"}
   "js_of_ocaml-ppx_deriving_json" {>= "6.0"}
@@ -38,6 +37,7 @@ depends: [
   "ocsipersist" {>= "2.0" & < "3.0"}
   "ppx_optcomp"
   "xml-light" {>= "2.5"}
+  "js_of_ocaml-eio"
   "odoc" {with-doc}
 ]
 build: [

diff --git a/pkg/distillery/templates/app.exe/PROJECT_NAME.eliom b/pkg/distillery/templates/app.exe/PROJECT_NAME.eliom
@@ -1,11 +1,12 @@
-(* This file was generated by Eliom-distillery.
-   Feel free to use it, modify it, and redistribute it as you wish. *)
+(* This file was generated by Eliom-distillery. Feel free to use it, modify it,
+   and redistribute it as you wish. *)
 
 let%server application_name = "%%%PROJECT_NAME%%%"
 let%client application_name = Eliom_client.get_application_name ()
 
 let%server () =
-    Ocsipersist_settings.set_db_file "local/var/data/%%%PROJECT_NAME%%%/%%%PROJECT_NAME%%%_db";
+  Ocsipersist_settings.set_db_file
+    "local/var/data/%%%PROJECT_NAME%%%/%%%PROJECT_NAME%%%_db"
 
 (* Create a module for the application. See
    https://ocsigen.org/eliom/manual/clientserver-applications for more
@@ -15,9 +16,9 @@ module%shared App = Eliom_registration.App (struct
     let global_data_path = Some ["__global_data__"]
   end)
 
-(* As the headers (stylesheets, etc) won't change, we ask Eliom not to
-   update the <head> of the page when changing page. (This also avoids
-   blinking when changing page in iOS). *)
+(* As the headers (stylesheets, etc) won't change, we ask Eliom not to update
+   the <head> of the page when changing page. (This also avoids blinking when
+   changing page in iOS). *)
 let%client _ = Eliom_client.persist_document_head ()
 
 let%server main_service =
@@ -28,15 +29,14 @@ let%client main_service = ~%main_service
 
 let%shared () =
   App.register ~service:main_service (fun () () ->
-    Lwt.return
-      Eliom_content.Html.F.(
-        html
-          (head
-             (title (txt "%%%PROJECT_NAME%%%"))
-             [ css_link
-                 ~uri:
-                   (make_uri
-                      ~service:(Eliom_service.static_dir ())
-                      ["css"; "%%%PROJECT_NAME%%%.css"])
-                 () ])
-          (body [h1 [txt "Welcome to Eliom!"]])))
+    Eliom_content.Html.F.(
+      html
+        (head
+           (title (txt "%%%PROJECT_NAME%%%"))
+           [ css_link
+               ~uri:
+                 (make_uri
+                    ~service:(Eliom_service.static_dir ())
+                    ["css"; "%%%PROJECT_NAME%%%.css"])
+               () ])
+        (body [h1 [txt "Welcome to Eliom!"]])))
diff --git a/pkg/distillery/templates/app.exe/dune b/pkg/distillery/templates/app.exe/dune
@@ -100,10 +100,12 @@
     ;    %%%MODULE_NAME%%%_i18n
     ))
   (js_of_ocaml
-   (build_runtime_flags :standard --enable use-js-string)
+   (build_runtime_flags :standard --enable use-js-string --enable effects)
    (flags
     :standard
     --enable
+    effects
+    --enable
     with-js-error
     --enable
     use-js-string

diff --git a/pkg/distillery/templates/app.lib/PROJECT_NAME.eliom b/pkg/distillery/templates/app.lib/PROJECT_NAME.eliom
@@ -1,5 +1,5 @@
-(* This file was generated by Eliom-distillery.
-   Feel free to use it, modify it, and redistribute it as you wish. *)
+(* This file was generated by Eliom-distillery. Feel free to use it, modify it,
+   and redistribute it as you wish. *)
 
 let%server application_name = "%%%PROJECT_NAME%%%"
 let%client application_name = Eliom_client.get_application_name ()
@@ -12,9 +12,9 @@ module%shared App = Eliom_registration.App (struct
     let global_data_path = Some ["__global_data__"]
   end)
 
-(* As the headers (stylesheets, etc) won't change, we ask Eliom not to
-   update the <head> of the page when changing page. (This also avoids
-   blinking when changing page in iOS). *)
+(* As the headers (stylesheets, etc) won't change, we ask Eliom not to update
+   the <head> of the page when changing page. (This also avoids blinking when
+   changing page in iOS). *)
 let%client _ = Eliom_client.persist_document_head ()
 
 let%server main_service =
@@ -25,15 +25,14 @@ let%client main_service = ~%main_service
 
 let%shared () =
   App.register ~service:main_service (fun () () ->
-    Lwt.return
-      Eliom_content.Html.F.(
-        html
-          (head
-             (title (txt "%%%PROJECT_NAME%%%"))
-             [ css_link
-                 ~uri:
-                   (make_uri
-                      ~service:(Eliom_service.static_dir ())
-                      ["css"; "%%%PROJECT_NAME%%%.css"])
-                 () ])
-          (body [h1 [txt "Welcome to Eliom!"]])))
+    Eliom_content.Html.F.(
+      html
+        (head
+           (title (txt "%%%PROJECT_NAME%%%"))
+           [ css_link
+               ~uri:
+                 (make_uri
+                    ~service:(Eliom_service.static_dir ())
+                    ["css"; "%%%PROJECT_NAME%%%.css"])
+               () ])
+        (body [h1 [txt "Welcome to Eliom!"]])))
diff --git a/pkg/distillery/templates/app.lib/dune b/pkg/distillery/templates/app.lib/dune
@@ -71,10 +71,12 @@
     ;    %%%MODULE_NAME%%%_i18n
     ))
   (js_of_ocaml
-   (build_runtime_flags :standard --enable use-js-string)
+   (build_runtime_flags :standard --enable use-js-string --enable effects)
    (flags
     :standard
     --enable
+    effects
+    --enable
     with-js-error
     --enable
     use-js-string

diff --git a/pkg/distillery/templates/basic.ppx/PROJECT_NAME.eliom b/pkg/distillery/templates/basic.ppx/PROJECT_NAME.eliom
@@ -21,10 +21,9 @@ let () =
   %%%MODULE_NAME%%%_app.register
     ~service:main_service
     (fun () () ->
-       Lwt.return
-         (Eliom_tools.F.html
-            ~title:"%%%PROJECT_NAME%%%"
-            ~css:[["css";"%%%PROJECT_NAME%%%.css"]]
-            Html.F.(body [
-              h1 [txt "Welcome from Eliom's distillery!"];
-            ])))
+       (Eliom_tools.F.html
+          ~title:"%%%PROJECT_NAME%%%"
+          ~css:[["css";"%%%PROJECT_NAME%%%.css"]]
+          Html.F.(body [
+            h1 [txt "Welcome from Eliom's distillery!"];
+          ])))
diff --git a/src/lib/client/dune b/src/lib/client/dune
@@ -21,14 +21,14 @@
   ocsigenserver.polytables
   js_of_ocaml
   js_of_ocaml-tyxml
-  js_of_ocaml-lwt
-  lwt_react
+  react
   ocsigenserver.baselib.base
   logs
   logs.browser
   cohttp
   tyxml
-  reactiveData)
+  reactiveData
+  js_of_ocaml-eio)
  (foreign_stubs
   (language c)
   (names eliom_stubs))

diff --git a/src/lib/client/dune.client b/src/lib/client/dune.client
@@ -1,3 +1,5 @@
+(rule (copy# ../eio_react.shared.ml eio_react.ml))
+(rule (copy# ../eio_react.shared.mli eio_react.mli))
 (rule (copy# ../eliom_bus.client.ml eliom_bus.ml))
 (rule (copy# ../eliom_bus.client.mli eliom_bus.mli))
 (rule (copy# ../eliom_client.client.ml eliom_client.ml))
@@ -90,6 +92,8 @@
     (with-stdout-to %{target}
       (chdir .. (run ppx_eliom_client --as-pp --intf %{deps})))))
 (rule (copy# ../eliom_shared_sigs.shared.mli eliom_shared_sigs.mli))
+(rule (copy# ../eliom_stream.shared.ml eliom_stream.ml))
+(rule (copy# ../eliom_stream.shared.mli eliom_stream.mli))
 (rule (target eliom_tools.ml) (deps ../eliom_tools.eliom)
   (action
     (with-stdout-to %{target}