Switch to webc v3 by default

lib/backend-api/schema.graphql

@@ -1092,6 +1092,7 @@ type PackageDistribution {
   webcSize: Int
   webcSha256Hash: String
   webcVersion: WebcVersion
+  webcManifest: JSONString
 }
 
 type PackageVersionFilesystem {
@@ -3046,6 +3047,7 @@ input RenameAppAliasInput {
 """Purges all cache for this app version"""
 type PurgeCacheForAppVersionPayload {
   appVersion: DeployAppVersion!
+  success: Boolean!
   clientMutationId: String
 }
 

lib/backend-api/src/types.rs

@@ -81,6 +81,7 @@ mod queries {
         pub size: Option<i32>,
         pub pirita_size: Option<i32>,
         pub webc_version: Option<WebcVersion>,
+        pub webc_manifest: Option<JSONString>,
     }
 
     #[derive(cynic::Enum, Clone, Copy, Debug)]

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

@@ -115,10 +115,15 @@ impl Run {
             wasmer_vm::set_stack_size(self.stack_size.unwrap());
         }
 
-        // check for the preferred webc version
-        let preferred_webc_version = match std::env::var("WASMER_USE_WEBCV3") {
-            Ok(val) if ["1", "yes", "true"].contains(&val.as_str()) => webc::Version::V3,
-            _ => webc::Version::V2,
+        // Check for the preferred webc version.
+        // Default to v3.
+        let webc_version_var = std::env::var("WASMER_WEBC_VERSION");
+        let preferred_webc_version = match webc_version_var.as_deref() {
+            Ok("2") => webc::Version::V2,
+            Ok("3") | Err(_) => webc::Version::V3,
+            Ok(other) => {
+                bail!("unknown webc version: '{other}'");
+            }
         };
 
         let _guard = handle.enter();

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

@@ -31,7 +31,9 @@ use wasmer_wasix::{
     runtime::{
         module_cache::{FileSystemCache, ModuleCache},
         package_loader::{BuiltinPackageLoader, PackageLoader},
-        resolver::{FileSystemSource, InMemorySource, MultiSource, Source, WapmSource, WebSource},
+        resolver::{
+            BackendSource, FileSystemSource, InMemorySource, MultiSource, Source, WebSource,
+        },
         task_manager::{
             tokio::{RuntimeOrHandle, TokioTaskManager},
             VirtualTaskManagerExt,
@@ -648,7 +650,7 @@ 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))
+        let mut wapm_source = BackendSource::new(graphql_endpoint, Arc::clone(&client))
             .with_local_cache(cache_dir, WAPM_SOURCE_CACHE_TIMEOUT)
             .with_preferred_webc_version(preferred_webc_version);
         if let Some(token) = env

lib/wasix/src/http/web_http_client.rs

@@ -305,15 +305,15 @@ fn call_fetch(request: &web_sys::Request) -> JsFuture {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::runtime::resolver::WapmSource;
+    use crate::runtime::resolver::BackendSource;
 
     #[wasm_bindgen_test::wasm_bindgen_test]
     async fn query_the_wasmer_registry_graphql_endpoint() {
         let http_client = WebHttpClient::default();
         let query = r#"{
             "query": "{ info { defaultFrontend } }"
         }"#;
-        let request = http::Request::post(WapmSource::WASMER_PROD_ENDPOINT)
+        let request = http::Request::post(BackendSource::WASMER_PROD_ENDPOINT)
             .header(http::header::CONTENT_TYPE, "application/json")
             .body(query)
             .unwrap();

lib/wasix/src/runtime/mod.rs

@@ -27,7 +27,7 @@ use crate::{
     runtime::{
         module_cache::{ModuleCache, ThreadLocalCache},
         package_loader::{PackageLoader, UnsupportedPackageLoader},
-        resolver::{MultiSource, Source, WapmSource},
+        resolver::{BackendSource, MultiSource, Source},
     },
     SpawnError, WasiTtyState,
 };
@@ -239,8 +239,8 @@ impl PluggableRuntime {
 
         let mut source = MultiSource::new();
         if let Some(client) = &http_client {
-            source.add_source(WapmSource::new(
-                WapmSource::WASMER_PROD_ENDPOINT.parse().unwrap(),
+            source.add_source(BackendSource::new(
+                BackendSource::WASMER_PROD_ENDPOINT.parse().unwrap(),
                 client.clone(),
             ));
         }