From 370169d8267da12b8a6e6bdfba693009c5503005 Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Thu, 24 Sep 2026 18:25:36 +0800 Subject: [PATCH] fix(turbopack): preserve generated imports for merged re-exports --- turbopack/crates/turbopack-ecmascript/src/lib.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/turbopack/crates/turbopack-ecmascript/src/lib.rs b/turbopack/crates/turbopack-ecmascript/src/lib.rs index 09b2d83c529f..7c6b38540657 100644 --- a/turbopack/crates/turbopack-ecmascript/src/lib.rs +++ b/turbopack/crates/turbopack-ecmascript/src/lib.rs @@ -2534,7 +2534,12 @@ fn hygiene_rename_only( } fn preserve_name(&self, orig: &Id) -> bool { - self.preserved_exports.contains(orig) || orig.1.has_mark(self.is_import_mark) + self.preserved_exports.contains(orig) + || orig.1.has_mark(self.is_import_mark) + // Re-exports from another merged module can refer to this generated import by + // its original name. Leave collision resolution to the merged-module hygiene + // pass so those references and the declaration are renamed together. + || orig.0.starts_with("__TURBOPACK__imported__module__") } } swc_core::ecma::transforms::base::rename::renamer_keep_contexts(