Tests: run npm install from dune

.github/workflows/ci.yml

@@ -49,9 +49,5 @@ jobs:
       - name: Check formatting
         run: make format-check
 
-      - name: "Install npm packages for tests"
-        run: yarn install
-        working-directory: test
-
       - name: Run tests
         run: make test

CONTRIBUTING.md

@@ -5,9 +5,7 @@
 - Install opam: https://opam.ocaml.org/doc/Install.html
 - Create local switch by running `make init` (this step will take a few minutes, as it will build whole OCaml compiler)
 - Build with `make build`
-- Run tests with 
-  - Install test dependencies with `(cd test; yarn)`
-  - `make test`
+- Run tests with `make test`
 
 It is recommended to run `git config --local core.hooksPath .githooks/` to make sure git hooks run,
 otherwise you could get CI errors due to formatting.

dune-project

@@ -1,4 +1,6 @@
-(lang dune 2.7)
+(lang dune 3.7)
+
+(using directory-targets 0.1)
 
 (name jsoo-react)
 
@@ -20,7 +22,6 @@
  (synopsis "Bindings to ReactJS for js_of_ocaml, including JSX ppx")
  (depends
   ;; General system dependencies
-  (dune (and (>= 2) (< 4)))
   (ocaml (and (>= 4.12.0) (< 5.0.0)))
 
   (js_of_ocaml (and (>= 4.0.0) (< 5.2.0)))

example/src/Main.re

@@ -15,7 +15,8 @@ let firstExample = {
   path: "hello-world-ocaml",
   title: "Hello World OCaml",
   element: <HelloWorldOCaml />,
-  code: <Code text=[%blob "HelloWorldOCaml.ml"] />,
+  code:
+    <Code text=[%blob "../../../default/example/src/HelloWorldOCaml.ml"] />,
   showTitle: true,
 };
 let examples = [
@@ -24,14 +25,15 @@ let examples = [
     path: "hello-world-reason",
     title: "Hello World Reason",
     element: <HelloWorldReason />,
-    code: <Code text=[%blob "HelloWorldReason.re"] />,
+    code:
+      <Code text=[%blob "../../../default/example/src/HelloWorldReason.re"] />,
     showTitle: true,
   },
   {
     path: "events",
     title: "Events",
     element: <Events />,
-    code: <Code text=[%blob "Events.re"] />,
+    code: <Code text=[%blob "../../../default/example/src/Events.re"] />,
     showTitle: true,
   },
   {
@@ -41,17 +43,17 @@ let examples = [
     code:
       <>
         <p> {"EffectsAndState component:" |> s} </p>
-        <Code text=[%blob "EffectsAndState.re"] />
+        <Code text=[%blob "../../../default/example/src/EffectsAndState.re"] />
         <p> {"UseEffect component:" |> s} </p>
-        <Code text=[%blob "UseEffect.re"] />
+        <Code text=[%blob "../../../default/example/src/UseEffect.re"] />
       </>,
     showTitle: true,
   },
   {
     path: "refs",
     title: "Refs",
     element: <Refs />,
-    code: <Code text=[%blob "Refs.re"] />,
+    code: <Code text=[%blob "../../../default/example/src/Refs.re"] />,
     showTitle: true,
   },
   {
@@ -61,7 +63,7 @@ let examples = [
       <div style=React.Dom.Style.(make([|height("50vw")|]))>
         <WebComponent />
       </div>,
-    code: <Code text=[%blob "WebComponent.ml"] />,
+    code: <Code text=[%blob "../../../default/example/src/WebComponent.ml"] />,
     showTitle: true,
   },
   {
@@ -76,9 +78,9 @@ let examples = [
     code:
       <div>
         <strong> {"Interface" |> s} </strong>
-        <Code text=[%blob "Interface.rei"] />
+        <Code text=[%blob "../../../default/example/src/Interface.rei"] />
         <strong> {"Implementation" |> s} </strong>
-        <Code text=[%blob "Interface.re"] />
+        <Code text=[%blob "../../../default/example/src/Interface.re"] />
       </div>,
     showTitle: false,
   },
@@ -93,7 +95,7 @@ let examples = [
         </a>
         {"." |> s}
       </p>,
-    code: <Code text=[%blob "Bindings.rei"] />,
+    code: <Code text=[%blob "../../../default/example/src/Bindings.rei"] />,
     showTitle: false,
   },
   {
@@ -131,7 +133,7 @@ let examples = [
           {":" |> s}
         </p>
       </>,
-    code: <Code text=[%blob "Code.re"] />,
+    code: <Code text=[%blob "../../../default/example/src/Code.re"] />,
     showTitle: false,
   },
 ];

jsoo-react.opam

@@ -7,7 +7,7 @@ license: "MIT"
 homepage: "https://github.com/ml-in-barcelona/jsoo-react"
 bug-reports: "https://github.com/ml-in-barcelona/jsoo-react/issues"
 depends: [
-  "dune" {>= "2.7" & >= "2" & < "4"}
+  "dune" {>= "3.7"}
   "ocaml" {>= "4.12.0" & < "5.0.0"}
   "js_of_ocaml" {>= "4.0.0" & < "5.2.0"}
   "gen_js_api" {>= "1.0.8" & < "1.2.0"}
@@ -32,6 +32,7 @@ build: [
     "-j"
     jobs
     "@install"
+    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]

ppx/test/dune

@@ -61,10 +61,12 @@
  (alias runtest)
  (action
   (progn
-   (diff pp_errors_01_external_component_multi_prim.expected
-     pp_errors_01_external_component_multi_prim.actual)
-   (diff pp_errors_02_external_component_unlabelled_arg.expected
-     pp_errors_02_external_component_unlabelled_arg.actual)
+   (diff
+    pp_errors_01_external_component_multi_prim.expected
+    pp_errors_01_external_component_multi_prim.actual)
+   (diff
+    pp_errors_02_external_component_unlabelled_arg.expected
+    pp_errors_02_external_component_unlabelled_arg.actual)
    (diff pp_reason.expected pp_reason.result)
    (diff pp_ocaml.expected pp_ocaml.result)
    (diff pp_ocaml_dev.expected pp_ocaml_dev.result))))

test/dune

@@ -13,13 +13,15 @@
  (action
   (run %{bin:gen_js_api} -o %{targets} %{deps})))
 
+(rule
+ (targets
+  (dir node_modules))
+ (deps package.json)
+ (action
+  (run npm install --no-save)))
+
 (rule
  (alias runtest)
- (deps
-  external.js
-  test_jsoo_react.bc.js
-  (source_tree node_modules))
+ (deps external.js test_jsoo_react.bc.js node_modules)
  (action
   (run node test_jsoo_react.bc.js)))
-
-(data_only_dirs node_modules)