GeezerVison

Copy link

Copy Markdown

Contributor

art-w commented Jan 28, 2026

View reviewed changes

art-w force-pushed the upstream-oxcaml branch from 80bf1f1 to bb20ded Compare January 28, 2026 13:01

art-w marked this pull request as draft January 28, 2026 14:55

art-w force-pushed the upstream-oxcaml branch 2 times, most recently from f36c8b9 to cd3629c Compare February 18, 2026 11:37

Add support for building js_top_worker and odoc with both the standard
OCaml 5.4 compiler and the OxCaml 5.2.0+ox compiler using cppo
conditional compilation and dual dune stanzas.

js_top_worker changes:
- Bump dune-project to 3.21 for %{ocaml-config:ox} support
- Add dual library stanzas gated by (enabled_if %{ocaml-config:ox})
- Add cppo guards for OxCaml API differences:
  - Compilation_unit.Name.t vs string for persistent loader
  - Env.report_error ~level:0 (extra parameter)
  - Language_extension.set_universe_and_enable_all (oxcaml-only)
  - Unit_info.make ~for_pack_prefix (extra parameter)
  - Typemod.type_implementation (extra Compilation_unit arg)
- Gate ppx_deriving_rpc with (not %{ocaml-config:ox})

odoc changes:
- Apply upstream oxcaml PR ocaml#1399 (art-w/upstream-oxcaml)
- Bump dune-project to 3.21
- Add dual stanzas in loader, model, xref2, odoc, syntax_highlighter
- Add cppo OXCAML guards for compiler API differences
- Support OxCaml features: modes, layouts, labeled tuples, iarray,
  unboxed records, module type strengthening, polymorphic arguments,
  call position arguments, Import_info.t, Compilation_unit.t

Verified end-to-end: scrollycode demos generate HTML and the
interactive playground evaluates OCaml code in the browser with
both compiler switches.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

art-w force-pushed the upstream-oxcaml branch from 8fa44a8 to 745c7eb Compare March 17, 2026 09:17

art-w force-pushed the upstream-oxcaml branch 3 times, most recently from 06b3c16 to a3a6c22 Compare March 17, 2026 10:40

art-w marked this pull request as ready for review March 19, 2026 07:59

art-w commented Mar 19, 2026

View reviewed changes

jonludlam reviewed Apr 8, 2026

View reviewed changes

art-w force-pushed the upstream-oxcaml branch from 5f4ad7f to 6ad5936 Compare April 10, 2026 15:44

11 of 12 checks passed

CHANGES:

- Allow persistent latex macros in HTML/KaTeX backend (@dlesbre, ocaml/odoc#1391)
- `markdown-generate` command now accepts multiple `.odocl` files in a single
  invocation, eliminating the need for shell scripting (@davesnx, ocaml/odoc#1387)
- Support for OxCaml (@lukemaurer, @art-w, ocaml/odoc#1399)
- OCaml 5.5.0 support (@panglesd, @xvw, ocaml/odoc#1406)

- Fix compile-time crashing bugs ocaml/odoc#930 and ocaml/odoc#1385 (@jonludlam, ocaml/odoc#1400)
- Markdown backend assumes ocaml as langId on declarations
- Markdown backend collects all code snippets and render a single code block with comments, rather than split the variants/records per constructor/field
- Fix URL remapping for page references (@jonludlam, ocaml/odoc#1395)
- Fix ocaml/odoc#1396, which broke incrememntal builds (@jonludlam, ocaml/odoc#1402)
- Ensure all warnings turn into errors with --warn-error (@jonludlam, ocaml/odoc#1402)
- Fix missing parentheses for polymorphic arguments (@art-w, ocaml/odoc#1404)