Reworking crates

Cargo.toml

@@ -1,22 +1,25 @@
 [package]
 name = "pulumi-wasm-parent"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-
 [workspace]
 members = [
     "pulumi_wasm_runner",
     "pulumi_wasm",
     "providers/pulumi_wasm_provider_random",
+    "pulumi_wasm_rust_macro",
     "pulumi_wasm_rust",
     "wasm_common",
     "examples/simple"
 ]
 
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+
 [workspace.dependencies]
 anyhow = "1.0.80"
 prost = "0.12.3"
@@ -26,6 +29,7 @@ futures = "0.3.30"
 lazy_static = "1.4.0"
 once_cell = "1.19.0"
 bitflags = "2.4.2"
+wit-bindgen = "0.21.0"
 wit-bindgen-rt = "0.21.0"
 rmp = "0.8.12"
 rmp-serde = "1.1.2"
@@ -44,3 +48,7 @@ log4rs = "1.3.0"
 tokio = { version = "1.36.0", features = ["sync", "macros", "io-util", "rt", "time"] }
 clap = { version = "4.5.2", features = ["derive"] }
 regex = "1.10.3"
+pulumi_wasm_rust = { path = "pulumi_wasm_rust" }
+pulumi_wasm_rust_macro = { path = "pulumi_wasm_rust_macro" }
+wasm_common = { path = "wasm_common" }
+pulumi_wasm_provider_random_rust = { path = "providers/pulumi_wasm_provider_random_rust" }

build.bat

@@ -1,4 +1,3 @@
-cargo component build -p wasm_common || exit /b 1
 cargo component build -p pulumi_wasm || exit /b 1
 cargo component build -p pulumi_wasm_provider_random || exit /b 1
 cargo component build -p pulumi_wasm_example_simple || exit /b 1
@@ -27,6 +26,7 @@ wasm-tools compose -o target/wasm32-wasi/debug/composed2.wasm target/wasm32-wasi
 @REM wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm
 @REM
 wasm-tools component wit target/wasm32-wasi/debug/composed2.wasm || exit /b 1
+wasm-tools print target/wasm32-wasi/debug/pulumi-wasm-example-simple.wasm > pulumi-wasm-example-simple.wat || exit /b 1
 wasm-tools print target/wasm32-wasi/debug/composed1.wasm > composed1.wat || exit /b 1
 wasm-tools print target/wasm32-wasi/debug/composed2.wasm > composed2.wat || exit /b 1
 

build.sh

@@ -2,7 +2,6 @@
 
 set -e
 
-cargo component build -p wasm_common
 cargo component build -p pulumi_wasm
 cargo component build -p pulumi_wasm_provider_random
 cargo component build -p pulumi_wasm_example_simple

examples/simple/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pulumi_wasm_example_simple"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -24,17 +24,18 @@ rmpv.workspace = true
 serde.workspace = true
 tonic.workspace = true
 serde_json.workspace = true
-pulumi_rust_wasm = { path = "../../pulumi_wasm_rust" }
+pulumi_wasm_rust.workspace = true
 log.workspace = true
-wasm_common = { path = "../../wasm_common" }
+wasm_common.workspace = true
+pulumi_wasm_provider_random_rust.workspace = true
 
 [dev-dependencies]
 wasmtime.workspace = true
 wasmtime-wasi.workspace = true
 
-[package.metadata.component]
-package = "component:pulumi-wasm-main"
-
-[package.metadata.component.target]
-path = "../../wits/world.wit"
-world = "new-main"
+#[package.metadata.component]
+#package = "component:pulumi-wasm-main"
+#
+#[package.metadata.component.target]
+#path = "../../wits/world.wit"
+#world = "new-main"