chore(deps)!: bump swc_core to v46 (#12032)

* Bump

* Fix ts_collector and import

* Fix visitor.rs

* Fix lazy_barrel_artifact.rs

* Fix concatenated_module.rs

* Update ts_collector

* Fix some js plugins

* Fix JSXAttrValue::Lit

* Fix JavaScriptParserPlugin

* Fix Ts collect

* Fix rspack_plugin_esm_library

* Fix rspack_plugin_rstest

* Fix rspack_plugin_library

* Cargo shear

* Cargo codegen

* Cargo clippy

* Cargo clippy

* Fix

* fix: should use ordered map to store module outgoing refs

* Update snap

* Bump swc plugin

* Update enum string combination

---------

Co-authored-by: jserfeng <[email protected]>

Author: CPunisher

Cargo.lock

@@ -135,16 +135,15 @@ rkyv      = { version = "=0.8.8", default-features = false, features = ["std", "
 
 # Must be pinned with the same swc versions
 pnp                 = { version = "0.12.1", default-features = false }
-swc                 = { version = "43.0.0", default-features = false }
+swc                 = { version = "44.0.0", default-features = false }
 swc_config          = { version = "3.1.2", default-features = false }
-swc_core            = { version = "45.0.1", default-features = false, features = ["parallel_rayon"] }
-swc_ecma_lexer      = { version = "=24.0.0", default-features = false }
-swc_ecma_minifier   = { version = "34.0.1", default-features = false }
-swc_error_reporters = { version = "17.0.0", default-features = false }
-swc_html            = { version = "27.0.0", default-features = false }
-swc_html_minifier   = { version = "34.0.0", default-features = false }
-swc_node_comments   = { version = "15.0.0", default-features = false }
-swc_plugin_runner   = { version = "20.0.0", default-features = false }
+swc_core            = { version = "46.0.2", default-features = false, features = ["parallel_rayon"] }
+swc_ecma_minifier   = { version = "35.0.0", default-features = false }
+swc_error_reporters = { version = "18.0.0", default-features = false }
+swc_html            = { version = "28.0.0", default-features = false }
+swc_html_minifier   = { version = "35.0.0", default-features = false }
+swc_node_comments   = { version = "16.0.0", default-features = false }
+swc_plugin_runner   = { version = "21.0.0", default-features = false }
 
 wasi-common = { version = "35.0.0", default-features = false }
 wasmtime    = { version = "35.0.0", default-features = false }

Cargo.toml

@@ -12,7 +12,9 @@ pub struct DependencyVisitor {
 impl Visit for DependencyVisitor {
   /// handle `import .. from "..."`
   fn visit_import_decl(&mut self, node: &ImportDecl) {
-    self.requests.push(node.src.value.to_string());
+    self
+      .requests
+      .push(node.src.value.to_string_lossy().to_string());
   }
 
   /// handle `import("...")` and `require("...")`
@@ -28,19 +30,21 @@ impl Visit for DependencyVisitor {
       && let Some(args) = node.args.first()
       && let Expr::Lit(Lit::Str(s)) = args.expr.as_ref()
     {
-      self.requests.push(s.value.to_string());
+      self.requests.push(s.value.to_string_lossy().to_string());
     }
   }
 
   /// handle `export * from "..."`
   fn visit_export_all(&mut self, node: &ExportAll) {
-    self.requests.push(node.src.value.to_string());
+    self
+      .requests
+      .push(node.src.value.to_string_lossy().to_string());
   }
 
   /// handle `export .. from "..."`
   fn visit_named_export(&mut self, node: &swc_core::ecma::ast::NamedExport) {
     if let Some(src) = &node.src {
-      self.requests.push(src.value.to_string());
+      self.requests.push(src.value.to_string_lossy().to_string());
     }
   }
 }

crates/rspack_core/src/cache/persistent/build_dependencies/helper/visitor.rs

@@ -137,7 +137,7 @@ impl LazyDependencies {
       ForwardedIdSet::All => self.all_lazy_dependencies().collect(),
       ForwardedIdSet::IdSet(set) => set
         .iter()
-        .filter(|forward_id| !self.terminal_forward_ids.contains(forward_id))
+        .filter(|forward_id| !self.terminal_forward_ids.contains(*forward_id))
         .flat_map(|forward_id| {
           self
             .forward_id_to_request

crates/rspack_core/src/compilation/make/lazy_barrel_artifact.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,
@@ -217,7 +218,7 @@ impl ConcatenatedModuleInfo {
     }
 
     if atom.as_str() == "default" {
-      return self.internal_names.get(&DEFAULT_EXPORT_ATOM);
+      return self.internal_names.get(&*DEFAULT_EXPORT_ATOM);
     }
 
     if let Some(name) = &self.namespace_export_symbol
@@ -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_core/src/concatenated_module.rs

@@ -36,7 +36,6 @@ swc_core = { workspace = true, features = [
   "swc_ecma_codegen",
   "swc_ecma_visit",
 ] }
-swc_ecma_lexer = { workspace = true }
 swc_ecma_minifier = { workspace = true, features = ["concurrent"] }
 swc_error_reporters = { workspace = true }
 swc_node_comments = { workspace = true }

crates/rspack_javascript_compiler/Cargo.toml

@@ -124,7 +124,6 @@ fn parse_with_lexer(
   is_module: IsModule,
   with_tokens: bool,
 ) -> Result<(SwcProgram, Option<Vec<TokenAndSpan>>), Vec<parser::error::Error>> {
-  use swc_ecma_lexer::common::parser::{Parser as _, buffer::Buffer};
   let inner = || {
     // don't call capturing when with_tokens is false to avoid performance cost
     let (tokens, program_result, mut errors) = if with_tokens {

crates/rspack_javascript_compiler/src/compiler/parse.rs

@@ -3,7 +3,7 @@ use rspack_swc_plugin_ts_collector::{
   EnumMemberValue, ExportedEnumCollector, TypeExportsCollector,
 };
 use rustc_hash::FxHashMap;
-use swc::atoms::Atom;
+use swc::atoms::{Atom, Wtf8Atom};
 use swc_core::{
   common::SyntaxContext,
   ecma::{ast::Program, visit::VisitWith},
@@ -20,7 +20,8 @@ pub fn collect_typescript_info(
   if options.type_exports.unwrap_or_default() {
     program.visit_with(&mut TypeExportsCollector::new(&mut type_exports));
   }
-  let mut exported_enums: FxHashMap<Atom, FxHashMap<Atom, EnumMemberValue>> = Default::default();
+  let mut exported_enums: FxHashMap<Atom, FxHashMap<Wtf8Atom, EnumMemberValue>> =
+    Default::default();
   if let Some(kind) = &options.exported_enum {
     program.visit_with(&mut ExportedEnumCollector::new(
       matches!(kind, CollectingEnumKind::ConstOnly),
@@ -39,10 +40,12 @@ pub fn collect_typescript_info(
             .map(|(id, v)| {
               let value = match v {
                 EnumMemberValue::Number(n) => Some(EvaluatedInlinableValue::new_number(n)),
-                EnumMemberValue::String(s) => Some(EvaluatedInlinableValue::new_string(s)),
+                EnumMemberValue::String(s) => Some(EvaluatedInlinableValue::new_string(
+                  s.to_atom_lossy().into_owned(),
+                )),
                 EnumMemberValue::Unknown => None,
               };
-              (id, value)
+              (id.to_atom_lossy().into_owned(), value)
             })
             .collect(),
         );

crates/rspack_loader_swc/src/collect_ts_info.rs

@@ -87,11 +87,10 @@ impl ExternalInterop {
     if let Some(namespace_object) = &self.namespace_object {
       namespace_object.clone()
     } else {
-      let mut new_name = format!(
+      let mut new_name = Atom::new(format!(
         "{}_namespace",
         self.required_symbol.as_ref().expect("already set")
-      )
-      .into();
+      ));
 
       if used_names.contains(&new_name) {
         new_name = find_new_name(new_name.as_str(), used_names, &vec![]);
@@ -112,11 +111,10 @@ impl ExternalInterop {
     if let Some(namespace_object) = &self.namespace_object2 {
       namespace_object.clone()
     } else {
-      let mut new_name = format!(
+      let mut new_name = Atom::new(format!(
         "{}_namespace2",
         self.required_symbol.as_ref().expect("already set")
-      )
-      .into();
+      ));
 
       if used_names.contains(&new_name) {
         new_name = find_new_name(new_name.as_str(), used_names, &vec![]);
@@ -137,11 +135,10 @@ impl ExternalInterop {
     if let Some(default_access) = &self.default_access {
       default_access.clone()
     } else {
-      let mut new_name = format!(
+      let mut new_name = Atom::new(format!(
         "{}_default",
         self.required_symbol.as_ref().expect("already set")
-      )
-      .into();
+      ));
 
       if used_names.contains(&new_name) {
         new_name = find_new_name(new_name.as_str(), used_names, &vec![]);

crates/rspack_plugin_esm_library/src/chunk_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::{
@@ -128,7 +128,7 @@ impl EsmLibraryPlugin {
 
       // we find another name to export this symbol
       let mut idx = 0;
-      let mut new_export = format!("{exported}_{idx}").into();
+      let mut new_export = Atom::new(format!("{exported}_{idx}"));
       while ctx.exported_symbols.contains_key(&new_export) {
         idx += 1;
         new_export = format!("{exported}_{idx}").into();
@@ -820,17 +820,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()]);
                     }
                   };
@@ -1516,7 +1516,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;
         }