chore: bump swc to 27.0.4 (#10660)

* Update SWC dependencies to latest compatible versions in Cargo.toml

* fix: remove TODO comment in JavaScriptTransformer implementation

* Remove unnecessary iterator conversion in JavaScriptCompiler

Author: GiveMe-A-Name

Cargo.lock

@@ -100,15 +100,15 @@ rkyv      = { version = "=0.8.8" }
 
 # Must be pinned with the same swc versions
 pnp                 = { version = "0.9.0" }
-swc                 = { version = "=25.0.0" }
-swc_config          = { version = "=3.0.0" }
-swc_core            = { version = "=26.3.4", default-features = false, features = ["parallel_rayon"] }
-swc_ecma_lexer      = { version = "=14.0.4" }
-swc_ecma_minifier   = { version = "=20.0.3", default-features = false }
-swc_error_reporters = { version = "=13.0.0" }
-swc_html            = { version = "=20.0.0" }
-swc_html_minifier   = { version = "=20.0.0", default-features = false }
-swc_node_comments   = { version = "=11.0.0" }
+swc                 = { version = "=26.0.0" }
+swc_config          = { version = "=3.1.1" }
+swc_core            = { version = "=27.0.4", default-features = false, features = ["parallel_rayon"] }
+swc_ecma_lexer      = { version = "=15.0.1" }
+swc_ecma_minifier   = { version = "=21.0.3", default-features = false }
+swc_error_reporters = { version = "=14.0.0" }
+swc_html            = { version = "=21.0.0" }
+swc_html_minifier   = { version = "=21.0.0", default-features = false }
+swc_node_comments   = { version = "=12.0.0" }
 
 rspack_dojang = { version = "0.1.11" }
 

Cargo.toml

@@ -1863,7 +1863,7 @@ impl ConcatenatedModule {
           "{}",
           self.readable_identifier(&compilation.options.context),
         ))),
-        source_code.into(),
+        source_code.to_string(),
       );
       let comments = SwcComments::default();
       let mut module_info = concatenation_scope.current_module;

crates/rspack_core/src/concatenated_module.rs

@@ -127,7 +127,13 @@ impl TraceableError {
     title: String,
     message: String,
   ) -> Self {
-    Self::from_arc_string(Some(source_file.src.clone()), start, end, title, message)
+    Self::from_arc_string(
+      Some(source_file.src.clone().into_string().into()),
+      start,
+      end,
+      title,
+      message,
+    )
   }
 
   pub fn from_file(

crates/rspack_error/src/error.rs

@@ -129,6 +129,7 @@ fn parse_with_lexer(
       IsModule::Bool(true) => parser.parse_module().map(SwcProgram::Module),
       IsModule::Bool(false) => parser.parse_script().map(SwcProgram::Script),
       IsModule::Unknown => parser.parse_program(),
+      IsModule::CommonJS => parser.parse_commonjs().map(SwcProgram::Script),
     };
     let mut errors = parser.take_errors();
     // Using combinator will let rustc unhappy.

crates/rspack_javascript_compiler/src/compiler/parse.rs

@@ -195,7 +195,7 @@ impl JavaScriptCompiler {
           .collect::<Vec<_>>(),
         combined_source_map
           .source_contents()
-          .map(Option::unwrap_or_default)
+          .flatten()
           .map(ToString::to_string)
           .collect::<Vec<_>>(),
         combined_source_map

crates/rspack_javascript_compiler/src/compiler/stringify.rs

@@ -36,7 +36,10 @@ use swc_core::{
   },
   ecma::{
     ast::{EsVersion, Pass, Program},
-    parser::{parse_file_as_module, parse_file_as_program, parse_file_as_script, Syntax},
+    parser::{
+      parse_file_as_commonjs, parse_file_as_module, parse_file_as_program, parse_file_as_script,
+      Syntax,
+    },
     transforms::base::helpers::{self, Helpers},
   },
 };
@@ -356,6 +359,9 @@ impl<'a> JavaScriptTransformer<'a> {
         parse_file_as_script(&fm, syntax, target, comments, &mut errors).map(Program::Script)
       }
       IsModule::Unknown => parse_file_as_program(&fm, syntax, target, comments, &mut errors),
+      IsModule::CommonJS => {
+        parse_file_as_commonjs(&fm, syntax, target, comments, &mut errors).map(Program::Script)
+      }
     };
 
     for e in errors {
@@ -477,6 +483,7 @@ impl<'a> JavaScriptTransformer<'a> {
         BoolOr::Bool(true) | BoolOr::Data(JsMinifyCommentOption::PreserveAllComments) => true,
         BoolOr::Data(JsMinifyCommentOption::PreserveSomeComments) => false,
         BoolOr::Bool(false) => false,
+        BoolOr::Data(JsMinifyCommentOption::PreserveRegexComments { .. }) => false,
       };
 
       minify_file_comments(

crates/rspack_javascript_compiler/src/compiler/transform.rs

@@ -38,7 +38,7 @@ pub fn eval_source<T: Display>(
           span.lo.0.saturating_sub(1) as usize,
           span.hi.0.saturating_sub(1) as usize,
           format!("{error_title} warning"),
-          format!("failed to parse {}", json!(fm.src.as_ref())),
+          format!("failed to parse {}", json!(fm.src.as_str())),
         )
         .with_severity(Severity::Warning),
       ));

crates/rspack_plugin_javascript/src/utils/eval/eval_source.rs

@@ -80,5 +80,17 @@ pub fn minify_file_comments(
       l.clear();
       t.clear();
     }
+    BoolOr::Data(JsMinifyCommentOption::PreserveRegexComments { regex }) => {
+      let preserve_excl = |_: &BytePos, vc: &mut std::vec::Vec<Comment>| -> bool {
+        // Preserve comments that match the regex
+        //
+        // See https://github.com/terser/terser/blob/798135e04baddd94fea403cfaab4ba8b22b1b524/lib/output.js#L286
+        vc.retain(|c: &Comment| regex.find(&c.text).is_some());
+        !vc.is_empty()
+      };
+      let (mut l, mut t) = comments.borrow_all_mut();
+      l.retain(preserve_excl);
+      t.retain(preserve_excl);
+    }
   }
 }