Adopt Eliom 13's Deriving_Json codec for persistent references

.github/workflows/build.yml

@@ -21,13 +21,10 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
+        # The Server 8 / modern ppx stack (ocsigen-ppx-rpc needs ppxlib >= 0.37,
+        # pulled together with ppx_sexp_conv -> ppxlib_jane) requires OCaml >= 5.3.
         ocaml-compiler:
-          - "4.14"
-          - "5.2"
-        include:
-          - os: ubuntu-latest
-            ocaml-compiler: "4.12"
+          - "5"
 
     runs-on: ${{ matrix.os }}
 
@@ -46,17 +43,37 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           opam-pin: false
 
+      # wasm_of_ocaml (pulled in via eliom) needs binaryen's wasm-merge.
+      - name: Set-up Binaryen
+        uses: Aandreba/setup-binaryen@v1.0.0
+        with:
+          token: ${{ github.token }}
+
+      # Pin the Ocsigen Server 8 development branches until 8.0 is released
+      # (the default branches of these repos are still the Server 7 line).
       - run: |
-          opam pin add -n eliom https://github.com/ocsigen/eliom.git
-          opam pin add -n ocsigen-toolkit https://github.com/ocsigen/ocsigen-toolkit.git
+          opam pin -yn git+https://github.com/ocsigen/ocsigenserver#master
+          opam pin -yn git+https://github.com/ocsigen/ocsipersist#master
+          opam pin -yn git+https://github.com/ocsigen/eliom#deriving
+          opam pin -yn git+https://github.com/ocsigen/ocsigen-toolkit#modernize
+          opam pin -yn git+https://github.com/ocsigen/ocsigen-dune-rules#modernize
+          opam pin -yn git+https://github.com/ocsigen/ocsigen-ppx-rpc#modernize
+          opam pin -yn git+https://github.com/ocsigen/ocsigen-i18n#modernize
 
       - run: opam pin add ocsigen-start.7.0.0 . --no-action
 
       - run: opam install .
 
       - run: mkdir -p template
 
-      - run: opam exec -- eliom-distillery -name template -template os.pgocaml
+      - run: opam exec -- eliom-distillery -name template -template os
+
+      # Make the generated project its own dune root. It lives inside the
+      # ocsigen-start checkout, which ships a dune-project; without this, dune
+      # would take ocsigen-start as the root and treat the project as a nested
+      # subdirectory, which breaks Eliom's client/server value linking
+      # ("Inferred type of client value not found. You need to regenerate ...").
+      - run: echo '(lang dune 3.0)' > template/dune-workspace
 
       - run: opam install -y .
         working-directory: template

.gitignore

@@ -4,3 +4,4 @@ local/
 doc/client
 doc/server
 .*.sw*
+doc/manual/menu.wiki

.ocamlformat

@@ -1,4 +1,4 @@
-version=0.28.1
+version=0.29.0
 parse-docstrings = false
 wrap-comments = false
 break-cases = fit

CHANGES

@@ -1,3 +1,36 @@
+===== 9.0.0~dev =====
+* Module namespace modernization
+** Public modules are now accessed as Os.Session, Os.User, Os.Tips,
+   Os.Mail, Os.Notif, ... instead of the legacy flat Os_xxx prefix.
+   Implemented with (include_subdirs qualified) + (wrapped false)
+   in dune.
+** New ocsigen-start-compat opam package: provides the legacy
+   Os_xxx module names as include-aliases of the new Os.Xxx
+   modules, to ease migration of existing code.
+* PROJECT_NAME_icons.eliom in the distillery template is now
+  parameterised on Eliom.Content.Html.T (the shared signature
+  exposed by Eliom 13) instead of an ad-hoc ICON_HTML signature.
+* Distillery template
+** Renamed from os.pgocaml to os.
+** Source directory renamed back to template.distillery/ (the
+   convention used by ocsigen-start's previous Makefile-based
+   build), and now installed via dune
+   (install (section lib_root) (files (glob_files_rec
+   (template.distillery/* with_prefix eliom/templates/os))))
+   so the template lands at lib/eliom/templates/os/, where
+   eliom-distillery picks it up at the standard location (Eliom
+   13 dropped the per-package eliom-templates/ auto-discovery).
+* Migrated to the new Eliom 13 module names (Eliom.Service,
+  Eliom.Content, Eliom.Common, ...) and to the wrapped
+  ocsigenserver module names (Ocsigen.Server, Ocsigen.Extensions,
+  Ocsigen.Config, Ocsigen_base.Lib, ...).
+* Build system uses ocsigen-dune-rules (gen sub-command).
+* Os.Email: the default email-sending function now pipes an RFC-2822
+  message to the configured mailer ("sendmail" by default) via
+  Lwt_process, instead of printing to stdout. If the mailer is not on
+  PATH, the email is logged to stderr so the application stays usable
+  out of the box. The now-unused [Invalid_mailer] exception is removed.
+
 ===== 7.1.0 (2024-11) =====
 * Compatibility with WASM
 

doc/client.indexdoc

@@ -0,0 +1,57 @@
+{1 Ocsigen Start client API}
+
+{2 User management}
+
+{!modules:
+User
+User_view
+User_proxy
+Current_user
+Session
+Connect_phone
+}
+
+{2 Persistence}
+
+{!modules:
+Types
+Email
+}
+
+{2 Notifications}
+
+{!modules:
+Notif
+Msg
+Fcm_notif
+}
+
+{2 Web pages and services}
+
+{!modules:
+Page
+Services
+Handlers
+Icons
+Tips
+Uploader
+Request_cache
+}
+
+{2 Real-time}
+
+{!modules:
+Comet
+}
+
+{2 Utilities}
+
+{!modules:
+Lib
+Date
+Platform
+}
+
+{2 Indexes}
+
+{!indexlist}

doc/dune

@@ -1,5 +1,6 @@
 ; Ocsigen Start manual pages (odoc .mld), compiled in place with the API by
 ; `dune build @doc` and installed with the package, so they appear on ocaml.org
 ; and resolve {{!page-X}} / {!Module} references against the API.
+
 (documentation
  (package ocsigen-start))