chore: update JS deps to 0.17 (ocaml#10878)

Signed-off-by: Etienne Millon <me@emillon.org>
moyodiallo · Sep 4, 2024 · 7d50c4b · 7d50c4b
1 parent 864dfd7
commit 7d50c4b
Show file tree

Hide file tree

Showing 37 changed files with 7 additions and 47 deletions.
diff --git a/dune.opam b/dune.opam
@@ -55,7 +55,7 @@ depends: [
   "menhir" { with-dev-setup & os != "win32" }
   "ocamlfind" { with-dev-setup & os != "win32" }
   "odoc" { with-dev-setup & >= "2.4.0" & os != "win32" }
-  "ppx_expect" { with-dev-setup & >= "v0.16" & < "v0.17" & os != "win32" }
+  "ppx_expect" { with-dev-setup & >= "v0.17" & os != "win32" }
   "ppx_inline_test" { with-dev-setup & os != "win32" }
   "ppxlib" { with-dev-setup & os != "win32" }
   "ctypes" { with-dev-setup & os != "win32" }

diff --git a/dune.opam.template b/dune.opam.template
@@ -17,7 +17,7 @@ depends: [
   "menhir" { with-dev-setup & os != "win32" }
   "ocamlfind" { with-dev-setup & os != "win32" }
   "odoc" { with-dev-setup & >= "2.4.0" & os != "win32" }
-  "ppx_expect" { with-dev-setup & >= "v0.16" & < "v0.17" & os != "win32" }
+  "ppx_expect" { with-dev-setup & >= "v0.17" & os != "win32" }
   "ppx_inline_test" { with-dev-setup & os != "win32" }
   "ppxlib" { with-dev-setup & os != "win32" }
   "ctypes" { with-dev-setup & os != "win32" }

diff --git a/otherlibs/chrome-trace/test/dune b/otherlibs/chrome-trace/test/dune
@@ -10,7 +10,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/otherlibs/dune-glob/test/dune b/otherlibs/dune-glob/test/dune
@@ -8,7 +8,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/otherlibs/dune-rpc-lwt/test/dune b/otherlibs/dune-rpc-lwt/test/dune
@@ -19,7 +19,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/otherlibs/ocamlc-loc/test/dune b/otherlibs/ocamlc-loc/test/dune
@@ -6,7 +6,6 @@
   ;; deps below required because (implicit_transitive_deps false)
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/otherlibs/stdune/test/dune b/otherlibs/stdune/test/dune
@@ -12,7 +12,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/blackbox-tests/test-cases/inline_tests/github6607.t b/test/blackbox-tests/test-cases/inline_tests/github6607.t
@@ -43,7 +43,7 @@ file.
 
   let%expect_test _ =
     User_message.print (User_error.make []);
-    [%expect{| Error: |}]
+    [%expect {| Error: |}]
   $ dune clean
   $ CLICOLOR_FORCE=1 dune runtest --auto-promote
   File "l.ml", line 1, characters 0-0:
@@ -55,4 +55,4 @@ file.
 
   let%expect_test _ =
     User_message.print (User_error.make []);
-    [%expect{| ?[1;31mError?[0m: |}]
+    [%expect {| ?[1;31mError?[0m: |}]
diff --git a/test/blackbox-tests/test-cases/inline_tests/reason-expect.t/run.t b/test/blackbox-tests/test-cases/inline_tests/reason-expect.t/run.t
@@ -23,6 +23,6 @@ syntax and ppx_expect break at dune lang 3.3 due to the sandboxing of ppx.
   File "dune", line 3, characters 1-15:
   3 |  (inline_tests)
        ^^^^^^^^^^^^^^
-  Fatal error: exception ("Expect test evaluator bug"
-    (exn (Invalid_argument "pos + len past end: 78 + 1 > 72"))
-    (backtrace
+  Fatal error: exception Invalid_argument("pos + len past end: 0 + 79 > 72")
+  Raised at Stdlib.invalid_arg in file "stdlib.ml", line 30, characters 20-45
+  Called from Base__Ordered_collection_common0.check_pos_len_exn in file "src/ordered_collection_common0.ml" (inlined), line 31, characters 7-53
diff --git a/test/expect-tests/csexp_rpc/dune b/test/expect-tests/csexp_rpc/dune
@@ -16,6 +16,5 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config))
diff --git a/test/expect-tests/dag/dune b/test/expect-tests/dag/dune
@@ -9,7 +9,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/digest/dune b/test/expect-tests/digest/dune
@@ -9,7 +9,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune b/test/expect-tests/dune
@@ -17,7 +17,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (inline_tests)
@@ -46,7 +45,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess
@@ -69,6 +67,5 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config))
diff --git a/test/expect-tests/dune_action_plugin/dune b/test/expect-tests/dune_action_plugin/dune
@@ -8,7 +8,6 @@
   dune_action_plugin
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config
   dune-glob)

diff --git a/test/expect-tests/dune_async_io/dune b/test/expect-tests/dune_async_io/dune
@@ -15,6 +15,5 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config))
diff --git a/test/expect-tests/dune_config_file/dune b/test/expect-tests/dune_config_file/dune
@@ -10,7 +10,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_console/dune b/test/expect-tests/dune_console/dune
@@ -11,6 +11,5 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config))
diff --git a/test/expect-tests/dune_engine/dune b/test/expect-tests/dune_engine/dune
@@ -11,7 +11,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_file_watcher/dune b/test/expect-tests/dune_file_watcher/dune
@@ -18,7 +18,6 @@
   dune_file_watcher_tests_lib
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   stdune
   ppx_inline_test.config
@@ -41,7 +40,6 @@
   dune_file_watcher_tests_lib
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   stdune
   ppx_inline_test.config
@@ -64,7 +62,6 @@
   dune_file_watcher
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   ppx_inline_test.config)
  (preprocess
   (pps ppx_expect)))
diff --git a/test/expect-tests/dune_lang/dune b/test/expect-tests/dune_lang/dune
@@ -9,7 +9,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_patch/dune b/test/expect-tests/dune_patch/dune
@@ -15,7 +15,6 @@
   base
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   ppx_inline_test.config)
  (preprocess
   (pps ppx_expect)))
diff --git a/test/expect-tests/dune_pkg/dune b/test/expect-tests/dune_pkg/dune
@@ -20,7 +20,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   ppx_inline_test.config)
  (preprocess
   (pps ppx_expect)))

diff --git a/test/expect-tests/dune_pkg_outdated/dune b/test/expect-tests/dune_pkg_outdated/dune
@@ -12,7 +12,6 @@
   base
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   ppx_inline_test.config)
  (preprocess
   (pps ppx_expect)))
diff --git a/test/expect-tests/dune_rpc/dune b/test/expect-tests/dune_rpc/dune
@@ -16,7 +16,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_rpc_e2e/dune b/test/expect-tests/dune_rpc_e2e/dune
@@ -16,7 +16,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess
@@ -39,7 +38,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess
@@ -66,7 +64,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess
@@ -90,7 +87,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_rpc_impl/dune b/test/expect-tests/dune_rpc_impl/dune
@@ -15,7 +15,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_sexp/dune b/test/expect-tests/dune_sexp/dune
@@ -9,7 +9,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_stats/dune b/test/expect-tests/dune_stats/dune
@@ -11,7 +11,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/dune_util/dune b/test/expect-tests/dune_util/dune
@@ -13,7 +13,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/fiber_event_bus/dune b/test/expect-tests/fiber_event_bus/dune
@@ -12,7 +12,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/fsevents/dune b/test/expect-tests/fsevents/dune
@@ -15,7 +15,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/inotify_tests/dune b/test/expect-tests/inotify_tests/dune
@@ -10,7 +10,6 @@
   threads
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   stdune
   ppx_inline_test.config

diff --git a/test/expect-tests/memo/dune b/test/expect-tests/memo/dune
@@ -12,7 +12,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/memo/graph_dump/dune b/test/expect-tests/memo/graph_dump/dune
@@ -9,7 +9,6 @@
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/test/expect-tests/scheme/dune b/test/expect-tests/scheme/dune
@@ -10,7 +10,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (inline_tests)

diff --git a/test/expect-tests/vcs/dune b/test/expect-tests/vcs/dune
@@ -19,7 +19,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess

diff --git a/vendor/fiber/test/dune b/vendor/fiber/test/dune
@@ -11,7 +11,6 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
   base
   ppx_inline_test.config)
  (preprocess