Cleanup

cknitt · cknitt · commit b71fc8c94d73 · 2025-09-29T16:14:22.000+02:00
diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json
@@ -9,7 +9,6 @@
       "packages/new-namespace",
       "packages/namespace-casing",
       "packages/with-dev-deps",
-      "packages/compiled-by-legacy",
       "packages/nonexisting-dev-files",
       "packages/deprecated-config",
       "packages/file-casing",
@@ -28,10 +27,7 @@
   },
   "scripts": {
     "build": "../target/release/rescript build .",
-    "build:rescript": "rescript-legacy build",
     "watch": "../target/release/rescript watch .",
-    "watch:rescript": "rescript-legacy watch",
-    "clean": "../target/release/rescript clean .",
-    "clean:rescript": "rescript clean"
+    "clean": "../target/release/rescript clean ."
   }
 }
diff --git a/rewatch/testrepo/packages/compiled-by-legacy/package.json b/rewatch/testrepo/packages/compiled-by-legacy/package.json
diff --git a/rewatch/testrepo/packages/compiled-by-legacy/rescript.json b/rewatch/testrepo/packages/compiled-by-legacy/rescript.json
diff --git a/rewatch/testrepo/packages/compiled-by-legacy/src/Main.mjs b/rewatch/testrepo/packages/compiled-by-legacy/src/Main.mjs
diff --git a/rewatch/testrepo/packages/compiled-by-legacy/src/Main.res b/rewatch/testrepo/packages/compiled-by-legacy/src/Main.res
diff --git a/rewatch/testrepo/packages/compiled-by-legacy/src/Main.res.js b/rewatch/testrepo/packages/compiled-by-legacy/src/Main.res.js
diff --git a/rewatch/testrepo/packages/main/package.json b/rewatch/testrepo/packages/main/package.json
@@ -12,7 +12,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/compiled-by-legacy": "*",
     "@testrepo/dep01": "*"
   }
 }
diff --git a/rewatch/testrepo/rescript.json b/rewatch/testrepo/rescript.json
@@ -21,7 +21,6 @@
     "@testrepo/new-namespace",
     "@testrepo/namespace-casing",
     "@testrepo/with-dev-deps",
-    "@testrepo/compiled-by-legacy",
     "@testrepo/nonexisting-dev-files",
     "@testrepo/deprecated-config",
     "@testrepo/file-casing",
diff --git a/rewatch/tests/format.sh b/rewatch/tests/format.sh
@@ -6,13 +6,13 @@ bold "Test: It should format all files"
 git diff --name-only ./
 error_output=$("$REWATCH_EXECUTABLE" format)
 git_diff_file_count=$(git diff --name-only ./ | wc -l | xargs)
-if [ $? -eq 0 ] && [ $git_diff_file_count -eq 9 ];
+if [ $? -eq 0 ] && [ $git_diff_file_count -eq 8 ];
 then
     success "Test package formatted. Got $git_diff_file_count changed files."
     git restore .
 else
     error "Error formatting test package"
-    echo "Expected 9 files to be changed, got $git_diff_file_count"
+    echo "Expected 8 files to be changed, got $git_diff_file_count"
     echo $error_output
     exit 1
 fi
@@ -62,7 +62,7 @@ bold "Test: it should format dev package as well"
 
 error_output=$("$REWATCH_EXECUTABLE" format --dev)
 git_diff_file_count=$(git diff --name-only ./ | wc -l | xargs)
-if [ $? -eq 0 ] && [ $git_diff_file_count -eq 10 ];
+if [ $? -eq 0 ] && [ $git_diff_file_count -eq 9 ];
 then
     success "All packages (including dev) were formatted. Got $git_diff_file_count changed files."
     git restore .
diff --git a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
@@ -1,4 +1,4 @@
-Cleaned 0/115
+Cleaned 0/114
 Parsed 2 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/clean-rebuild.txt b/rewatch/tests/snapshots/clean-rebuild.txt
@@ -1,6 +1,6 @@
 Cleaned 0/0
-Parsed 112 source files
-Compiled 112 modules
+Parsed 111 source files
+Compiled 111 modules
 
 The field 'bs-dependencies' found in the package config of '@testrepo/deprecated-config' is deprecated and will be removed in a future version.
 Use 'dependencies' instead.
diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt
@@ -1,4 +1,4 @@
-Cleaned 0/115
+Cleaned 0/114
 Parsed 1 source files
 Compiled 0 modules
 
diff --git a/rewatch/tests/snapshots/remove-file.txt b/rewatch/tests/snapshots/remove-file.txt
@@ -1,4 +1,4 @@
-Cleaned 1/115
+Cleaned 1/114
 Parsed 0 source files
 Compiled 1 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt
@@ -1,4 +1,4 @@
-Cleaned 2/115
+Cleaned 2/114
 Parsed 2 source files
 Compiled 3 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-internal-dep.txt b/rewatch/tests/snapshots/rename-file-internal-dep.txt
@@ -1,4 +1,4 @@
-Cleaned 2/115
+Cleaned 2/114
 Parsed 2 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-with-interface.txt b/rewatch/tests/snapshots/rename-file-with-interface.txt
@@ -1,5 +1,5 @@
 [2K No implementation file found for interface file (skipping): src/ModuleWithInterface.resi
-Cleaned 2/115
+Cleaned 2/114
 Parsed 1 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/rename-file.txt b/rewatch/tests/snapshots/rename-file.txt
@@ -1,4 +1,4 @@
-Cleaned 1/115
+Cleaned 1/114
 Parsed 1 source files
 Compiled 1 modules
 
diff --git a/rewatch/tests/snapshots/rename-interface-file.txt b/rewatch/tests/snapshots/rename-interface-file.txt
@@ -1,5 +1,5 @@
 [2K No implementation file found for interface file (skipping): src/ModuleWithInterface2.resi
-Cleaned 1/115
+Cleaned 1/114
 Parsed 1 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/suffix.sh b/rewatch/tests/suffix.sh
@@ -31,7 +31,7 @@ fi
 # Count files with new extension
 file_count=$(find ./packages -name *.res.js | wc -l)
 
-if [ "$file_count" -eq 134 ];
+if [ "$file_count" -eq 132 ];
 then
   success "Found files with correct suffix"
 else

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`"author": "",`
`13`	`13`	`"license": "MIT",`
`14`	`14`	`"dependencies": {`
`15`		`- "@testrepo/compiled-by-legacy": "*",`
`16`	`15`	`"@testrepo/dep01": "*"`
`17`	`16`	`}`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Cleaned 0/115`
	`1`	`+Cleaned 0/114`
`2`	`2`	`Parsed 2 source files`
`3`	`3`	`Compiled 2 modules`
`4`	`4`