diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1e95d73a..76132349 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,9 +2,9 @@ name: Rust on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] + branches: ["main"] env: CARGO_TERM_COLOR: always @@ -26,7 +26,7 @@ jobs: run: cargo clippy -- -D warnings - name: Run tests run: cargo test - - name: Add wasm32-wasip1 target - run: rustup target add wasm32-wasip1 - - name: Build with wasm32-wasip1 target - run: cargo build --release --target wasm32-wasip1 + - name: Add wasm32-unknown-unknown target + run: rustup target add wasm32-unknown-unknown + - name: Build with wasm32-unknown-unknown target + run: cargo build --release --target wasm32-unknown-unknown diff --git a/checkout/rust/cart-checkout-validation/default/shopify.extension.toml.liquid b/checkout/rust/cart-checkout-validation/default/shopify.extension.toml.liquid index 1851f0e5..4ab863f1 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = ["src/**/*.rs"] diff --git a/checkout/rust/cart-checkout-validation/default/src/main.rs b/checkout/rust/cart-checkout-validation/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/checkout/rust/cart-checkout-validation/default/src/main.rs +++ b/checkout/rust/cart-checkout-validation/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/checkout/rust/cart-transform/bundles/shopify.extension.toml.liquid b/checkout/rust/cart-transform/bundles/shopify.extension.toml.liquid index 64d2d84a..8d922cbb 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/bundles_cart_transform.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/bundles_cart_transform.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/checkout/rust/cart-transform/bundles/src/main.rs b/checkout/rust/cart-transform/bundles/src/main.rs index 9272b027..4ddebe50 100644 --- a/checkout/rust/cart-transform/bundles/src/main.rs +++ b/checkout/rust/cart-transform/bundles/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/checkout/rust/cart-transform/default/shopify.extension.toml.liquid b/checkout/rust/cart-transform/default/shopify.extension.toml.liquid index d46496fe..9eda028e 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/checkout/rust/cart-transform/default/src/main.rs b/checkout/rust/cart-transform/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/checkout/rust/cart-transform/default/src/main.rs +++ b/checkout/rust/cart-transform/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/checkout/rust/delivery-customization/default/shopify.extension.toml.liquid b/checkout/rust/delivery-customization/default/shopify.extension.toml.liquid index 1c0a5b33..8464306f 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/checkout/rust/delivery-customization/default/src/main.rs b/checkout/rust/delivery-customization/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/checkout/rust/delivery-customization/default/src/main.rs +++ b/checkout/rust/delivery-customization/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/checkout/rust/payment-customization/default/shopify.extension.toml.liquid b/checkout/rust/payment-customization/default/shopify.extension.toml.liquid index ca3558e6..3d3b8ac0 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/checkout/rust/payment-customization/default/src/main.rs b/checkout/rust/payment-customization/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/checkout/rust/payment-customization/default/src/main.rs +++ b/checkout/rust/payment-customization/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/discounts/rust/discount/default/README.md b/discounts/rust/discount/default/README.md index 574afb9c..f295aac3 100644 --- a/discounts/rust/discount/default/README.md +++ b/discounts/rust/discount/default/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --release ``` The Shopify CLI `build` command will also execute this, based on the configuration in `shopify.extension.toml`. diff --git a/discounts/rust/discount/default/shopify.extension.toml.liquid b/discounts/rust/discount/default/shopify.extension.toml.liquid index dbb5a9a5..d7bf4e2b 100644 --- a/discounts/rust/discount/default/shopify.extension.toml.liquid +++ b/discounts/rust/discount/default/shopify.extension.toml.liquid @@ -18,6 +18,6 @@ description = "t:description" export = "cart_delivery_options_discounts_generate_run" [extensions.build] - command = "cargo build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] diff --git a/discounts/rust/discount/default/src/main.rs b/discounts/rust/discount/default/src/main.rs index 7a2d9006..3b8d4935 100644 --- a/discounts/rust/discount/default/src/main.rs +++ b/discounts/rust/discount/default/src/main.rs @@ -1,8 +1,9 @@ +use shopify_function::prelude::*; use std::process; pub mod cart_delivery_options_discounts_generate_run; pub mod cart_lines_discounts_generate_run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/discounts/rust/discounts-allocator/default/README.md b/discounts/rust/discounts-allocator/default/README.md index 574afb9c..f295aac3 100644 --- a/discounts/rust/discounts-allocator/default/README.md +++ b/discounts/rust/discounts-allocator/default/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --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 index 88d445da..4447808a 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/discounts/rust/discounts-allocator/default/src/main.rs b/discounts/rust/discounts-allocator/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/discounts/rust/discounts-allocator/default/src/main.rs +++ b/discounts/rust/discounts-allocator/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/discounts/rust/order-discounts/default/README.md b/discounts/rust/order-discounts/default/README.md index 574afb9c..f295aac3 100644 --- a/discounts/rust/order-discounts/default/README.md +++ b/discounts/rust/order-discounts/default/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --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 index 55be40a1..df910ba7 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/discounts/rust/order-discounts/default/src/main.rs b/discounts/rust/order-discounts/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/discounts/rust/order-discounts/default/src/main.rs +++ b/discounts/rust/order-discounts/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/discounts/rust/product-discounts/default/README.md b/discounts/rust/product-discounts/default/README.md index 574afb9c..f295aac3 100644 --- a/discounts/rust/product-discounts/default/README.md +++ b/discounts/rust/product-discounts/default/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --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 index d0b5cd05..80d85f47 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/discounts/rust/product-discounts/default/src/main.rs b/discounts/rust/product-discounts/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/discounts/rust/product-discounts/default/src/main.rs +++ b/discounts/rust/product-discounts/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/discounts/rust/shipping-discounts/default/README.md b/discounts/rust/shipping-discounts/default/README.md index 574afb9c..f295aac3 100644 --- a/discounts/rust/shipping-discounts/default/README.md +++ b/discounts/rust/shipping-discounts/default/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --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 index b341a1bc..51080312 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/discounts/rust/shipping-discounts/default/src/main.rs b/discounts/rust/shipping-discounts/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/discounts/rust/shipping-discounts/default/src/main.rs +++ b/discounts/rust/shipping-discounts/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/order-routing/rust/fulfillment-constraints/default/shopify.extension.toml.liquid b/order-routing/rust/fulfillment-constraints/default/shopify.extension.toml.liquid index 2935a140..6cecbbb2 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/order-routing/rust/fulfillment-constraints/default/src/main.rs b/order-routing/rust/fulfillment-constraints/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/order-routing/rust/fulfillment-constraints/default/src/main.rs +++ b/order-routing/rust/fulfillment-constraints/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } 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 index 761febf7..6018cbaa 100644 --- 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 @@ -13,8 +13,8 @@ description = "t:description" export = "run" [extensions.build] - command = "cargo build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/order-routing/rust/local-pickup-delivery-option-generators/default/src/main.rs b/order-routing/rust/local-pickup-delivery-option-generators/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/order-routing/rust/local-pickup-delivery-option-generators/default/src/main.rs +++ b/order-routing/rust/local-pickup-delivery-option-generators/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/order-routing/rust/location-rules/default/shopify.extension.toml.liquid b/order-routing/rust/location-rules/default/shopify.extension.toml.liquid index 615cd9f5..133cb428 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/{{handle | replace: " ", "-" | downcase}}.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "-" | downcase}}.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/order-routing/rust/location-rules/default/src/main.rs b/order-routing/rust/location-rules/default/src/main.rs index 9272b027..4ddebe50 100644 --- a/order-routing/rust/location-rules/default/src/main.rs +++ b/order-routing/rust/location-rules/default/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } 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 index 68f92d03..7397f0f6 100644 --- 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 @@ -18,8 +18,8 @@ input_query = "src/run.graphql" export = "run" [extensions.build] -command = "cargo build --target=wasm32-wasip1 --release" -path = "target/wasm32-wasip1/release/{{handle | replace: " ", "_" | downcase}}.wasm" +command = "cargo build --target=wasm32-unknown-unknown --release" +path = "target/wasm32-unknown-unknown/release/{{handle | replace: " ", "_" | downcase}}.wasm" watch = ["src/**/*.rs"] [extensions.ui.paths] diff --git a/order-routing/rust/pickup-point-delivery-option-generators/default/src/main.rs b/order-routing/rust/pickup-point-delivery-option-generators/default/src/main.rs index 2aeeaddf..eed8ea2c 100644 --- a/order-routing/rust/pickup-point-delivery-option-generators/default/src/main.rs +++ b/order-routing/rust/pickup-point-delivery-option-generators/default/src/main.rs @@ -1,8 +1,9 @@ +use shopify_function::prelude::*; use std::process; pub mod fetch; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } 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 index ef7f0b24..6e113196 100644 --- 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 @@ -11,6 +11,6 @@ type = "function" export = "run" [extensions.build] - command = "cargo build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/bundle_cart_transform.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/bundle_cart_transform.wasm" watch = [ "src/**/*.rs" ] diff --git a/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/src/main.rs b/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/src/main.rs +++ b/sample-apps/bundles-cart-transform/extensions/cart-merge-expand_rust/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/shopify.extension.toml b/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/shopify.extension.toml index d511bdfe..ba2c1e16 100644 --- a/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/shopify.extension.toml +++ b/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/shopify.extension.toml @@ -13,8 +13,8 @@ description = "t:description" export = "run" [extensions.build] - command = "cargo build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/cart-transform-3-rust.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/cart-transform-3-rust.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/src/main.rs b/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/src/main.rs +++ b/sample-apps/bundles-price-per-component/extensions/price-per-component-rs/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } 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 index cd4e5f8a..f978ca8c 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/delivery-customization-rust.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/delivery-customization-rust.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/sample-apps/delivery-customizations/extensions/delivery-customization-rust/src/main.rs b/sample-apps/delivery-customizations/extensions/delivery-customization-rust/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/delivery-customizations/extensions/delivery-customization-rust/src/main.rs +++ b/sample-apps/delivery-customizations/extensions/delivery-customization-rust/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/sample-apps/discounts/extensions/product-discount-rust/README.md b/sample-apps/discounts/extensions/product-discount-rust/README.md index 574afb9c..f295aac3 100644 --- a/sample-apps/discounts/extensions/product-discount-rust/README.md +++ b/sample-apps/discounts/extensions/product-discount-rust/README.md @@ -10,7 +10,7 @@ You can build this individual function using `cargo build`. ```shell -cargo build --target=wasm32-wasip1 --release +cargo build --target=wasm32-unknown-unknown --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 index b766e00c..5c935938 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/product-discount-rust.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/product-discount-rust.wasm" watch = ["src/**/*.rs"] [extensions.ui.paths] diff --git a/sample-apps/discounts/extensions/product-discount-rust/src/main.rs b/sample-apps/discounts/extensions/product-discount-rust/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/discounts/extensions/product-discount-rust/src/main.rs +++ b/sample-apps/discounts/extensions/product-discount-rust/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/sample-apps/discounts/extensions/product-discount-rust/src/run.rs b/sample-apps/discounts/extensions/product-discount-rust/src/run.rs index e4b20109..3cb9b513 100644 --- a/sample-apps/discounts/extensions/product-discount-rust/src/run.rs +++ b/sample-apps/discounts/extensions/product-discount-rust/src/run.rs @@ -58,7 +58,7 @@ fn run(input: input::ResponseData) -> Result { .collect::>(); if targets.is_empty() { - eprintln!("No cart lines qualify for volume discount."); + log!("No cart lines qualify for volume discount."); return Ok(no_discount); } 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 index a8a1254f..cd6e7f9a 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/optional-add-ons-rust.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/optional-add-ons-rust.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/src/main.rs b/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/src/main.rs +++ b/sample-apps/optional-add-ons-cart-transform/extensions/optional-add-ons-rust/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } 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 index f71f0579..a5377aef 100644 --- 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 build --target=wasm32-wasip1 --release" - path = "target/wasm32-wasip1/release/payment-customization.wasm" + command = "cargo build --target=wasm32-unknown-unknown --release" + path = "target/wasm32-unknown-unknown/release/payment-customization.wasm" watch = [ "src/**/*.rs" ] [extensions.ui.paths] diff --git a/sample-apps/payment-customizations/extensions/payment-customization-rust/src/main.rs b/sample-apps/payment-customizations/extensions/payment-customization-rust/src/main.rs index 9272b027..4ddebe50 100644 --- a/sample-apps/payment-customizations/extensions/payment-customization-rust/src/main.rs +++ b/sample-apps/payment-customizations/extensions/payment-customization-rust/src/main.rs @@ -1,7 +1,8 @@ +use shopify_function::prelude::*; use std::process; pub mod run; fn main() { - eprintln!("Please invoke a named export."); - process::exit(1); + log!("Please invoke a named export."); + process::abort(); } diff --git a/sample-apps/payment-customizations/extensions/payment-customization-rust/src/run.rs b/sample-apps/payment-customizations/extensions/payment-customization-rust/src/run.rs index 83bc48fe..aa757dfc 100644 --- a/sample-apps/payment-customizations/extensions/payment-customization-rust/src/run.rs +++ b/sample-apps/payment-customizations/extensions/payment-customization-rust/src/run.rs @@ -33,7 +33,7 @@ fn run(input: input::ResponseData) -> Result { // Use the configured cart total instead of a hardcoded value let cart_total: f64 = input.cart.cost.total_amount.amount.into(); if cart_total < config.cart_total { - eprintln!("Cart total is not high enough, no need to hide the payment method."); + log!("Cart total is not high enough, no need to hide the payment method."); return Ok(no_changes); }