Merge pull request #815 from n-osborne/remove-ppx-lwt

Remove `lwt_ppx` dependency

Author: balat

dune-project

@@ -32,7 +32,6 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
   (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)))
   (ocsigenserver (and (>= 6.0.0) (< 7.0.0)))
   (ipaddr (>= 2.1))

eliom.opam

@@ -30,7 +30,6 @@ depends: [
   "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"}
   "ocsigenserver" {>= "6.0.0" & < "7.0.0"}
   "ipaddr" {>= "2.1"}

pkg/distillery/templates/app.exe/dune

@@ -10,7 +10,6 @@
  (wrapped false)
  (preprocess
   (pps
-   lwt_ppx
    ;   pgocaml_ppx
    js_of_ocaml-ppx_deriving_json
    ;   ocsigen-i18n
@@ -40,7 +39,6 @@
  (modules %%%MODULE_NAME%%%_main)
  (preprocess
   (pps
-   lwt_ppx
    ;   pgocaml_ppx
    js_of_ocaml-ppx_deriving_json
    ;   ocsigen-i18n
@@ -92,7 +90,6 @@
   (preprocess
    (pps
     js_of_ocaml-ppx
-    lwt_ppx
     ;    ocsigen-i18n
     ;    --
     ;    --prefix

pkg/distillery/templates/app.exe/tools!dune

@@ -2,7 +2,6 @@
     (name eliom_ppx_client)
     (modes native)
     (modules eliom_ppx_client)
-    (preprocess (pps lwt_ppx))
     (libraries ocsigen-ppx-rpc eliom.ppx.client))
 
 (rule

pkg/distillery/templates/app.lib/dune

@@ -9,7 +9,6 @@
  (wrapped false)
  (preprocess
   (pps
-   lwt_ppx
    ;   pgocaml_ppx
    js_of_ocaml-ppx_deriving_json
    ;   ocsigen-i18n
@@ -62,7 +61,6 @@
   (preprocess
    (pps
     js_of_ocaml-ppx
-    lwt_ppx
     ;    ocsigen-i18n
     ;    --
     ;    --prefix

pkg/distillery/templates/app.lib/tools!dune

@@ -2,7 +2,6 @@
     (name eliom_ppx_client)
     (modes native)
     (modules eliom_ppx_client)
-    (preprocess (pps lwt_ppx))
     (libraries ocsigen-ppx-rpc eliom.ppx.client))
 
 (rule

pkg/distillery/templates/basic.ppx/Makefile.options

@@ -11,9 +11,9 @@ SERVER_FILES := $(wildcard *.eliomi *.eliom)
 CLIENT_FILES := $(wildcard *.eliomi *.eliom)
 
 # OCamlfind packages for the server
-SERVER_PACKAGES := lwt_ppx js_of_ocaml-ppx_deriving_json
+SERVER_PACKAGES := js_of_ocaml-ppx_deriving_json
 # OCamlfind packages for the client
-CLIENT_PACKAGES := lwt_ppx js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json
+CLIENT_PACKAGES := js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json
 
 # Directory with files to be statically served
 LOCAL_STATIC = static

src/_tags

@@ -6,11 +6,11 @@ true:keep_locs
 <lib/client/client.cma>:eliomstubs
 
 <lib/type_dir/*.ml{,i}>:eliom_ppx,thread
-<lib/type_dir/*.ml>:package(js_of_ocaml-ppx_deriving_json,lwt_ppx)
+<lib/type_dir/*.ml>:package(js_of_ocaml-ppx_deriving_json)
 <lib/type_dir/*.ml>:package(js_of_ocaml-ppx)
 
 <lib/server/*.ml{,i}>:eliom_ppx
-<lib/server/*.ml>:package(js_of_ocaml-ppx_deriving_json,lwt_ppx)
+<lib/server/*.ml>:package(js_of_ocaml-ppx_deriving_json)
 <lib/server/*.ml>:package(js_of_ocaml-ppx)
 
 <lib/server/*.ml{,i}>:thread
@@ -22,7 +22,7 @@ true:keep_locs
 <lib/*.eliom{,i}>:eliom_ppx
 
 <lib/*.ml{,i}>:eliom_ppx
-<lib/client/*.ml>:package(js_of_ocaml-ppx_deriving_json,lwt_ppx,js_of_ocaml-lwt.logger)
+<lib/client/*.ml>:package(js_of_ocaml-ppx_deriving_json,js_of_ocaml-lwt.logger)
 <lib/client/*.ml>:package(js_of_ocaml-ppx)
 
 <lib/client/*.ml{,i}>: eliom_ppx
@@ -33,7 +33,6 @@ true:keep_locs
 
 <lib/client/*.ml{,i}>:package(js_of_ocaml-ppx_deriving_json)
 
-<lib/server/monitor/*.ml>:package(lwt_ppx)
 <lib/server/monitor/*.ml{,i}>:thread
 <lib/server/monitor/*.ml{,i}>:package(lwt,ocsigenserver,ocsipersist,tyxml)
 <lib/server/monitor/*.ml{,i}>:I(src/lib/server)

src/lib/client/dune

@@ -13,7 +13,7 @@
   eliom_shared_sigs
   eliom_wrap)
  (preprocess
-  (pps lwt_ppx js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json))
+  (pps js_of_ocaml-ppx js_of_ocaml-ppx_deriving_json))
  (library_flags
   (:standard -linkall))
  (libraries

src/lib/client/eliommod_dom.ml

@@ -1,3 +1,5 @@
+open Lwt.Syntax
+
 (* Ocsigen
  * http://www.ocsigen.org
  * Copyright (C) 2011 Pierre Chambart, Grégoire Henry
@@ -576,19 +578,21 @@ let rewrite_css_url ~prefix css pos =
 let import_re = Regexp.regexp "@import\\s*"
 
 let rec rewrite_css ~max (media, href, css) =
-  try%lwt
-    css >>= function
-    | None -> Lwt.return_nil
-    | Some css ->
-        if !Eliom_config.debug_timings
-        then Firebug.console ## (time (Js.string ("rewrite_CSS: " ^ href)));
-        let%lwt imports, css =
-          rewrite_css_import ~max ~prefix:(basedir href) ~media css 0
-        in
-        if !Eliom_config.debug_timings
-        then Firebug.console ## (timeEnd (Js.string ("rewrite_CSS: " ^ href)));
-        Lwt.return (imports @ [media, css])
-  with _ -> Lwt.return [media, Printf.sprintf "@import url(%s);" href]
+  Lwt.catch
+    (fun () ->
+       css >>= function
+       | None -> Lwt.return_nil
+       | Some css ->
+           if !Eliom_config.debug_timings
+           then Firebug.console ## (time (Js.string ("rewrite_CSS: " ^ href)));
+           let* imports, css =
+             rewrite_css_import ~max ~prefix:(basedir href) ~media css 0
+           in
+           if !Eliom_config.debug_timings
+           then
+             Firebug.console ## (timeEnd (Js.string ("rewrite_CSS: " ^ href)));
+           Lwt.return (imports @ [media, css]))
+    (fun _ -> Lwt.return [media, Printf.sprintf "@import url(%s);" href])
 
 and rewrite_css_import ?(charset = "") ~max ~prefix ~media css pos =
   match Regexp.search import_re css pos with
@@ -603,7 +607,7 @@ and rewrite_css_import ?(charset = "") ~max ~prefix ~media css pos =
         let i = i + String.length (Regexp.matched_string res) in
         let i, href = parse_url ~prefix css i in
         let i, media' = parse_media css i in
-        let%lwt import =
+        let* import =
           if max = 0
           then
             (* Maximum imbrication of @import reached, rewrite url. *)
@@ -623,7 +627,7 @@ and rewrite_css_import ?(charset = "") ~max ~prefix ~media css pos =
               Eliom_request.http_get href [] Eliom_request.string_result
             in
             rewrite_css ~max:(max - 1) (media, href, css >|= snd)
-        and imports, css =
+        and* imports, css =
           rewrite_css_import ~charset ~max ~prefix ~media css i
         in
         Lwt.return (import @ imports, css)
@@ -636,7 +640,7 @@ and rewrite_css_import ?(charset = "") ~max ~prefix ~media css pos =
 let max_preload_depth = ref 4
 
 let build_style (e, css) =
-  let%lwt css = rewrite_css ~max:!max_preload_depth css in
+  let* css = rewrite_css ~max:!max_preload_depth css in
   (* lwt css = *)
   Lwt_list.map_p
     (fun (media, css) ->
@@ -663,7 +667,7 @@ let build_style (e, css) =
 let preload_css (doc : Dom_html.element Js.t) =
   if !Eliom_config.debug_timings
   then Firebug.console ## (time (Js.string "preload_css (fetch+rewrite)"));
-  let%lwt css = Lwt_list.map_p build_style (fetch_linked_css (get_head doc)) in
+  let* css = Lwt_list.map_p build_style (fetch_linked_css (get_head doc)) in
   let css = List.concat css in
   List.iter
     (fun (e, css) ->