Rename bucklescript directories to js

aantron · Nov 27, 2021 · 29b406e · 29b406e
1 parent 685553f
commit 29b406e
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v2
     - run: npm install esy
     - run: echo PATH=$(pwd)/node_modules/.bin:$PATH >> $GITHUB_ENV
-    - run: make -C test/bucklescript full-test
+    - run: make -C test/js full-test
     - if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
       env:
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}

diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@ a.out
 # opam 2.
 _opam/
 
-# BuckleScript, NPM, esy.
+# ReScript, NPM, esy, Melange.
 node_modules/
 package-lock.json
 lib/

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ SELF_COVERAGE := _self
 clean :
 	dune clean
 	make clean-usage
-	make -C test/bucklescript clean
+	make -C test/js clean
 	rm -rf $(SELF_COVERAGE)
 
 INSTALLED_ENVIRONMENT := \
@@ -103,8 +103,8 @@ self-coverage-diff :
 
 EXPECTED_FILES := \
   --expect bisect_ppx/src/ \
-  --do-not-expect bisect_ppx/src/ppx/bucklescript/ \
-  --do-not-expect bisect_ppx/src/runtime/bucklescript/
+  --do-not-expect bisect_ppx/src/ppx/js/ \
+  --do-not-expect bisect_ppx/src/runtime/js/
 
 .PHONY : self-coverage-test
 self-coverage-test :

diff --git a/README.md b/README.md
@@ -185,7 +185,7 @@ and install it:
     ```json
     "jest": {
       "setupFilesAfterEnv": [
-        "bisect_ppx/lib/js/src/runtime/bucklescript/jest.js"
+        "bisect_ppx/lib/js/src/runtime/js/jest.js"
       ]
     }
     ```
@@ -194,7 +194,7 @@ and install it:
     `bsconfig.json`, replace the path by
 
     ```json
-    "bisect_ppx/src/runtime/bucklescript/jest.js"
+    "bisect_ppx/src/runtime/js/jest.js"
     ```
 
     You can exclude your test cases from the coverage report by adding this to
@@ -510,6 +510,6 @@ targets:
 
 - `make test` for unit tests.
 - `make usage` for build system integration tests, except ReScript.
-- `make -C test/bucklescript full-test` for ReScript. This requires npm and esy.
+- `make -C test/js full-test` for ReScript. This requires npm and esy.
 
 [issues]: https://github.com/aantron/bisect_ppx/issues
diff --git a/bsconfig.json b/bsconfig.json
@@ -3,6 +3,6 @@
   "namespace": "Bisect",
   "sources": [
     "src/common",
-    "src/runtime/bucklescript"
+    "src/runtime/js"
   ]
 }
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/aantron/bisect_ppx/issues"
   },
   "keywords": [
-    "BuckleScript",
+    "ReScript",
     "reason",
     "coverage"
   ],

diff --git a/src/common/bisect_common.mli b/src/common/bisect_common.mli
@@ -9,7 +9,7 @@
 
     - the instrumenter (PPX)
     - the native runtime ([Bisect.Runtime] in [src/runtime/native/])
-    - the ReScript runtime ([Bisect.Runtime] in [src/runtime/bucklescript/])
+    - the ReScript runtime ([Bisect.Runtime] in [src/runtime/js/])
     - the reporter ([bisect-ppx-report]) *)
 
 

diff --git a/src/npm-install.sh b/src/npm-install.sh
@@ -4,8 +4,8 @@ esy_build() {
     set -e
     set -x
     esy install -P binaries.esy.json
-    esy -P binaries.esy.json dune build -p bisect_ppx src/ppx/bucklescript/ppx.exe
-    cp _build/default/src/ppx/bucklescript/ppx.exe ./ppx
+    esy -P binaries.esy.json dune build -p bisect_ppx src/ppx/js/ppx.exe
+    cp _build/default/src/ppx/js/ppx.exe ./ppx
     esy -P binaries.esy.json dune build -p bisect_ppx src/report/main.exe
     cp _build/default/src/report/main.exe ./bisect-ppx-report
     exit 0

diff --git a/src/ppx/exclusions.ml b/src/ppx/exclusions.ml
@@ -39,7 +39,7 @@ let add_from_channel filename ch =
       raise e
 
 let add_from_file filename =
-  (* BuckleScript runs the PPX from PROJECT_ROOT/lib/bs. *)
+  (* ReScript runs the PPX from PROJECT_ROOT/lib/bs. *)
   let cwd = Sys.getcwd () in
   let parent = Filename.basename cwd in
   let grandparent = Filename.(basename (dirname cwd)) in

diff --git a/src/ppx/bucklescript/dune → src/ppx/js/dune b/src/ppx/bucklescript/dune → src/ppx/js/dune
diff --git a/src/ppx/bucklescript/ppx.ml → src/ppx/js/ppx.ml b/src/ppx/bucklescript/ppx.ml → src/ppx/js/ppx.ml
diff --git a/src/runtime/bucklescript/jest.ml → src/runtime/js/jest.ml b/src/runtime/bucklescript/jest.ml → src/runtime/js/jest.ml
diff --git a/src/runtime/bucklescript/runtime.ml → src/runtime/js/runtime.ml b/src/runtime/bucklescript/runtime.ml → src/runtime/js/runtime.ml
diff --git a/src/runtime/bucklescript/runtime.mli → src/runtime/js/runtime.mli b/src/runtime/bucklescript/runtime.mli → src/runtime/js/runtime.mli
diff --git a/test/ci/binaries.sh b/test/ci/binaries.sh
@@ -32,8 +32,8 @@ try_to_commit() {
         git reset --hard $GITHUB_SHA
     fi
     mkdir -p bin/$OS
-    cp test/bucklescript/node_modules/bisect_ppx/ppx bin/$OS/
-    cp test/bucklescript/node_modules/.bin/bisect-ppx-report bin/$OS/
+    cp test/js/node_modules/bisect_ppx/ppx bin/$OS/
+    cp test/js/node_modules/.bin/bisect-ppx-report bin/$OS/
     strip bin/$OS/ppx
     strip bin/$OS/bisect-ppx-report
     git add bin/

diff --git a/test/dune b/test/dune
@@ -1 +1 @@
-(dirs (:standard \ bucklescript))
+(dirs (:standard \ js))
diff --git a/test/bucklescript/Makefile → test/js/Makefile b/test/bucklescript/Makefile → test/js/Makefile
diff --git a/test/bucklescript/bsconfig.json → test/js/bsconfig.json b/test/bucklescript/bsconfig.json → test/js/bsconfig.json
diff --git a/test/bucklescript/expected → test/js/expected b/test/bucklescript/expected → test/js/expected
diff --git a/test/bucklescript/hello.re → test/js/hello.re b/test/bucklescript/hello.re → test/js/hello.re
diff --git a/test/bucklescript/hello.rei → test/js/hello.rei b/test/bucklescript/hello.rei → test/js/hello.rei
diff --git a/test/bucklescript/package.json → test/js/package.json b/test/bucklescript/package.json → test/js/package.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(dirs (:standard \ bucklescript))
		(dirs (:standard \ js))