Merge pull request #5 from cknitt/PR-7604

nojaf · web-flow · commit 7da927217382 · 2025-07-11T10:26:24.000+02:00
Fix rewatch tests
diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json
@@ -9,7 +9,8 @@
       "packages/new-namespace",
       "packages/namespace-casing",
       "packages/with-dev-deps",
-      "packages/compiled-by-legacy"
+      "packages/compiled-by-legacy",
+      "packages/package-name-mismatch"
     ]
   },
   "dependencies": {
diff --git a/rewatch/testrepo/packages/package-name-mismatch/package.json b/rewatch/testrepo/packages/package-name-mismatch/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "xyz",
+  "name": "@testrepo/package-name-mismatch",
   "version": "0.0.1",
   "keywords": [
     "rescript"
diff --git a/rewatch/testrepo/packages/package-name-mismatch/rescript.json b/rewatch/testrepo/packages/package-name-mismatch/rescript.json
@@ -1,5 +1,5 @@
 {
-  "name": "@testrepo/package-name-mismatch",
+  "name": "xyz",
   "sources": {
     "dir": "src",
     "subdirs": true
diff --git a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs b/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs
@@ -0,0 +1,6 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+console.log("hi");
+
+/*  Not a pure module */
diff --git a/rewatch/testrepo/yarn.lock b/rewatch/testrepo/yarn.lock
@@ -81,6 +81,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@testrepo/package-name-mismatch@workspace:packages/package-name-mismatch":
+  version: 0.0.0-use.local
+  resolution: "@testrepo/package-name-mismatch@workspace:packages/package-name-mismatch"
+  languageName: unknown
+  linkType: soft
+
 "@testrepo/with-dev-deps@workspace:packages/with-dev-deps":
   version: 0.0.0-use.local
   resolution: "@testrepo/with-dev-deps@workspace:packages/with-dev-deps"
diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt
@@ -1,4 +1,10 @@
-Cleaned 0/15
+WARN:
+
+Package name mismatch for /Users/christoph/projects/cca/rescript/rewatch/testrepo/packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
+Cleaned 0/16
 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,10 @@
-Cleaned 1/15
+WARN:
+
+Package name mismatch for /packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
+Cleaned 1/16
 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,10 @@
-Cleaned 2/15
+WARN:
+
+Package name mismatch for /packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
+Cleaned 2/16
 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,10 @@
-Cleaned 2/15
+WARN:
+
+Package name mismatch for /packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
+Cleaned 2/16
 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,4 +1,10 @@
+WARN:
+
+Package name mismatch for /packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
 [2K No implementation file found for interface file (skipping): src/ModuleWithInterface.resi
-Cleaned 2/15
+Cleaned 2/16
 Parsed 1 source files
 Compiled 2 modules
diff --git a/rewatch/tests/snapshots/rename-file.txt b/rewatch/tests/snapshots/rename-file.txt
@@ -1,3 +1,9 @@
-Cleaned 1/15
+WARN:
+
+Package name mismatch for /Users/christoph/projects/cca/rescript/rewatch/testrepo/packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
+Cleaned 1/16
 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,4 +1,10 @@
+WARN:
+
+Package name mismatch for /packages/package-name-mismatch:
+The package.json name is "@testrepo/package-name-mismatch", while the rescript.json name is "xyz"
+This inconsistency will cause issues with package resolution.
+
 [2K No implementation file found for interface file (skipping): src/ModuleWithInterface2.resi
-Cleaned 1/15
+Cleaned 1/16
 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 26 ];
+if [ "$file_count" -eq 28 ];
 then
   success "Found files with correct suffix"
 else

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "xyz",`
	`2`	`+ "name": "@testrepo/package-name-mismatch",`
`3`	`3`	`"version": "0.0.1",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"rescript"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@testrepo/package-name-mismatch",`
	`2`	`+ "name": "xyz",`
`3`	`3`	`"sources": {`
`4`	`4`	`"dir": "src",`
`5`	`5`	`"subdirs": true`