Merge pull request #580 from Shopify/lopert.wasm32-wasi-removal

lopert · web-flow · commit 2ae226e43d32 · 2025-01-08T14:18:41.000-05:00
Stop using cargo-wasi
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -26,7 +26,7 @@ jobs:
         run: cargo clippy -- -D warnings
       - name: Run tests
         run: cargo test
-      - name: Add wasm32-wasi target
-        run: rustup target add wasm32-wasi
-      - name: Build with wasm32-wasi target
-        run: cargo build --release --target wasm32-wasi
+      - name: Add wasm32-wasip1 target
+        run: rustup target add wasm32-wasip1
+      - name: Build with wasm32-wasip1 target
+        run: cargo build --release --target wasm32-wasip1
diff --git a/checkout/rust/cart-checkout-validation/default/shopify.extension.toml.liquid b/checkout/rust/cart-checkout-validation/default/shopify.extension.toml.liquid
@@ -13,7 +13,7 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
diff --git a/checkout/rust/cart-transform/bundles/shopify.extension.toml.liquid b/checkout/rust/cart-transform/bundles/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/bundles_cart_transform.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/bundles_cart_transform.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/checkout/rust/cart-transform/default/shopify.extension.toml.liquid b/checkout/rust/cart-transform/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/checkout/rust/delivery-customization/default/shopify.extension.toml.liquid b/checkout/rust/delivery-customization/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/checkout/rust/payment-customization/default/shopify.extension.toml.liquid b/checkout/rust/payment-customization/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/discounts/rust/discounts-allocator/default/README.md b/discounts/rust/discounts-allocator/default/README.md
@@ -4,15 +4,13 @@
 
 - [Install Rust](https://www.rust-lang.org/tools/install)
   - On Windows, Rust requires the [Microsoft C++ Build Tools](https://docs.microsoft.com/en-us/windows/dev-environment/rust/setup). Be sure to select the _Desktop development with C++_ workload when installing them.
-- Install [`cargo-wasi`](https://bytecodealliance.github.io/cargo-wasi/)
-  - `cargo install cargo-wasi`
 
 ## Building the function
 
-You can build this individual function using `cargo wasi`.
+You can build this individual function using `cargo build`.
 
 ```shell
-cargo wasi build --release
+cargo build --target=wasm32-wasip1 --release
 ```
 
 The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`.
diff --git a/discounts/rust/discounts-allocator/default/shopify.extension.toml.liquid b/discounts/rust/discounts-allocator/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/discounts/rust/order-discounts/default/README.md b/discounts/rust/order-discounts/default/README.md
@@ -4,15 +4,13 @@
 
 - [Install Rust](https://www.rust-lang.org/tools/install)
   - On Windows, Rust requires the [Microsoft C++ Build Tools](https://docs.microsoft.com/en-us/windows/dev-environment/rust/setup). Be sure to select the _Desktop development with C++_ workload when installing them.
-- Install [`cargo-wasi`](https://bytecodealliance.github.io/cargo-wasi/)
-  - `cargo install cargo-wasi`
 
 ## Building the function
 
-You can build this individual function using `cargo wasi`.
+You can build this individual function using `cargo build`.
 
 ```shell
-cargo wasi build --release
+cargo build --target=wasm32-wasip1 --release
 ```
 
 The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`.
diff --git a/discounts/rust/order-discounts/default/shopify.extension.toml.liquid b/discounts/rust/order-discounts/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/discounts/rust/product-discounts/default/README.md b/discounts/rust/product-discounts/default/README.md
@@ -4,15 +4,13 @@
 
 - [Install Rust](https://www.rust-lang.org/tools/install)
   - On Windows, Rust requires the [Microsoft C++ Build Tools](https://docs.microsoft.com/en-us/windows/dev-environment/rust/setup). Be sure to select the _Desktop development with C++_ workload when installing them.
-- Install [`cargo-wasi`](https://bytecodealliance.github.io/cargo-wasi/)
-  - `cargo install cargo-wasi`
 
 ## Building the function
 
-You can build this individual function using `cargo wasi`.
+You can build this individual function using `cargo build`.
 
 ```shell
-cargo wasi build --release
+cargo build --target=wasm32-wasip1 --release
 ```
 
 The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`.
diff --git a/discounts/rust/product-discounts/default/shopify.extension.toml.liquid b/discounts/rust/product-discounts/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/discounts/rust/shipping-discounts/default/README.md b/discounts/rust/shipping-discounts/default/README.md
@@ -4,15 +4,13 @@
 
 - [Install Rust](https://www.rust-lang.org/tools/install)
   - On Windows, Rust requires the [Microsoft C++ Build Tools](https://docs.microsoft.com/en-us/windows/dev-environment/rust/setup). Be sure to select the _Desktop development with C++_ workload when installing them.
-- Install [`cargo-wasi`](https://bytecodealliance.github.io/cargo-wasi/)
-  - `cargo install cargo-wasi`
 
 ## Building the function
 
-You can build this individual function using `cargo wasi`.
+You can build this individual function using `cargo build`.
 
 ```shell
-cargo wasi build --release
+cargo build --target=wasm32-wasip1 --release
 ```
 
 The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`.
diff --git a/discounts/rust/shipping-discounts/default/shopify.extension.toml.liquid b/discounts/rust/shipping-discounts/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/order-routing/rust/fulfillment-constraints/default/shopify.extension.toml.liquid b/order-routing/rust/fulfillment-constraints/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/order-routing/rust/local-pickup-delivery-option-generators/default/shopify.extension.toml.liquid b/order-routing/rust/local-pickup-delivery-option-generators/default/shopify.extension.toml.liquid
@@ -4,8 +4,8 @@ type = "local_pickup_delivery_option_generator"
 api_version = "unstable"
 
 [build]
-command = "cargo wasi build --release"
-path = "target/wasm32-wasi/release/{{name | replace: " ", "-" | downcase}}.wasm"
+command = "cargo build --target=wasm32-wasip1 --release"
+path = "target/wasm32-wasip1/release/{{name | replace: " ", "-" | downcase}}.wasm"
 watch = [ "src/**/*.rs" ]
 
 [ui.paths]
diff --git a/order-routing/rust/location-rules/default/shopify.extension.toml.liquid b/order-routing/rust/location-rules/default/shopify.extension.toml.liquid
@@ -13,8 +13,8 @@ description = "t:description"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/{{handle | replace: " ", "-" | downcase}}.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/order-routing/rust/pickup-point-delivery-option-generators/default/shopify.extension.toml.liquid b/order-routing/rust/pickup-point-delivery-option-generators/default/shopify.extension.toml.liquid
@@ -17,8 +17,8 @@ input_query = "src/run.graphql"
 export = "run"
 
 [extensions.build]
-command = "cargo wasi build --release"
-path = "target/wasm32-wasi/release/{{handle | replace: "-", "_" | downcase}}.wasm"
+command = "cargo build --target=wasm32-wasip1 --release"
+path = "target/wasm32-wasip1/release/{{handle | replace: "-", "_" | downcase}}.wasm"
 watch = ["src/**/*.rs"]
 
 [extensions.ui.paths]
diff --git a/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/shopify.extension.toml b/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/shopify.extension.toml
@@ -4,5 +4,5 @@ title = "cart merge expand"
 api_version = "2024-04"
 
 [build]
-command = "cargo wasi build --release"
-path = "target/wasm32-wasi/release/bundle_cart_transform.wasm"
+command = "cargo build --target=wasm32-wasip1 --release"
+path = "target/wasm32-wasip1/release/bundle_cart_transform.wasm"
diff --git a/sample-apps/delivery-customizations/extensions/delivery-customization-rust/shopify.extension.toml b/sample-apps/delivery-customizations/extensions/delivery-customization-rust/shopify.extension.toml
@@ -12,8 +12,8 @@ type = "function"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/delivery-customization-rust.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/delivery-customization-rust.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/sample-apps/discounts/extensions/product-discount-rust/README.md b/sample-apps/discounts/extensions/product-discount-rust/README.md
@@ -4,15 +4,13 @@
 
 - [Install Rust](https://www.rust-lang.org/tools/install)
   - On Windows, Rust requires the [Microsoft C++ Build Tools](https://docs.microsoft.com/en-us/windows/dev-environment/rust/setup). Be sure to select the _Desktop development with C++_ workload when installing them.
-- Install [`cargo-wasi`](https://bytecodealliance.github.io/cargo-wasi/)
-  - `cargo install cargo-wasi`
 
 ## Building the function
 
-You can build this individual function using `cargo wasi`.
+You can build this individual function using `cargo build`.
 
 ```shell
-cargo wasi build --release
+cargo build --target=wasm32-wasip1 --release
 ```
 
 The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`.
diff --git a/sample-apps/discounts/extensions/product-discount-rust/shopify.extension.toml b/sample-apps/discounts/extensions/product-discount-rust/shopify.extension.toml
@@ -12,8 +12,8 @@ type = "function"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/product-discount-rust.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/product-discount-rust.wasm"
   watch = ["src/**/*.rs"]
 
   [extensions.ui.paths]
diff --git a/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/shopify.extension.toml b/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/shopify.extension.toml
@@ -12,8 +12,8 @@ type = "function"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/optional-add-ons-rust.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/optional-add-ons-rust.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
diff --git a/sample-apps/payment-customizations/extensions/payment-customization-rust/shopify.extension.toml b/sample-apps/payment-customizations/extensions/payment-customization-rust/shopify.extension.toml
@@ -12,8 +12,8 @@ type = "function"
   export = "run"
 
   [extensions.build]
-  command = "cargo wasi build --release"
-  path = "target/wasm32-wasi/release/payment-customization.wasm"
+  command = "cargo build --target=wasm32-wasip1 --release"
+  path = "target/wasm32-wasip1/release/payment-customization.wasm"
   watch = [ "src/**/*.rs" ]
 
   [extensions.ui.paths]
