Output katex support files in support-files CLI

Author: jonludlam

.ocamlformat-ignore

@@ -6,4 +6,5 @@ src/loader/cmti.ml
 src/loader/doc_attr.ml
 src/loader/*.cppo.ml
 src/model/*.cppo.ml
+src/vendor/*.ml
 test/xref2/lib/*

doc/dune

@@ -1,7 +1,15 @@
 (documentation
  (package odoc)
- (mld_files contributing driver dune features index interface
-   ocamldoc_differences odoc_for_authors parent_child_spec))
+ (mld_files
+  contributing
+  driver
+  dune
+  features
+  index
+  interface
+  ocamldoc_differences
+  odoc_for_authors
+  parent_child_spec))
 
 (rule
  (alias docgen)

doc/examples/dune

@@ -3,5 +3,9 @@
  (public_name odoc.examples)
  (enabled_if
   (> %{ocaml_version} 4.11))
- (modules_without_implementation expansion resolution unexposed wrapping
-   markup))
+ (modules_without_implementation
+  expansion
+  resolution
+  unexposed
+  wrapping
+  markup))

doc/library_mlds/dune

@@ -1,5 +1,14 @@
 (documentation
  (package odoc)
- (mld_files odoc_document odoc_examples odoc_html odoc_latex odoc_loader
-   odoc_manpage odoc_model odoc_model_desc odoc_odoc odoc_xref2
-   odoc_xref_test))
+ (mld_files
+  odoc_document
+  odoc_examples
+  odoc_html
+  odoc_latex
+  odoc_loader
+  odoc_manpage
+  odoc_model
+  odoc_model_desc
+  odoc_odoc
+  odoc_xref2
+  odoc_xref_test))

dune-project

@@ -1,3 +1,3 @@
-(lang dune 2.7)
+(lang dune 3.0)
 (name odoc)
 (cram enable)

odoc.opam

@@ -43,6 +43,7 @@ depends: [
 
   "ppx_expect" {with-test}
   "bos" {with-test}
+  "crunch" {with-test}
 
   ("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
   ("ocaml" {< "4.03.0" & with-test} | "mdx" {with-test})

src/odoc/dune

@@ -1,8 +1,18 @@
 (library
  (name odoc_odoc)
  (public_name odoc.odoc)
- (libraries compiler-libs.common fpath odoc_html odoc_manpage odoc_latex
-   odoc_loader odoc_model odoc_xref2 tyxml unix)
+ (libraries
+  compiler-libs.common
+  fpath
+  odoc_html
+  odoc_manpage
+  odoc_latex
+  odoc_vendor
+  odoc_loader
+  odoc_model
+  odoc_xref2
+  tyxml
+  unix)
  (instrumentation
   (backend bisect_ppx)))
 
@@ -21,18 +31,6 @@
     (cat %{css})
     (echo "|css}")))))
 
-(rule
- (targets highlight_js.ml)
- (deps
-  (:js ../vendor/highlight.pack.js))
- (action
-  (with-stdout-to
-   %{targets}
-   (progn
-    (echo "let content = {js|")
-    (cat %{js})
-    (echo "|js}")))))
-
 ; Install theme files for odig.
 
 (install

src/odoc/support_files.ml

@@ -1,18 +1,25 @@
 let iter_files f ?(without_theme = false) output_directory =
   let file name content =
-    let name =
-      Fs.File.create ~directory:output_directory ~name |> Fs.File.to_string
-    in
+    let name = Fs.File.create ~directory:output_directory ~name in
     f name content
   in
-
   if not without_theme then file "odoc.css" Css_file.content;
-  file "highlight.pack.js" Highlight_js.content
+  let files = Odoc_vendor.file_list in
+  List.iter
+    (fun f ->
+      match Odoc_vendor.read f with
+      | Some content -> file f content
+      | None -> ())
+    files
 
 let write =
   iter_files (fun name content ->
+      let dir = Fs.File.dirname name in
+      Fs.Directory.mkdir_p dir;
+      let name = Fs.File.to_string name in
       let channel = open_out name in
       output_string channel content;
       close_out channel)
 
-let print_filenames = iter_files (fun name _content -> print_endline name)
+let print_filenames =
+  iter_files (fun name _content -> print_endline (Fs.File.to_string name))

src/vendor/dune

@@ -0,0 +1,19 @@
+(rule
+ (alias runtest)
+ (deps
+  (:x odoc_vendor.ml)
+  (glob_files *.js)
+  (glob_files *.css)
+  (glob_files_rec *.woff2))
+ (action
+  (progn
+   (setenv
+    SOURCE_DATE_EPOCH
+    0
+    (run ocaml-crunch . -e js -e css -e woff2 -o %{x}.corrected -m plain -s))
+   (diff? %{x} %{x}.corrected))))
+
+(library
+ (name odoc_vendor)
+ (public_name odoc.vendor)
+ (wrapped false))