From dd768f2ea291c6a95dc4a333da054ddb5b8b5281 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 9 Jul 2025 08:38:59 +0200 Subject: [PATCH 1/2] Rewatch: fix panic if package.json name different from module name --- rewatch/src/build/packages.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rewatch/src/build/packages.rs b/rewatch/src/build/packages.rs index 9783f2b3a6..064383c3b7 100644 --- a/rewatch/src/build/packages.rs +++ b/rewatch/src/build/packages.rs @@ -470,7 +470,7 @@ fn read_packages( dependencies.iter().for_each(|d| { if !map.contains_key(&d.name) { let package = make_package(d.config.to_owned(), &d.path, d.is_pinned, false); - map.insert(package.name.to_string(), package); + map.insert(d.name.to_string(), package); } }); From 79cf75776a995448c8aef9d2562c2100bd55a25d Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 9 Jul 2025 08:43:18 +0200 Subject: [PATCH 2/2] CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69b47a665c..8768980bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,7 +47,10 @@ - Pass location to children prop in jsx ppx. https://github.com/rescript-lang/rescript/pull/7540 - Fix crash when `bs-g` is used with untagged variants. https://github.com/rescript-lang/rescript/pull/7575 - Fix issue with preserve mode where `jsx` is declared as an external without a `@module` attribute. https://github.com/rescript-lang/rescript/pull/7591 +- Rewatch: don't add deps to modules that are in packages that are not a dependency. https://github.com/rescript-lang/rescript/pull/7612 +- Rewatch: fix non-unicode stderr. https://github.com/rescript-lang/rescript/pull/7613 - Fix rewatch considering warning configs of non-local dependencies. https://github.com/rescript-lang/rescript/pull/7614 +- Rewatch: fix panic if package.json name different from module name. https://github.com/rescript-lang/rescript/pull/7616 #### :nail_care: Polish