Merge remote-tracking branch 'origin/dev' into fix-deferrals

hazelgrove · Oct 2, 2024 · 6826c4d · 6826c4d
2 parents c444e78 + 6eb4622
commit 6826c4d
Show file tree

Hide file tree

Showing 13 changed files with 206 additions and 157 deletions.
diff --git a/dune-project b/dune-project
@@ -29,13 +29,12 @@
   reason
   ppx_yojson_conv_lib
   ppx_yojson_conv
-  incr_dom
   (omd (>= 2.0.0~alpha4))
   ezjs_idb
-  virtual_dom
+  bonsai
   ppx_deriving
   ptmap
-  uuidm
+  (uuidm (= 0.9.8)) ; 0.9.9 has breaking deprecated changes
   unionFind
   ocamlformat
   (junit_alcotest :with-test)

diff --git a/dune-workspace b/dune-workspace
@@ -0,0 +1,9 @@
+(lang dune 3.16)
+
+(env
+ (dev
+  (flags
+   (:standard -warn-error -A)))
+ (release
+  (flags
+   (:standard -warn-error +A-58))))
diff --git a/hazel.opam b/hazel.opam
diff --git a/hazel.opam.locked b/hazel.opam.locked
diff --git a/src/haz3lweb/Keyboard.re b/src/haz3lweb/Keyboard.re
@@ -227,7 +227,7 @@ let shortcuts = (sys: Key.sys): list(shortcut) =>
   ]
   @ (if (ExerciseSettings.show_instructor) {instructor_shortcuts} else {[]});
 
-let handle_key_event = (k: Key.t): option(Update.t) => {
+let handle_key_event = (k: Key.t): option(UpdateAction.t) => {
   let now = (a: Action.t): option(UpdateAction.t) =>
     Some(PerformAction(a));
   switch (k) {

diff --git a/src/haz3lweb/Log.re b/src/haz3lweb/Log.re
@@ -12,7 +12,8 @@ let is_action_logged: UpdateAction.t => bool =
   | FinishImportAll(_)
   | FinishImportScratchpad(_)
   | Benchmark(_)
-  | DebugConsole(_) => false
+  | DebugConsole(_)
+  | Startup => false
   | Reset
   | TAB
   | Set(_)