revert: feat(diagnostic): improve diagnostics for swc wasm plugins (#…

…7690)

Cargo.toml

@@ -85,15 +85,17 @@ rspack_dojang = { version = "0.1.8" }
 rate-limit = { existing-packages = 70, new-packages = 70 }
 [profile.dev]
 codegen-units = 16
-debug         = 2    # debug build will cause runtime panic if codegen-unints is default
+debug         = 2       # debug build will cause runtime panic if codegen-unints is default
 incremental   = true
+panic         = "abort"
 
 [profile.release]
 codegen-units = 1
 debug         = false
 # Performs “thin” LTO. This is similar to “fat”, but takes substantially less time to run while still achieving performance gains similar to “fat”.
 lto       = "thin"
 opt-level = 3
+panic     = "abort"
 strip     = true
 
 [profile.release-prod]

crates/rspack_error/src/miette_helpers.rs

@@ -55,15 +55,15 @@ impl miette::Diagnostic for WithHelp {
   fn help<'a>(&'a self) -> Option<Box<dyn Display + 'a>> {
     let help = self.wrap_help.get_or_init(|| {
       let prev = self.err.help().map(|h| h.to_string());
-      let help = self.help.as_ref();
+      let help = self.help.as_ref().cloned();
       if let Some(prev) = prev {
         if let Some(help) = &help {
           Some(format!("{prev}\n{help}").into())
         } else {
           Some(prev.into())
         }
       } else if help.is_some() {
-        help.cloned()
+        help
       } else {
         None
       }

crates/rspack_loader_swc/Cargo.toml

@@ -36,6 +36,3 @@ swc_core                 = { workspace = true, features = ["base", "ecma_ast", "
 swc_plugin_import        = { version = "0.1.5", path = "../swc_plugin_import" }
 tokio                    = { workspace = true }
 url                      = "2.5.0"
-
-[build-dependencies]
-cargo_toml = { version = "0.20.4" }

crates/rspack_loader_swc/src/compiler.rs

@@ -16,8 +16,6 @@ use base64::prelude::*;
 use dashmap::DashMap;
 use jsonc_parser::parse_to_serde_value;
 use rspack_ast::javascript::{Ast as JsAst, Context as JsAstContext, Program as JsProgram};
-use rspack_error::miette::MietteDiagnostic;
-use rspack_error::DiagnosticExt;
 use serde_json::error::Category;
 use swc_config::config_types::BoolOr;
 use swc_config::merge::Merge;
@@ -389,35 +387,7 @@ impl SwcCompiler {
         try_with_handler(self.cm.clone(), Default::default(), |handler| {
           HANDLER.set(handler, || {
             // Fold module
-            match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-              program.fold_with(&mut pass)
-            })) {
-              Ok(v) => Ok(v),
-              Err(err) => {
-                macro_rules! swc_error {
-                  ($tt:tt) => {{
-                    let swc_core_version = env!("RSPACK_SWC_CORE_VERSION");
-
-                    MietteDiagnostic::new(format!("Builtin swc-loader error: {}
-
-Help:
-    The version of the SWC Wasm plugin you're using might not be compatible with `builtin:swc-loader`.
-
-    The `swc_core` version of the current `rspack_core` is {swc_core_version}. Please check the `swc_core` version of SWC Wasm plugin to make sure these versions are within the compatible range.
-    Versions of `swc_core` are more likely to be located in the `Cargo.toml` file in the root directory of these plugin repositories.
-
-    Check out this guide as a reference for selecting the versions of SWC Wasm plugins: https://swc.rs/docs/plugin/selecting-swc-core", $tt))
-                    .boxed()
-                    .into()
-                  }}
-                }
-                if let Some(err) = err.downcast_ref::<String>() {
-                  Err(swc_error!(err))
-                } else {
-                  Err(swc_error!("unknown error"))
-                }
-              }
-            }
+            Ok(program.fold_with(&mut pass))
           })
         })
       })