Revert "add E2E test repo with PPX"

tsnobip · tsnobip · commit 70893a18e831 · 2025-08-07T10:23:13.000+02:00
This reverts commit af7843f.
diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json
@@ -1,9 +1,21 @@
 {
   "name": "testrepo",
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": {
+    "packages": [
+      "packages/main",
+      "packages/dep01",
+      "packages/dep02",
+      "packages/new-namespace",
+      "packages/namespace-casing",
+      "packages/with-dev-deps",
+      "packages/compiled-by-legacy",
+      "packages/nonexisting-dev-files",
+      "packages/deprecated-config",
+      "packages/file-casing",
+      "packages/file-casing-no-namespace"
+    ]
+  },
   "dependencies": {
     "rescript": "12.0.0-beta.1"
   },
diff --git a/rewatch/testrepo/packages/dep01/package.json b/rewatch/testrepo/packages/dep01/package.json
@@ -12,6 +12,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/dep02": "workspace:*"
+    "@testrepo/dep02": "*"
   }
 }
diff --git a/rewatch/testrepo/packages/main/package.json b/rewatch/testrepo/packages/main/package.json
@@ -12,7 +12,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/compiled-by-legacy": "workspace:*",
-    "@testrepo/dep01": "workspace:*"
+    "@testrepo/compiled-by-legacy": "*",
+    "@testrepo/dep01": "*"
   }
 }
diff --git a/rewatch/testrepo/packages/with-ppx/package.json b/rewatch/testrepo/packages/with-ppx/package.json
diff --git a/rewatch/testrepo/packages/with-ppx/rescript.json b/rewatch/testrepo/packages/with-ppx/rescript.json
diff --git a/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.mjs
diff --git a/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res b/rewatch/testrepo/packages/with-ppx/src/FileWithPpx.res
diff --git a/rewatch/testrepo/rescript.json b/rewatch/testrepo/rescript.json
@@ -25,7 +25,6 @@
     "@testrepo/nonexisting-dev-files",
     "@testrepo/deprecated-config",
     "@testrepo/file-casing",
-    "@testrepo/file-casing-no-namespace",
-    "@testrepo/with-ppx"
+    "@testrepo/file-casing-no-namespace"
   ]
 }
diff --git a/rewatch/testrepo/yarn.lock b/rewatch/testrepo/yarn.lock
@@ -49,21 +49,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testrepo/compiled-by-legacy@workspace:*, @testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy":
+"@testrepo/compiled-by-legacy@npm:*, @testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy":
   version: 0.0.0-use.local
   resolution: "@testrepo/compiled-by-legacy@workspace:packages/compiled-by-legacy"
   languageName: unknown
   linkType: soft
 
-"@testrepo/dep01@workspace:*, @testrepo/dep01@workspace:packages/dep01":
+"@testrepo/dep01@npm:*, @testrepo/dep01@workspace:packages/dep01":
   version: 0.0.0-use.local
   resolution: "@testrepo/dep01@workspace:packages/dep01"
   dependencies:
-    "@testrepo/dep02": "workspace:*"
+    "@testrepo/dep02": "npm:*"
   languageName: unknown
   linkType: soft
 
-"@testrepo/dep02@workspace:*, @testrepo/dep02@workspace:packages/dep02":
+"@testrepo/dep02@npm:*, @testrepo/dep02@workspace:packages/dep02":
   version: 0.0.0-use.local
   resolution: "@testrepo/dep02@workspace:packages/dep02"
   languageName: unknown
@@ -91,8 +91,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@testrepo/main@workspace:packages/main"
   dependencies:
-    "@testrepo/compiled-by-legacy": "workspace:*"
-    "@testrepo/dep01": "workspace:*"
+    "@testrepo/compiled-by-legacy": "npm:*"
+    "@testrepo/dep01": "npm:*"
   languageName: unknown
   linkType: soft
 
@@ -123,16 +123,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@testrepo/with-ppx@workspace:packages/with-ppx":
-  version: 0.0.0-use.local
-  resolution: "@testrepo/with-ppx@workspace:packages/with-ppx"
-  dependencies:
-    rescript-nodejs: "npm:16.1.0"
-    sury: "npm:^11.0.0-alpha.2"
-    sury-ppx: "npm:^11.0.0-alpha.2"
-  languageName: unknown
-  linkType: soft
-
 "rescript-nodejs@npm:16.1.0":
   version: 16.1.0
   resolution: "rescript-nodejs@npm:16.1.0"
@@ -170,27 +160,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sury-ppx@npm:^11.0.0-alpha.2":
-  version: 11.0.0-alpha.2
-  resolution: "sury-ppx@npm:11.0.0-alpha.2"
-  peerDependencies:
-    sury: ^11.0.0-alpha.2
-  checksum: 10c0/ae9190fa4e406de46e88b67db233e757db36f5377301227cf5b084b5b81d360725d6fc4781e24c56cb87476cd3a42af5acc0cfc49f0c7ea17435caf065ba22ab
-  languageName: node
-  linkType: hard
-
-"sury@npm:^11.0.0-alpha.2":
-  version: 11.0.0-alpha.2
-  resolution: "sury@npm:11.0.0-alpha.2"
-  peerDependencies:
-    rescript: 11.x
-  peerDependenciesMeta:
-    rescript:
-      optional: true
-  checksum: 10c0/254dd708608b125defc6b4be0f038df0f6704290df60504b70b7cd613f1e840d150ff65a3f23dbc7213f2b18b86fdc60400b4361ca46f5c86bbe7360eff9c84a
-  languageName: node
-  linkType: hard
-
 "testrepo@workspace:.":
   version: 0.0.0-use.local
   resolution: "testrepo@workspace:."
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/67
+Cleaned 0/60
 Parsed 2 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt
@@ -1,4 +1,4 @@
-Cleaned 0/67
+Cleaned 0/60
 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/67
+Cleaned 1/60
 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/67
+Cleaned 2/60
 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/67
+Cleaned 2/60
 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/67
+Cleaned 2/60
 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/67
+Cleaned 1/60
 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/67
+Cleaned 1/60
 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 38 ];
+if [ "$file_count" -eq 36 ];
 then
   success "Found files with correct suffix"
 else
diff --git a/rewatch/tests/suite-ci.sh b/rewatch/tests/suite-ci.sh
@@ -19,7 +19,7 @@ export RESCRIPT_BSC_EXE
 source ./utils.sh
 
 bold "Rescript version"
-rewatch --version
+(cd ../testrepo && ./node_modules/.bin/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

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`"author": "",`
`13`	`13`	`"license": "MIT",`
`14`	`14`	`"dependencies": {`
`15`		`- "@testrepo/dep02": "workspace:*"`
	`15`	`+ "@testrepo/dep02": "*"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"author": "",`
`13`	`13`	`"license": "MIT",`
`14`	`14`	`"dependencies": {`
`15`		`- "@testrepo/compiled-by-legacy": "workspace:*",`
`16`		`- "@testrepo/dep01": "workspace:*"`
	`15`	`+ "@testrepo/compiled-by-legacy": "*",`
	`16`	`+ "@testrepo/dep01": "*"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`"@testrepo/nonexisting-dev-files",`
`26`	`26`	`"@testrepo/deprecated-config",`
`27`	`27`	`"@testrepo/file-casing",`
`28`		`- "@testrepo/file-casing-no-namespace",`
`29`		`- "@testrepo/with-ppx"`
	`28`	`+ "@testrepo/file-casing-no-namespace"`
`30`	`29`	`]`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Cleaned 0/67`
	`1`	`+Cleaned 0/60`
`2`	`2`	`Parsed 2 source files`
`3`	`3`	`Compiled 2 modules`
`4`	`4`