Merge pull request #3396 from itowlson/the-hour-hath-come

Use `wasm32-wasip2` in Rust templates

Author: itowlson

crates/templates/src/manager.rs

@@ -876,8 +876,8 @@ mod tests {
         assert!(cargo2.contains("name = \"hello-2\""));
 
         let spin_toml = tokio::fs::read_to_string(&spin_toml_path).await.unwrap();
-        assert!(spin_toml.contains("source = \"hello/target/wasm32-wasip1/release/hello.wasm\""));
-        assert!(spin_toml.contains("source = \"encore/target/wasm32-wasip1/release/hello_2.wasm\""));
+        assert!(spin_toml.contains("source = \"hello/target/wasm32-wasip2/release/hello.wasm\""));
+        assert!(spin_toml.contains("source = \"encore/target/wasm32-wasip2/release/hello_2.wasm\""));
     }
 
     #[tokio::test]

templates/http-rust/content/spin.toml

@@ -13,8 +13,8 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/wasm32-wasip1/release/{{project-name | snake_case}}.wasm"
+source = "target/wasm32-wasip2/release/{{project-name | snake_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "cargo build --target wasm32-wasip1 --release"
+command = "cargo build --target wasm32-wasip2 --release"
 watch = ["src/**/*.rs", "Cargo.toml"]

templates/http-rust/metadata/snippets/component.txt

@@ -3,9 +3,9 @@ route = "{{http-path}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/wasm32-wasip1/release/{{project-name | snake_case}}.wasm"
+source = "{{ output-path }}/target/wasm32-wasip2/release/{{project-name | snake_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "cargo build --target wasm32-wasip1 --release"
+command = "cargo build --target wasm32-wasip2 --release"
 workdir = "{{ output-path }}"
 watch = ["src/**/*.rs", "Cargo.toml"]

templates/redis-rust/content/spin.toml

@@ -16,8 +16,8 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "target/wasm32-wasip1/release/{{project-name | snake_case}}.wasm"
+source = "target/wasm32-wasip2/release/{{project-name | snake_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "cargo build --target wasm32-wasip1 --release"
+command = "cargo build --target wasm32-wasip2 --release"
 watch = ["src/**/*.rs", "Cargo.toml"]

templates/redis-rust/metadata/snippets/component.txt

@@ -3,9 +3,9 @@ channel = "{{redis-channel}}"
 component = "{{project-name | kebab_case}}"
 
 [component.{{project-name | kebab_case}}]
-source = "{{ output-path }}/target/wasm32-wasip1/release/{{project-name | snake_case}}.wasm"
+source = "{{ output-path }}/target/wasm32-wasip2/release/{{project-name | snake_case}}.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "cargo build --target wasm32-wasip1 --release"
+command = "cargo build --target wasm32-wasip2 --release"
 workdir = "{{ output-path }}"
 watch = ["src/**/*.rs", "Cargo.toml"]