build(cargo): Update wasmer to v3.3 (#7352)

Author: kwonoj

Cargo.lock

@@ -26,28 +26,6 @@ impl From<u32> for TransformPluginMetadataContextKind {
     }
 }
 
-/*
-impl TransformPluginMetadataContextKind {
-    pub fn from(key: u32) -> TransformPluginMetadataContextKind {
-        match key {
-            1 => TransformPluginMetadataContextKind::Filename,
-            2 => TransformPluginMetadataContextKind::Env,
-            3 => TransformPluginMetadataContextKind::Cwd,
-            _ => panic!("Invalid TransformPluginMetadataContextKind key"),
-        }
-    }
-}
-
-impl Into<u32> for TransformPluginMetadataContextKind {
-    fn into(self) -> u32 {
-        match self {
-            TransformPluginMetadataContextKind::Filename => 1,
-            TransformPluginMetadataContextKind::Env => 2,
-            TransformPluginMetadataContextKind::Cwd => 3,
-        }
-    }
-}*/
-
 /// Host side metadata context plugin may need to access.
 /// This is a global context - any plugin in single transform will have same
 /// values.

crates/swc_common/src/plugin/metadata.rs

@@ -9,9 +9,6 @@ use crate::memory_interop::read_returned_result_from_host;
 #[cfg_attr(not(target_arch = "wasm32"), allow(unused))]
 use crate::{PluginCommentsProxy, PluginSourceMapProxy};
 
-//#[cfg_attr(not(target_arch = "wasm32"), allow(unused))]
-//use crate::memory_interop::read_returned_result_from_host;
-
 /// An arbitary metadata for given Program to run transform in plugin.
 /// These are not directly attached to Program's AST structures
 /// but required for certain transforms.
@@ -33,7 +30,7 @@ pub struct TransformPluginProgramMetadata {
 extern "C" {
     fn __copy_context_key_to_host_env(bytes_ptr: u32, bytes_ptr_len: u32);
     fn __get_transform_plugin_config(allocated_ret_ptr: u32) -> u32;
-    fn __get_transform_context(key: u32, allocated_ret_ptr: u32) -> u32;
+    fn __get_transform_context(key: u32, allocated_ret_ptr: u32) -> i32;
     fn __get_experimental_transform_context(allocated_ret_ptr: u32) -> u32;
     fn __get_raw_experiemtal_transform_context(allocated_ret_ptr: u32) -> u32;
 }
@@ -61,7 +58,7 @@ impl TransformPluginProgramMetadata {
     ) -> Option<String> {
         #[cfg(target_arch = "wasm32")]
         return read_returned_result_from_host(|serialized_ptr| unsafe {
-            __get_transform_context(*key as u32, serialized_ptr)
+            __get_transform_context(*key as u32, serialized_ptr) as u32
         });
 
         #[cfg(not(target_arch = "wasm32"))]

crates/swc_plugin_proxy/src/metadata/transform_plugin_metadata.rs

@@ -55,8 +55,8 @@ parking_lot  = "0.12.0"
 serde        = { version = "1.0.126", features = ["derive"] }
 serde_json   = "1.0.64"
 tracing      = "0.1.32"
-wasmer       = { version = "3.2.0", default-features = false }
-wasmer-wasix = { version = "0.3.0", default-features = false }
+wasmer       = { version = "3.3.0", default-features = false }
+wasmer-wasix = { version = "0.4.0", default-features = false }
 
 swc_common = { version = "0.31.5", path = "../swc_common", features = [
   "concurrent",
@@ -66,8 +66,8 @@ swc_ecma_ast = { version = "0.103.5", path = "../swc_ecma_ast", optional = true
 swc_plugin_proxy = { version = "0.32.5", path = "../swc_plugin_proxy" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-wasmer-cache              = { version = "3.2.0", optional = true }
-wasmer-compiler-cranelift = { version = "3.2.0", default-features = false }
+wasmer-cache              = { version = "3.3.0", optional = true }
+wasmer-compiler-cranelift = { version = "3.3.0", default-features = false }
 
 [dev-dependencies]
 criterion = "0.3"

crates/swc_plugin_runner/Cargo.toml

@@ -114,21 +114,17 @@ pub fn get_transform_context(
         .metadata_context
         .get(&TransformPluginMetadataContextKind::from(key));
 
-    if let Some(value) = value {
-        let serialized =
-            PluginSerializedBytes::try_serialize(&value).expect("Should be serializable");
+    let serialized = PluginSerializedBytes::try_serialize(&value).expect("Should be serializable");
 
-        allocate_return_values_into_guest(
-            memory,
-            &mut env.as_store_mut(),
-            alloc_guest_memory,
-            allocated_ret_ptr,
-            &serialized,
-        );
+    allocate_return_values_into_guest(
+        memory,
+        &mut env.as_store_mut(),
+        alloc_guest_memory,
+        allocated_ret_ptr,
+        &serialized,
+    );
 
-        return 1;
-    }
-    0
+    return 1;
 }
 
 #[tracing::instrument(level = "info", skip_all)]

crates/swc_plugin_runner/src/imported_fn/metadata_context.rs

@@ -70,6 +70,10 @@ pub fn process(program: Program, metadata: TransformPluginProgramMetadata) -> Pr
         name = Ident::new("ref".into(), DUMMY_SP)
     );
 
+    let filename = metadata
+        .get_context(&TransformPluginMetadataContextKind::Filename)
+        .expect("Filename should exists");
+
     let env = metadata
         .get_context(&TransformPluginMetadataContextKind::Env)
         .expect("Metadata should exists");