fix: respect to jsc.output.charset in swc loader (#11568)

* Add test

* Fix

* Update test

* Fix clippy

Author: CPunisher

crates/rspack_javascript_compiler/src/compiler/minify.rs

@@ -170,7 +170,7 @@ impl JavaScriptCompiler {
 
         minify_file_comments(
           &comments,
-          opts
+          &opts
             .format
             .comments
             .clone()
@@ -192,7 +192,9 @@ impl JavaScriptCompiler {
           input_source_map: None,
           minify: opts.minify,
           comments: Some(&comments),
-          format: &opts.format,
+          preamble: &opts.format.preamble,
+          ascii_only: opts.format.ascii_only,
+          inline_script: opts.format.inline_script,
         };
 
         self.print(&program, print_options).map_err(|e| e.into())

crates/rspack_javascript_compiler/src/compiler/stringify.rs

@@ -74,7 +74,9 @@ pub struct PrintOptions<'a> {
   pub input_source_map: Option<&'a sourcemap::SourceMap>,
   pub minify: bool,
   pub comments: Option<&'a dyn Comments>,
-  pub format: &'a JsMinifyFormatOptions,
+  pub preamble: &'a str,
+  pub ascii_only: bool,
+  pub inline_script: bool,
 }
 
 impl JavaScriptCompiler {
@@ -105,7 +107,9 @@ impl JavaScriptCompiler {
           .unwrap_or_default()
           .then(|| program.comments.as_ref().map(|c| c as &dyn Comments))
           .flatten(),
-        format: &format_opt,
+        preamble: &format_opt.preamble,
+        ascii_only: format_opt.ascii_only,
+        inline_script: format_opt.inline_script,
       };
       self.print(program.get_inner_program(), print_options)
     })
@@ -124,7 +128,9 @@ impl JavaScriptCompiler {
       input_source_map,
       minify,
       comments,
-      format,
+      preamble,
+      ascii_only,
+      inline_script,
     } = options;
     let mut src_map_buf = vec![];
 
@@ -148,7 +154,7 @@ impl JavaScriptCompiler {
           source_map_config.enable.then_some(&mut src_map_buf),
         );
 
-        w.preamble(&format.preamble).into_diagnostic()?;
+        w.preamble(preamble).into_diagnostic()?;
         let mut wr = Box::new(w) as Box<dyn WriteJs>;
 
         if minify {
@@ -159,8 +165,8 @@ impl JavaScriptCompiler {
           cfg: codegen::Config::default()
             .with_minify(minify)
             .with_target(target)
-            .with_ascii_only(format.ascii_only)
-            .with_inline_script(format.inline_script),
+            .with_ascii_only(ascii_only)
+            .with_inline_script(inline_script),
           comments,
           cm: source_map.clone(),
           wr,

crates/rspack_javascript_compiler/src/compiler/transform.rs

@@ -25,8 +25,8 @@ use swc_core::{
   base::{
     BoolOr,
     config::{
-      BuiltInput, Config, ConfigFile, InputSourceMap, JsMinifyCommentOption, JsMinifyFormatOptions,
-      Rc, RootMode, SourceMapsConfig,
+      BuiltInput, Config, ConfigFile, InputSourceMap, JsMinifyCommentOption, OutputCharset, Rc,
+      RootMode, SourceMapsConfig,
     },
     sourcemap,
   },
@@ -301,7 +301,7 @@ impl<'a> JavaScriptTransformer<'a> {
   where
     P: Pass + 'a,
   {
-    let built_input = self.parse_built_input(before_pass)?;
+    let mut built_input = self.parse_built_input(before_pass)?;
 
     let target = built_input.target;
     let source_map_kind: SourceMapKind = match self.options.config.source_maps {
@@ -322,12 +322,12 @@ impl<'a> JavaScriptTransformer<'a> {
 
     inspect_parsed_ast(&built_input.program);
 
-    let (program, diagnostics) = self.transform_with_built_input(built_input)?;
-    let format_opt = JsMinifyFormatOptions {
-      inline_script: false,
-      ascii_only: true,
-      ..Default::default()
-    };
+    let diagnostics = self.transform_with_built_input(&mut built_input)?;
+    let ascii_only = built_input
+      .output
+      .charset
+      .as_ref()
+      .is_some_and(|v| matches!(v, OutputCharset::Ascii));
 
     let print_options = PrintOptions {
       source_len: self.fm.byte_length(),
@@ -337,12 +337,14 @@ impl<'a> JavaScriptTransformer<'a> {
       input_source_map: input_source_map.as_ref(),
       minify,
       comments: Some(&self.comments as &dyn Comments),
-      format: &format_opt,
+      preamble: &built_input.output.preamble,
+      ascii_only,
+      inline_script: built_input.codegen_inline_script,
     };
 
     self
       .javascript_compiler
-      .print(&program, print_options)
+      .print(&built_input.program, print_options)
       .map(|o| o.with_diagnostics(diagnostics))
   }
 
@@ -435,21 +437,19 @@ impl<'a> JavaScriptTransformer<'a> {
 
   fn transform_with_built_input(
     &self,
-    built_input: BuiltInput<impl Pass>,
-  ) -> Result<(Program, Vec<String>), Error> {
-    let program = built_input.program;
-    let mut pass = built_input.pass;
+    built_input: &mut BuiltInput<impl Pass>,
+  ) -> Result<Vec<String>, Error> {
     let mut diagnostics = vec![];
-    let program = self.run(|| {
+    let result = self.run(|| {
       helpers::HELPERS.set(&self.helpers, || {
         let result = try_with_handler(self.cm.clone(), Default::default(), |handler| {
           // Apply external plugin passes to the Program AST.
           // External plugins may emit warnings or inject helpers,
           // so we need a handler to properly process them.
-          let program = program.apply(&mut pass);
+          built_input.pass.process(&mut built_input.program);
           diagnostics.extend(handler.take_diagnostics());
 
-          Ok(program)
+          Ok(())
         });
 
         result.map_err(|err| {
@@ -495,14 +495,12 @@ impl<'a> JavaScriptTransformer<'a> {
 
       minify_file_comments(
         comments,
-        built_input.preserve_comments,
+        &built_input.preserve_comments,
         preserve_annotations,
       );
     }
 
-    program
-      .map(|program| (program, diagnostics))
-      .map_err(|e| e.into())
+    result.map(|_| diagnostics).map_err(|e| e.into())
   }
 
   pub fn input_source_map(

crates/rspack_util/src/swc.rs

@@ -48,7 +48,7 @@ fn test_normalize_custom_filename() {
  */
 pub fn minify_file_comments(
   comments: &SingleThreadedComments,
-  preserve_comments: BoolOr<JsMinifyCommentOption>,
+  preserve_comments: &BoolOr<JsMinifyCommentOption>,
   preserve_annotations: bool,
 ) {
   match preserve_comments {

packages/rspack-test-tools/tests/builtinCases/swc-loader/charset/__snapshots__/output.snap.txt

@@ -0,0 +1,31 @@
+```js title=a.js
+(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["a"], {
+"./a.js": (function () {
+console.log("你好");
+
+
+}),
+
+},function(__webpack_require__) {
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__("./a.js"));
+
+}
+]);
+```
+
+```js title=b.js
+(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["b"], {
+"./b.js": (function () {
+console.log("\u4F60\u597D");
+
+
+}),
+
+},function(__webpack_require__) {
+var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId) }
+var __webpack_exports__ = (__webpack_exec__("./b.js"));
+
+}
+]);
+```

packages/rspack-test-tools/tests/builtinCases/swc-loader/charset/a.js

@@ -0,0 +1 @@
+console.log("你好")

packages/rspack-test-tools/tests/builtinCases/swc-loader/charset/b.js

@@ -0,0 +1 @@
+console.log("你好")

packages/rspack-test-tools/tests/builtinCases/swc-loader/charset/rspack.config.js

@@ -0,0 +1,34 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	entry: {
+		a: "./a.js",
+		b: "./b.js"
+	},
+	module: {
+		rules: [
+			{
+				test: /a\.js/,
+				use: [
+					{
+						loader: "builtin:swc-loader"
+					}
+				]
+			},
+			{
+				test: /b\.js/,
+				use: [
+					{
+						loader: "builtin:swc-loader",
+						options: {
+							jsc: {
+								output: {
+									charset: "ascii"
+								}
+							}
+						}
+					}
+				]
+			}
+		]
+	}
+};