Merge pull request #22 from dp-mason/main

wasm32-wasi -> wasm32-wasip1

Author: bhelx

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-          target: wasm32-wasi
+          target: wasm32-wasip1
 
       - name: Check Rust Version
         run: rustc --version

bindgen-test.sh

@@ -33,6 +33,6 @@ case $1 in
     echo "building '$PLUGIN_NAME'..."
     xtp plugin build --path $PLUGIN_NAME
     echo "testing '$PLUGIN_NAME'..."
-    xtp plugin test $PLUGIN_NAME/target/wasm32-wasi/release/plugin.wasm --with test.wasm --mock-host mock.wasm
+    xtp plugin test $PLUGIN_NAME/target/wasm32-wasip1/release/plugin.wasm --with test.wasm --mock-host mock.wasm
   ;;
 esac

template/.cargo/config.toml.ejs

@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"

template/prepare.sh

@@ -28,6 +28,12 @@ if ! (command_exists cargo); then
   echo ""
 fi
 
+if ! (command_exists rustup); then
+  missing_deps=1
+  echo "❌ rustup is missing. Check your rust installation."
+  echo ""
+fi
+
 # Exit with a bad exit code if any dependencies are missing
 if [ "$missing_deps" -ne 0 ]; then
   echo "Install the missing dependencies and ensure they are on your path. Then run this command again."
@@ -36,5 +42,17 @@ if [ "$missing_deps" -ne 0 ]; then
   exit 1
 fi
 
+if ! (rustup target list --installed | grep -q '^wasm32-wasip1$'); then
+  if ! (rustup target add wasm32-wasip1); then
+    echo "❌ error encountered while adding target \"wasm32-wasip1\""
+    echo ""
+    echo "Update rustup with:"
+    echo "👉 rustup update"
+    echo ""
+    exit 1
+  fi
+fi
 
-
+if ! (rustup target list --installed | grep -q '^wasm32-unknown-unknown$'); then
+  rustup target add wasm32-unknown-unknown
+fi

template/xtp.toml.ejs

@@ -1,14 +1,14 @@
 app_id = "<%= project.appId %>"
 
 # This is where 'xtp plugin push' expects to find the wasm file after the build script has run.
-bin = "target/wasm32-wasi/release/plugin.wasm"
+bin = "target/wasm32-wasip1/release/plugin.wasm"
 extension_point_id = "<%= project.extensionPointId %>"
 # This is the 'binding' name used for the plugin.
 name = "<%= project.name %>"
 
 [scripts]
 # xtp plugin build runs this script to generate the wasm file
-build = "cargo build --release --target wasm32-wasi"
+build = "cargo build --release --target wasm32-wasip1"
 
 # xtp plugin init runs this script to format the code
 format = "cargo fmt"