fix

Author: jfrolich

rewatch/tests/compile.sh

@@ -33,44 +33,44 @@ fi
 node ./packages/main/src/Main.mjs > ./packages/main/src/output.txt
 
 mv ./packages/main/src/Main.res ./packages/main/src/Main2.res
-rewatch build --no-timing=true &> ../tests/snapshots/rename-file.txt
+rewatch build &> ../tests/snapshots/rename-file.txt
 mv ./packages/main/src/Main2.res ./packages/main/src/Main.res
 
 # Rename a file with a dependent - this should trigger an error
 mv ./packages/main/src/InternalDep.res ./packages/main/src/InternalDep2.res
-rewatch build --no-timing=true &> ../tests/snapshots/rename-file-internal-dep.txt
+rewatch build &> ../tests/snapshots/rename-file-internal-dep.txt
 # replace the absolute path so the snapshot is the same on all machines
 replace "s/$(pwd | sed "s/\//\\\\\//g")//g" ../tests/snapshots/rename-file-internal-dep.txt
 mv ./packages/main/src/InternalDep2.res ./packages/main/src/InternalDep.res
 
 # Rename a file with a dependent in a namespaced package - this should trigger an error (regression)
 mv ./packages/new-namespace/src/Other_module.res ./packages/new-namespace/src/Other_module2.res
-rewatch build --no-timing=true &> ../tests/snapshots/rename-file-internal-dep-namespace.txt
+rewatch build &> ../tests/snapshots/rename-file-internal-dep-namespace.txt
 # replace the absolute path so the snapshot is the same on all machines
 replace "s/$(pwd | sed "s/\//\\\\\//g")//g" ../tests/snapshots/rename-file-internal-dep-namespace.txt
 mv ./packages/new-namespace/src/Other_module2.res ./packages/new-namespace/src/Other_module.res
 
 rewatch build &>  /dev/null
 mv ./packages/main/src/ModuleWithInterface.resi ./packages/main/src/ModuleWithInterface2.resi
-rewatch build --no-timing=true &> ../tests/snapshots/rename-interface-file.txt
+rewatch build &> ../tests/snapshots/rename-interface-file.txt
 mv ./packages/main/src/ModuleWithInterface2.resi ./packages/main/src/ModuleWithInterface.resi
 rewatch build &> /dev/null
 mv ./packages/main/src/ModuleWithInterface.res ./packages/main/src/ModuleWithInterface2.res
-rewatch build --no-timing=true &> ../tests/snapshots/rename-file-with-interface.txt
+rewatch build &> ../tests/snapshots/rename-file-with-interface.txt
 mv ./packages/main/src/ModuleWithInterface2.res ./packages/main/src/ModuleWithInterface.res
 rewatch build &> /dev/null
 
 # when deleting a file that other files depend on, the compile should fail
 rm packages/dep02/src/Dep02.res
-rewatch build --no-timing=true &> ../tests/snapshots/remove-file.txt
+rewatch build &> ../tests/snapshots/remove-file.txt
 # replace the absolute path so the snapshot is the same on all machines
 replace "s/$(pwd | sed "s/\//\\\\\//g")//g" ../tests/snapshots/remove-file.txt
 git checkout -- packages/dep02/src/Dep02.res
 rewatch build &> /dev/null
 
 # it should show an error when we have a dependency cycle
 echo 'Dep01.log()' >> packages/new-namespace/src/NS_alias.res
-rewatch build --no-timing=true &> ../tests/snapshots/dependency-cycle.txt
+rewatch build &> ../tests/snapshots/dependency-cycle.txt
 git checkout -- packages/new-namespace/src/NS_alias.res
 rewatch build &> /dev/null
 

rewatch/tests/snapshots/remove-file.txt

@@ -17,8 +17,8 @@
 
   The module or file Dep02 can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in bsconfig.json?
-  - Did you include the file's directory to the "sources" in bsconfig.json?
+    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+  - Did you include the file's directory to the "sources" in rescript.json?
 
 
 

rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt

@@ -15,8 +15,8 @@
 
   The module or file Other_module can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in bsconfig.json?
-  - Did you include the file's directory to the "sources" in bsconfig.json?
+    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+  - Did you include the file's directory to the "sources" in rescript.json?
 
 
   Hint: Did you mean Other_module2?

rewatch/tests/snapshots/rename-file-internal-dep.txt

@@ -17,8 +17,8 @@
 
   The module or file InternalDep can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in bsconfig.json?
-  - Did you include the file's directory to the "sources" in bsconfig.json?
+    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+  - Did you include the file's directory to the "sources" in rescript.json?
 
 
 

rewatch/tests/suite-ci.sh

@@ -12,15 +12,16 @@ export REWATCH_EXECUTABLE
 
 source ./utils.sh
 
+bold "Rescript version"
+(cd ../testrepo && yarn rescript -v)
+
 # we need to reset the yarn.lock and package.json to the original state
 # so there is not diff in git. The CI will install new ReScript package
 bold "Reset package.json and yarn.lock"
 git checkout ../testrepo/yarn.lock
 git checkout ../testrepo/package.json
 success "Reset package.json and yarn.lock"
 
-bold "Rescript version"
-(cd ../testrepo && yarn rescript -v)
 
 bold "Check if build exists"
 if test -f ../target/release/rewatch;