Compile runtime with rewatch and add rewatch tests to the compiler repo

.github/workflows/ci.yml

@@ -20,6 +20,32 @@ env:
   OCAMLRUNPARAM: b
 
 jobs:
+  test-rewatch-integration:
+    needs:
+      - pkg-pr-new
+    runs-on: ubuntu-latest
+    env:
+      RUST_BACKTRACE: "1"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+      - name: Install ReScript package
+        run: |
+          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
+          yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
+        shell: bash
+        working-directory: rewatch/testrepo
+
+      - name: Run rewatch integration tests
+        run: |
+          make test-rewatch-ci
+
   build-rewatch:
     strategy:
       fail-fast: false
@@ -78,6 +104,11 @@ jobs:
         run: |
           cargo build --manifest-path rewatch/Cargo.toml --target ${{ matrix.rust-target }} --release
 
+      - name: Run rewatch unit tests
+        if: steps.build-cache.outputs.cache-hit != 'true'
+        run: |
+          cargo test --manifest-path rewatch/Cargo.toml
+
       - name: Copy rewatch binary
         run: |
           cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch.exe
@@ -440,7 +471,7 @@ jobs:
           path: lib/ocaml
 
   pkg-pr-new:
-    needs: 
+    needs:
       - build-rewatch
       - build-compiler
     runs-on: ubuntu-24.04-arm

Makefile

@@ -16,8 +16,8 @@ dce:
 	reanalyze.exe -dce-cmt _build/default/compiler
 
 rewatch:
-	cargo build --manifest-path rewatch/Cargo.toml
-	cp rewatch/target/debug/rewatch rewatch
+	cargo build --manifest-path rewatch/Cargo.toml --release
+	cp rewatch/target/release/rewatch rewatch
 	./scripts/copyExes.js --rewatch
 
 ninja/ninja:
@@ -46,15 +46,25 @@ test-syntax-roundtrip:
 test-gentype:
 	make -C tests/gentype_tests/typescript-react-example clean test
 
-test-all: test test-gentype test-analysis test-tools
+test-rewatch:
+	bash ./rewatch/tests/suite-ci.sh
+
+test-rewatch-ci:
+	bash ./rewatch/tests/suite-ci.sh node_modules/.bin/rewatch
+
+test-all: test test-gentype test-analysis test-tools test-rewatch
 
 reanalyze:
 	reanalyze.exe -set-exit-code -all-cmt _build/default/compiler _build/default/tests -exclude-paths compiler/outcome_printer,compiler/ml,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb
 
-lib:
+lib-bsb:
 	./scripts/buildRuntime.sh
 	./scripts/prebuilt.js
 
+lib:
+	./scripts/buildRuntimeRewatch.sh
+	./scripts/prebuilt.js
+
 artifacts: lib
 	./scripts/npmPack.js --updateArtifactList
 

cli/rewatch.js

@@ -3,8 +3,10 @@
 // @ts-check
 
 import * as child_process from "node:child_process";
-import { rewatch_exe } from "./common/bins.js";
+import { rewatch_exe, bsc_exe } from "./common/bins.js";
 
 const args = process.argv.slice(2);
 
-child_process.spawnSync(rewatch_exe, args, { stdio: "inherit" });
+child_process.spawnSync(rewatch_exe, [...args, "--bsc-path", bsc_exe], {
+  stdio: "inherit",
+});

rewatch/.cargo/config.toml

@@ -0,0 +1,4 @@
+[alias]
+build-m1-release = "RUSTFLAGS=\"-C target-cpu=apple-m1\" cargo build --release"
+build-docs = "cargo doc --no-deps --document-private-items --target-dir ./docs"
+

rewatch/.gitignore

@@ -0,0 +1,3 @@
+/target
+.DS_Store
+/docs