chore: Rename wasm32-wasi to wasm32-wasip1

har7an · har7an · commit 4bc9e98c5119 · 2025-01-19T16:50:42.000+01:00
as required by the Rust project. The `wasm32-wasi` target name has been retired and will likely be reused at a later time, although to express an entirely different target (i.e. implementation of the WASI standard). For additional information, see: - https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html - https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#wasi-01-target-naming-changed
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -35,7 +35,7 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Add WASM target
-      run: rustup target add wasm32-wasi
+      run: rustup target add wasm32-wasip1
     - name: Install musl-tools
       run: sudo apt-get install -y --no-install-recommends musl-tools
     - name: Add musl target
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
           target: ${{ matrix.target }}
 
       - name: Add WASM target
-        run: rustup target add wasm32-wasi
+        run: rustup target add wasm32-wasip1
 
       - name: Install musl-tools
         if: matrix.os == 'ubuntu-latest'
diff --git a/default-plugins/compact-bar/.cargo/config.toml b/default-plugins/compact-bar/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/configuration/.cargo/config.toml b/default-plugins/configuration/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/fixture-plugin-for-tests/.cargo/config.toml b/default-plugins/fixture-plugin-for-tests/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/plugin-manager/.cargo/config.toml b/default-plugins/plugin-manager/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/session-manager/.cargo/config.toml b/default-plugins/session-manager/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/status-bar/.cargo/config.toml b/default-plugins/status-bar/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/strider/.cargo/config.toml b/default-plugins/strider/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/default-plugins/tab-bar/.cargo/config.toml b/default-plugins/tab-bar/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"
diff --git a/src/tests/fixtures/configs/load_background_plugins.kdl b/src/tests/fixtures/configs/load_background_plugins.kdl
@@ -211,7 +211,7 @@ plugins {
 }
 
 load_plugins {
-  "file:/usr/src/zellij/wasm32-wasi/release/fixture-plugin-for-tests.wasm" {
+  "file:/usr/src/zellij/wasm32-wasip1/release/fixture-plugin-for-tests.wasm" {
       config_key "config_value"
       config_key2 "config_value2"
   }
diff --git a/xtask/src/build.rs b/xtask/src/build.rs
@@ -127,7 +127,7 @@ fn move_plugin_to_assets(sh: &Shell, plugin_name: &str) -> anyhow::Result<()> {
         std::env::var_os("CARGO_TARGET_DIR")
             .unwrap_or(crate::project_root().join("target").into_os_string()),
     )
-    .join("wasm32-wasi")
+    .join("wasm32-wasip1")
     .join("release")
     .join(plugin_name)
     .with_extension("wasm");
diff --git a/xtask/src/test.rs b/xtask/src/test.rs
@@ -33,7 +33,7 @@ pub fn test(sh: &Shell, flags: flags::Test) -> anyhow::Result<()> {
         crate::status(&msg);
         println!("{}", msg);
 
-        // Override wasm32-wasi target for plugins only
+        // Override wasm32-wasip1 target for plugins only
         let cmd = if crate_name.contains("plugins") {
             cmd!(sh, "{cargo} test --target {host_triple} --")
         } else {
@@ -48,7 +48,7 @@ pub fn test(sh: &Shell, flags: flags::Test) -> anyhow::Result<()> {
 }
 
 // Determine the target triple of the host. We explicitly run all tests against the host
-// architecture so we can test the plugins, too (they default to wasm32-wasi otherwise).
+// architecture so we can test the plugins, too (they default to wasm32-wasip1 otherwise).
 pub fn host_target_triple(sh: &Shell) -> anyhow::Result<String> {
     let rustc_ver = cmd!(sh, "rustc -vV")
         .read()
diff --git a/zellij-utils/src/consts.rs b/zellij-utils/src/consts.rs
@@ -94,7 +94,7 @@ mod not_wasm {
     //
     // - `zellij-utils/assets/plugins`: When building in release mode OR when the
     //   `plugins_from_target` feature IS NOT set
-    // - `zellij-utils/../target/wasm32-wasi/debug`: When building in debug mode AND the
+    // - `zellij-utils/../target/wasm32-wasip1/debug`: When building in debug mode AND the
     //   `plugins_from_target` feature IS set
     macro_rules! add_plugin {
         ($assets:expr, $plugin:literal) => {
@@ -110,7 +110,7 @@ mod not_wasm {
                 #[cfg(all(feature = "plugins_from_target", debug_assertions))]
                 include_bytes!(concat!(
                     env!("CARGO_MANIFEST_DIR"),
-                    "/../target/wasm32-wasi/debug/",
+                    "/../target/wasm32-wasip1/debug/",
                     $plugin
                 ))
                 .to_vec(),

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[build]`
`2`		`-target = "wasm32-wasi"`
	`2`	`+target = "wasm32-wasip1"`