Drop cargo-component

.github/workflows/ci.yaml

@@ -19,8 +19,6 @@ jobs:
       uses: cargo-bins/cargo-binstall@main
     - name: Install wkg
       run: cargo binstall --force wkg
-    - name: Install cargo-component
-      run: cargo binstall --force cargo-component
     - name: Install wasm-tools
       run: cargo binstall --force wasm-tools
     - name: Install wac-cli

Makefile

@@ -24,13 +24,13 @@ components: $(foreach component,$(COMPONENTS),lib/$(component).wasm $(foreach co
 define BUILD_COMPONENT
 
 lib/$1.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f)
-	cargo component build -p $1 --target wasm32-unknown-unknown --release
-	cp target/wasm32-unknown-unknown/release/$(subst -,_,$1).wasm lib/$1.wasm
+	cargo build -p $1 --target wasm32-unknown-unknown --release
+	wasm-tools component new target/wasm32-unknown-unknown/release/$(subst -,_,$1).wasm -o lib/$1.wasm
 	cp components/$1/README.md lib/$1.wasm.md
 
 lib/$1.debug.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f)
-	cargo component build -p $1 --target wasm32-wasip2
-	cp target/wasm32-wasip2/debug/$(subst -,_,$1).wasm lib/$1.debug.wasm
+	cargo build -p $1 --target wasm32-unknown-unknown
+	wasm-tools component new target/wasm32-unknown-unknown/debug/$(subst -,_,$1).wasm -o lib/$1.debug.wasm
 	cp components/$1/README.md lib/$1.debug.wasm.md
 
 endef

README.md

@@ -21,7 +21,8 @@ A collection of utility components that remix wasi:cli types and interfaces.
 
 Prereqs:
 - a rust toolchain
-- [`cargo component`](https://github.com/bytecodealliance/cargo-component)
+- [`wasm-tools`](https://github.com/bytecodealliance/wasm-tools)
+- [`wac`](https://github.com/bytecodealliance/wac)
 - [`wkg`](https://github.com/bytecodealliance/wasm-pkg-tools)
 
 ```sh