Add option for using webc v3

lib/cli/src/commands/run/mod.rs

@@ -15,7 +15,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Error};
-use clap::Parser;
+use clap::{Parser, ValueEnum};
 use indicatif::{MultiProgress, ProgressBar};
 use once_cell::sync::Lazy;
 use sha2::{Digest, Sha256};
@@ -107,11 +107,20 @@ impl Run {
             wasmer_vm::set_stack_size(self.stack_size.unwrap());
         }
 
+        // check for the preffered webc version
+        let preffered_webc = match std::env::var("WASMER_USE_WEBCV3") {
+            Ok(val) if ["1", "yes", "true"].contains(&val.as_str()) => webc::Version::V3,
+            _ => webc::Version::V2,
+        };
+
         let _guard = handle.enter();
         let (store, _) = self.store.get_store()?;
-        let runtime = self
-            .wasi
-            .prepare_runtime(store.engine().clone(), &self.env, runtime)?;
+        let runtime = self.wasi.prepare_runtime(
+            store.engine().clone(),
+            &self.env,
+            runtime,
+            preffered_webc,
+        )?;
 
         // This is a slow operation, so let's temporarily wrap the runtime with
         // something that displays progress

lib/cli/src/commands/run/wasi.rs

@@ -533,6 +533,7 @@ impl Wasi {
         engine: Engine,
         env: &WasmerEnv,
         rt_or_handle: I,
+        preffered_webc: webc::Version,
     ) -> Result<impl Runtime + Send + Sync>
     where
         I: Into<RuntimeOrHandle>,
@@ -565,7 +566,7 @@ impl Wasi {
             .prepare_package_loader(env, client.clone())
             .context("Unable to prepare the package loader")?;
 
-        let registry = self.prepare_source(env, client)?;
+        let registry = self.prepare_source(env, client, preffered_webc)?;
 
         let cache_dir = env.cache_dir().join("compiled");
         let module_cache = wasmer_wasix::runtime::module_cache::in_memory()
@@ -627,6 +628,7 @@ impl Wasi {
         &self,
         env: &WasmerEnv,
         client: Arc<dyn HttpClient + Send + Sync>,
+        preffered_webc: webc::Version,
     ) -> Result<impl Source + Send + Sync> {
         let mut source = MultiSource::new();
 
@@ -643,7 +645,8 @@ impl Wasi {
         let graphql_endpoint = self.graphql_endpoint(env)?;
         let cache_dir = env.cache_dir().join("queries");
         let mut wapm_source = WapmSource::new(graphql_endpoint, Arc::clone(&client))
-            .with_local_cache(cache_dir, WAPM_SOURCE_CACHE_TIMEOUT);
+            .with_local_cache(cache_dir, WAPM_SOURCE_CACHE_TIMEOUT)
+            .with_prefferred_webc(preffered_webc);
         if let Some(token) = env
             .config()?
             .registry