fix: should use ordered map to store module outgoing refs

Author: JSerFeng

crates/rspack_core/src/concatenated_module.rs

@@ -1,6 +1,6 @@
 use std::{
   borrow::Cow,
-  collections::{BTreeMap, hash_map::Entry},
+  collections::BTreeMap,
   fmt::Debug,
   hash::{BuildHasherDefault, Hasher},
   sync::{Arc, LazyLock},
@@ -22,7 +22,8 @@ use rspack_sources::{
   BoxSource, CachedSource, ConcatSource, RawStringSource, ReplaceSource, Source, SourceExt,
 };
 use rspack_util::{
-  SpanExt, ext::DynHash, itoa, json_stringify, source_map::SourceMapKind, swc::join_atom,
+  SpanExt, ext::DynHash, fx_hash::FxIndexMap, itoa, json_stringify, source_map::SourceMapKind,
+  swc::join_atom,
 };
 use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet, FxHasher};
 use swc_core::{
@@ -204,7 +205,7 @@ pub struct ConcatenatedModuleInfo {
   pub global_scope_ident: Vec<ConcatenatedModuleIdent>,
   pub idents: Vec<ConcatenatedModuleIdent>,
   pub all_used_names: HashSet<Atom>,
-  pub binding_to_ref: HashMap<(Atom, SyntaxContext), Vec<ConcatenatedModuleIdent>>,
+  pub binding_to_ref: FxIndexMap<(Atom, SyntaxContext), Vec<ConcatenatedModuleIdent>>,
 
   pub public_path_auto_replacement: Option<bool>,
   pub static_url_replacement: bool,
@@ -2319,15 +2320,15 @@ impl ConcatenatedModule {
       }
       module_info.all_used_names = all_used_names;
 
-      let mut binding_to_ref: HashMap<(Atom, SyntaxContext), Vec<ConcatenatedModuleIdent>> =
-        HashMap::default();
+      let mut binding_to_ref: FxIndexMap<(Atom, SyntaxContext), Vec<ConcatenatedModuleIdent>> =
+        Default::default();
 
       for ident in module_info.idents.iter() {
         match binding_to_ref.entry((ident.id.sym.clone(), ident.id.ctxt)) {
-          Entry::Occupied(mut occ) => {
+          indexmap::map::Entry::Occupied(mut occ) => {
             occ.get_mut().push(ident.clone());
           }
-          Entry::Vacant(vac) => {
+          indexmap::map::Entry::Vacant(vac) => {
             vac.insert(vec![ident.clone()]);
           }
         };

crates/rspack_plugin_esm_library/src/link.rs

@@ -1,5 +1,5 @@
 use std::{
-  collections::{self, hash_map::Entry},
+  collections::{self},
   hash::BuildHasher,
   sync::Arc,
 };
@@ -27,7 +27,7 @@ use rspack_plugin_javascript::{
 };
 use rspack_util::{
   atom::Atom,
-  fx_hash::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet},
+  fx_hash::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet, indexmap},
   swc::join_atom,
 };
 use swc_core::{
@@ -821,17 +821,17 @@ impl EsmLibraryPlugin {
                   idents.push(ident);
                 }
 
-                let mut binding_to_ref: FxHashMap<
+                let mut binding_to_ref: FxIndexMap<
                   (Atom, SyntaxContext),
                   Vec<ConcatenatedModuleIdent>,
-                > = FxHashMap::default();
+                > = Default::default();
 
                 for ident in &idents {
                   match binding_to_ref.entry((ident.id.sym.clone(), ident.id.ctxt)) {
-                    Entry::Occupied(mut occ) => {
+                    indexmap::map::Entry::Occupied(mut occ) => {
                       occ.get_mut().push(ident.clone());
                     }
-                    Entry::Vacant(vac) => {
+                    indexmap::map::Entry::Vacant(vac) => {
                       vac.insert(vec![ident.clone()]);
                     }
                   };
@@ -1517,7 +1517,14 @@ impl EsmLibraryPlugin {
 
     // link entry direct exports
     if let Some(preserve_modules) = &self.preserve_modules {
-      for module_id in module_graph.modules().keys() {
+      let modules = module_graph.modules();
+      let mut modules = modules.keys().collect::<Vec<_>>();
+      modules.sort_by(|a, b| {
+        let ad = module_graph.get_depth(a);
+        let bd = module_graph.get_depth(b);
+        ad.cmp(&bd)
+      });
+      for module_id in modules {
         if compilation.entry_modules().contains(module_id) {
           continue;
         }

crates/rspack_util/src/fx_hash.rs

@@ -1,9 +1,9 @@
 use std::hash::BuildHasherDefault;
 
 use dashmap::{DashMap, DashSet};
+pub use indexmap;
 use indexmap::{IndexMap, IndexSet};
 use rustc_hash::FxHasher;
-
 pub type BuildFxHasher = BuildHasherDefault<FxHasher>;
 pub use rustc_hash::{FxHashMap, FxHashSet};
 pub type FxDashMap<K, V> = DashMap<K, V, BuildHasherDefault<FxHasher>>;

tests/rspack-test/esmOutputCases/deconflict/deconflit-local/__snapshots__/esm.snap.txt

@@ -6,13 +6,13 @@ const value = 42
 // ./index.js
 
 
-const index_local_0 = 'index'
-const index_local = ''
+const index_local = 'index'
+const index_index_local = ''
 
 it('should have deconflicted symbol', () => {
 	expect(value).toBe(42)
-	expect(index_local_0).toBe('index')
-	expect(index_local).toBe('')
+	expect(index_local).toBe('index')
+	expect(index_index_local).toBe('')
 })
 
 

tests/rspack-test/esmOutputCases/deconflict/other-chunk-local/__snapshots__/esm.snap.txt

@@ -6,13 +6,13 @@ const value = 42
 // ./index.js
 
 
-const index_local_0 = 'index'
-const index_local = ''
+const index_local = 'index'
+const index_index_local = ''
 
 it('should have deconflicted symbol', async () => {
 	expect(value).toBe(42)
-	expect(index_local_0).toBe('index')
-	expect(index_local).toBe('')
+	expect(index_local).toBe('index')
+	expect(index_index_local).toBe('')
 	const {value: v} = await import("./other_js.mjs").then((mod) => ({ value: mod.value }))
 	expect(v).toBe(value)
 })