From f59a4057b3cd91554701f49bd80ba1001c22f78b Mon Sep 17 00:00:00 2001 From: nojaf Date: Sat, 5 Jul 2025 16:50:39 +0200 Subject: [PATCH 1/7] Detect package name mismatch --- rewatch/src/build/compile.rs | 1 + rewatch/src/build/packages.rs | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rewatch/src/build/compile.rs b/rewatch/src/build/compile.rs index 012efe1c61..afba416922 100644 --- a/rewatch/src/build/compile.rs +++ b/rewatch/src/build/compile.rs @@ -560,6 +560,7 @@ fn get_dependency_paths( let package_name = dependent_package.name(); let dependency_path = if let Some(packages) = packages { packages + // package name (from rescript.json) is used here. .get(package_name) .as_ref() .map(|package| package.path.clone()) diff --git a/rewatch/src/build/packages.rs b/rewatch/src/build/packages.rs index 66171c30ad..48e2f5ce17 100644 --- a/rewatch/src/build/packages.rs +++ b/rewatch/src/build/packages.rs @@ -422,8 +422,20 @@ fn make_package(config: config::Config, package_path: &Path, is_pinned_dep: bool }; let package_name = read_package_name(package_path).expect("Could not read package name"); + if package_name != config.name { + log::warn!( + "\nPackage name mismatch:\n\ + - package.json name: {}\n\ + - rescript.json name: {}\n\ + This inconsistency might cause issues with package resolution.\n", + package_name, + config.name, + ); + } + Package { - name: package_name, + // Reuse name from rescript.json instead. + name: config.name.clone(), config: config.to_owned(), source_folders, source_files: None, From 370ec447576b39aa71c79918ad83c4d36b4984da Mon Sep 17 00:00:00 2001 From: nojaf Date: Thu, 10 Jul 2025 14:43:00 +0200 Subject: [PATCH 2/7] Add test project --- rewatch/testrepo/bsconfig.json | 6 ++++-- .../packages/package-name-mismatch/package.json | 9 +++++++++ .../packages/package-name-mismatch/rescript.json | 12 ++++++++++++ .../package-name-mismatch/src/NameMismatch.res | 1 + 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 rewatch/testrepo/packages/package-name-mismatch/package.json create mode 100644 rewatch/testrepo/packages/package-name-mismatch/rescript.json create mode 100644 rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res diff --git a/rewatch/testrepo/bsconfig.json b/rewatch/testrepo/bsconfig.json index 95e49a9f45..99af932034 100644 --- a/rewatch/testrepo/bsconfig.json +++ b/rewatch/testrepo/bsconfig.json @@ -21,7 +21,8 @@ "@testrepo/new-namespace", "@testrepo/namespace-casing", "@testrepo/with-dev-deps", - "@testrepo/compiled-by-legacy" + "@testrepo/compiled-by-legacy", + "@testrepo/package-name-mismatch" ], "bs-dependencies": [ "@testrepo/main", @@ -30,7 +31,8 @@ "@testrepo/new-namespace", "@testrepo/namespace-casing", "@testrepo/with-dev-deps", - "@testrepo/compiled-by-legacy" + "@testrepo/compiled-by-legacy", + "@testrepo/package-name-mismatch" ], "reason": { "react-jsx": 3 diff --git a/rewatch/testrepo/packages/package-name-mismatch/package.json b/rewatch/testrepo/packages/package-name-mismatch/package.json new file mode 100644 index 0000000000..e586de4b8e --- /dev/null +++ b/rewatch/testrepo/packages/package-name-mismatch/package.json @@ -0,0 +1,9 @@ +{ + "name": "xyz", + "version": "0.0.1", + "keywords": [ + "rescript" + ], + "author": "", + "license": "MIT" +} diff --git a/rewatch/testrepo/packages/package-name-mismatch/rescript.json b/rewatch/testrepo/packages/package-name-mismatch/rescript.json new file mode 100644 index 0000000000..482d9a5345 --- /dev/null +++ b/rewatch/testrepo/packages/package-name-mismatch/rescript.json @@ -0,0 +1,12 @@ +{ + "name": "@testrepo/package-name-mismatch", + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "es6", + "in-source": true + }, + "suffix": ".bs.js" +} diff --git a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res b/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res new file mode 100644 index 0000000000..91c2f698d3 --- /dev/null +++ b/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res @@ -0,0 +1 @@ +Console.log("hi") \ No newline at end of file From dd8397604b6a03c365c6021410a486bc43a1d7bc Mon Sep 17 00:00:00 2001 From: nojaf Date: Fri, 11 Jul 2025 09:59:17 +0200 Subject: [PATCH 3/7] Update warning message --- rewatch/src/build/compile.rs | 1 - rewatch/src/build/packages.rs | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rewatch/src/build/compile.rs b/rewatch/src/build/compile.rs index 05dabecea3..8a472e7d85 100644 --- a/rewatch/src/build/compile.rs +++ b/rewatch/src/build/compile.rs @@ -538,7 +538,6 @@ fn get_dependency_paths( let package_name = dependent_package.name(); let dependency_path = if let Some(packages) = packages { packages - // package name (from rescript.json) is used here. .get(package_name) .as_ref() .map(|package| package.path.clone()) diff --git a/rewatch/src/build/packages.rs b/rewatch/src/build/packages.rs index afe44e6f7d..6ad3b53c12 100644 --- a/rewatch/src/build/packages.rs +++ b/rewatch/src/build/packages.rs @@ -429,18 +429,17 @@ fn make_package(config: config::Config, package_path: &Path, is_pinned_dep: bool let package_name = read_package_name(package_path).expect("Could not read package name"); if package_name != config.name { log::warn!( - "\nPackage name mismatch:\n\ - - package.json name: {}\n\ - - rescript.json name: {}\n\ - This inconsistency might cause issues with package resolution.\n", + "\nPackage name mismatch for {}:\n\ +The package.json name is \"{}\", while the rescript.json name is \"{}\"\n\ +This inconsistency will cause issues with package resolution.\n", + package_path.to_string_lossy(), package_name, config.name, ); } Package { - // Reuse name from rescript.json instead. - name: config.name.clone(), + name: package_name, config: config.to_owned(), source_folders, source_files: None, From 08faa3e02511b0400d15d72aeb20657bcfa3d255 Mon Sep 17 00:00:00 2001 From: nojaf Date: Fri, 11 Jul 2025 10:00:28 +0200 Subject: [PATCH 4/7] Add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de6f499274..c80c665e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ - Add experimental command to `rescript-tools` for formatting all ReScript code blocks in markdown. Either in a markdown file directly, or inside of docstrings in ReScript code. https://github.com/rescript-lang/rescript/pull/7598 +#### :nail_care: Polish + +- Add a warning if the name in package.json does not match the name in rescript.json. https://github.com/rescript-lang/rescript/pull/7604 + # 12.0.0-alpha.15 #### :boom: Breaking Change From 445c9610ac30dedc891ae7130a35af90db29897a Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Fri, 11 Jul 2025 10:18:53 +0200 Subject: [PATCH 5/7] Fix rewatch tests --- rewatch/testrepo/package.json | 3 ++- .../testrepo/packages/package-name-mismatch/package.json | 2 +- .../testrepo/packages/package-name-mismatch/rescript.json | 2 +- .../packages/package-name-mismatch/src/NameMismatch.mjs | 6 ++++++ rewatch/testrepo/yarn.lock | 6 ++++++ rewatch/tests/snapshots/dependency-cycle.txt | 8 +++++++- rewatch/tests/snapshots/remove-file.txt | 8 +++++++- .../snapshots/rename-file-internal-dep-namespace.txt | 8 +++++++- rewatch/tests/snapshots/rename-file-internal-dep.txt | 8 +++++++- rewatch/tests/snapshots/rename-file-with-interface.txt | 8 +++++++- rewatch/tests/snapshots/rename-file.txt | 8 +++++++- rewatch/tests/snapshots/rename-interface-file.txt | 8 +++++++- rewatch/tests/suffix.sh | 2 +- 13 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json index 638c31f638..cca6bcc823 100644 --- 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 index e586de4b8e..8cfdfc2446 100644 --- 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 index 482d9a5345..4d87c7d055 100644 --- 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 new file mode 100644 index 0000000000..5b9532a451 --- /dev/null +++ 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 index 5c323e6f29..cd52ff7604 100644 --- 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 index c6d7f793e8..720ab0a6f2 100644 --- 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 index 8d68cdd418..2f24e0128d 100644 --- 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 index 3263c0fe88..fef5b9bce7 100644 --- 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 index 829a187871..2cf69fab29 100644 --- 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 index e784d71b9e..2465988d7c 100644 --- 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. +  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 index 5458530d74..5be1ae9b63 100644 --- 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 index 26d7ffe3e6..936862925c 100644 --- 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. +  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 index 499738ab9d..51d8c9e816 100755 --- 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 From 0b354805114e5820f953ef654261196b9ae510ab Mon Sep 17 00:00:00 2001 From: nojaf Date: Fri, 11 Jul 2025 10:33:57 +0200 Subject: [PATCH 6/7] Revert test --- rewatch/testrepo/bsconfig.json | 6 ++---- rewatch/testrepo/package.json | 3 +-- .../packages/package-name-mismatch/package.json | 9 --------- .../packages/package-name-mismatch/rescript.json | 12 ------------ .../package-name-mismatch/src/NameMismatch.mjs | 6 ------ .../package-name-mismatch/src/NameMismatch.res | 1 - rewatch/testrepo/yarn.lock | 6 ------ 7 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 rewatch/testrepo/packages/package-name-mismatch/package.json delete mode 100644 rewatch/testrepo/packages/package-name-mismatch/rescript.json delete mode 100644 rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs delete mode 100644 rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res diff --git a/rewatch/testrepo/bsconfig.json b/rewatch/testrepo/bsconfig.json index 99af932034..95e49a9f45 100644 --- a/rewatch/testrepo/bsconfig.json +++ b/rewatch/testrepo/bsconfig.json @@ -21,8 +21,7 @@ "@testrepo/new-namespace", "@testrepo/namespace-casing", "@testrepo/with-dev-deps", - "@testrepo/compiled-by-legacy", - "@testrepo/package-name-mismatch" + "@testrepo/compiled-by-legacy" ], "bs-dependencies": [ "@testrepo/main", @@ -31,8 +30,7 @@ "@testrepo/new-namespace", "@testrepo/namespace-casing", "@testrepo/with-dev-deps", - "@testrepo/compiled-by-legacy", - "@testrepo/package-name-mismatch" + "@testrepo/compiled-by-legacy" ], "reason": { "react-jsx": 3 diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json index cca6bcc823..638c31f638 100644 --- a/rewatch/testrepo/package.json +++ b/rewatch/testrepo/package.json @@ -9,8 +9,7 @@ "packages/new-namespace", "packages/namespace-casing", "packages/with-dev-deps", - "packages/compiled-by-legacy", - "packages/package-name-mismatch" + "packages/compiled-by-legacy" ] }, "dependencies": { diff --git a/rewatch/testrepo/packages/package-name-mismatch/package.json b/rewatch/testrepo/packages/package-name-mismatch/package.json deleted file mode 100644 index 8cfdfc2446..0000000000 --- a/rewatch/testrepo/packages/package-name-mismatch/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "@testrepo/package-name-mismatch", - "version": "0.0.1", - "keywords": [ - "rescript" - ], - "author": "", - "license": "MIT" -} diff --git a/rewatch/testrepo/packages/package-name-mismatch/rescript.json b/rewatch/testrepo/packages/package-name-mismatch/rescript.json deleted file mode 100644 index 4d87c7d055..0000000000 --- a/rewatch/testrepo/packages/package-name-mismatch/rescript.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "xyz", - "sources": { - "dir": "src", - "subdirs": true - }, - "package-specs": { - "module": "es6", - "in-source": true - }, - "suffix": ".bs.js" -} diff --git a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs b/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs deleted file mode 100644 index 5b9532a451..0000000000 --- a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.mjs +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by ReScript, PLEASE EDIT WITH CARE - - -console.log("hi"); - -/* Not a pure module */ diff --git a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res b/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res deleted file mode 100644 index 91c2f698d3..0000000000 --- a/rewatch/testrepo/packages/package-name-mismatch/src/NameMismatch.res +++ /dev/null @@ -1 +0,0 @@ -Console.log("hi") \ No newline at end of file diff --git a/rewatch/testrepo/yarn.lock b/rewatch/testrepo/yarn.lock index cd52ff7604..5c323e6f29 100644 --- a/rewatch/testrepo/yarn.lock +++ b/rewatch/testrepo/yarn.lock @@ -81,12 +81,6 @@ __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" From 69f89ce4ec8067d4f70e08ed8c6d81f35060dc7d Mon Sep 17 00:00:00 2001 From: nojaf Date: Fri, 11 Jul 2025 10:37:10 +0200 Subject: [PATCH 7/7] Revert snapshots --- rewatch/tests/snapshots/dependency-cycle.txt | 8 +------- rewatch/tests/snapshots/remove-file.txt | 8 +------- .../snapshots/rename-file-internal-dep-namespace.txt | 8 +------- rewatch/tests/snapshots/rename-file-internal-dep.txt | 8 +------- rewatch/tests/snapshots/rename-file-with-interface.txt | 8 +------- rewatch/tests/snapshots/rename-file.txt | 8 +------- rewatch/tests/snapshots/rename-interface-file.txt | 8 +------- rewatch/tests/suffix.sh | 2 +- 8 files changed, 8 insertions(+), 50 deletions(-) diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt index 720ab0a6f2..c6d7f793e8 100644 --- a/rewatch/tests/snapshots/dependency-cycle.txt +++ b/rewatch/tests/snapshots/dependency-cycle.txt @@ -1,10 +1,4 @@ -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 +Cleaned 0/15 Parsed 1 source files Compiled 0 modules diff --git a/rewatch/tests/snapshots/remove-file.txt b/rewatch/tests/snapshots/remove-file.txt index 2f24e0128d..8d68cdd418 100644 --- a/rewatch/tests/snapshots/remove-file.txt +++ b/rewatch/tests/snapshots/remove-file.txt @@ -1,10 +1,4 @@ -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 +Cleaned 1/15 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 index fef5b9bce7..3263c0fe88 100644 --- a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt +++ b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt @@ -1,10 +1,4 @@ -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 +Cleaned 2/15 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 index 2cf69fab29..829a187871 100644 --- a/rewatch/tests/snapshots/rename-file-internal-dep.txt +++ b/rewatch/tests/snapshots/rename-file-internal-dep.txt @@ -1,10 +1,4 @@ -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 +Cleaned 2/15 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 index 2465988d7c..e784d71b9e 100644 --- a/rewatch/tests/snapshots/rename-file-with-interface.txt +++ b/rewatch/tests/snapshots/rename-file-with-interface.txt @@ -1,10 +1,4 @@ -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. -  No implementation file found for interface file (skipping): src/ModuleWithInterface.resi -Cleaned 2/16 +Cleaned 2/15 Parsed 1 source files Compiled 2 modules diff --git a/rewatch/tests/snapshots/rename-file.txt b/rewatch/tests/snapshots/rename-file.txt index 5be1ae9b63..5458530d74 100644 --- a/rewatch/tests/snapshots/rename-file.txt +++ b/rewatch/tests/snapshots/rename-file.txt @@ -1,9 +1,3 @@ -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 +Cleaned 1/15 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 index 936862925c..26d7ffe3e6 100644 --- a/rewatch/tests/snapshots/rename-interface-file.txt +++ b/rewatch/tests/snapshots/rename-interface-file.txt @@ -1,10 +1,4 @@ -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. -  No implementation file found for interface file (skipping): src/ModuleWithInterface2.resi -Cleaned 1/16 +Cleaned 1/15 Parsed 1 source files Compiled 2 modules diff --git a/rewatch/tests/suffix.sh b/rewatch/tests/suffix.sh index 51d8c9e816..499738ab9d 100755 --- 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 28 ]; +if [ "$file_count" -eq 26 ]; then success "Found files with correct suffix" else