Skip to content

Commit

Permalink
⬆️ Bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
langyo committed Apr 11, 2024
1 parent 2abac31 commit 301594c
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 32 deletions.
2 changes: 1 addition & 1 deletion examples/guest-side/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ anyhow = "^1"
tokio = { version = "^1", features = ["macros", "rt", "time"] }

sqlparser = "^0.40"
sea-orm = { version = "^0.12", features = ["proxy"] }
sea-orm = { version = "1.0.0-rc.3", features = ["proxy"] }
yew = { version = "^0.21", features = ["ssr"] }
yew-router = "^0.18"
2 changes: 1 addition & 1 deletion examples/host-side/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ serde_json = "^1"
async-std = { version = "^1", features = ["attributes", "tokio1"] }
uuid = "^1"

sea-orm = { version = "^0.12", features = ["proxy"] }
sea-orm = { version = "1.0.0-rc.3", features = ["proxy"] }
gluesql = { version = "^0.15" }
14 changes: 9 additions & 5 deletions examples/host-side/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ use tairitsu_vm::Image;

#[async_std::main]
async fn main() -> Result<()> {
let bin = Bytes::from_static(include_bytes!(
"../../../target/wasm32-wasi/release/tairitsu-example-guest-side.wasm"
));
let bin = Bytes::from(std::fs::read(format!(
"{}/../../target/wasm32-wasi/release/tairitsu-example-guest-side.wasm",
env!("CARGO_MANIFEST_DIR")
))?);

// Create the database connection
println!("Creating database connection...");
Expand All @@ -41,8 +42,8 @@ async fn main() -> Result<()> {

let tx = container.tx.clone();
let rx = container.rx.clone();
std::thread::spawn(move || {
container.run().unwrap();
async_std::task::spawn(async move {
container.run().await.unwrap();
});

while let Ok(msg) = rx.recv() {
Expand Down Expand Up @@ -138,8 +139,11 @@ async fn main() -> Result<()> {
};

println!("VM Debug: {}", msg);
} else {
unreachable!("Unknown command: {:?}", msg.command);
}
}

println!("Will exit...");
Ok(())
}
7 changes: 3 additions & 4 deletions packages/boot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ tairitsu-macro-types = { path = "../macro-types" }

anyhow = "^1"
async-trait = "^0.1"
base64 = "^0.21"
derive_more = "^0.99"
base64 = "^0.22"
derive_more = "*"
gloo = "^0.11"
serde = { version = "^1", features = ["derive"] }
serde_json = "^1"
strum = "^0.25"
strum_macros = "^0.25"
strum = { version = "^0.26", features = ["derive"] }
9 changes: 4 additions & 5 deletions packages/database/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,18 @@ tairitsu-utils = { path = "../utils" }

anyhow = "^1"
chrono = { version = "^0.4", features = ["serde", "unstable-locales"] }
env_logger = "^0.10"
env_logger = "^0.11"
lazy_static = "*"
log = "^0.4"
strum = "^0.25"
strum_macros = "^0.25"
strum = { version = "^0.26", features = ["derive"] }
uuid = { version = "^1", features = [
'v4',
'fast-rng',
'macro-diagnostics',
'serde',
] }

sea-orm-migration = "^0.12"
sea-orm-migration = "1.0.0-rc.3"
serde = { version = "^1", features = ["derive"] }
serde_json = "^1"
async-std = { version = "^1", features = ["attributes", "tokio1"] }
Expand All @@ -36,4 +35,4 @@ features = [
"with-chrono",
"with-json",
]
version = "^0.12"
version = "1.0.0-rc.3"
2 changes: 1 addition & 1 deletion packages/database/src/models/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
use tairitsu_utils::types::functions::{Permission as DTOPermission, UserType as DTO};

#[derive(Clone, Debug, PartialEq, EnumIter, DeriveActiveEnum, Deserialize, Serialize)]
#[sea_orm(rs_type = "String", db_type = "String(Some(1))")]
#[sea_orm(rs_type = "String", db_type = "String(StringLen::N(16))")]
pub enum Permission {
#[sea_orm(string_value = "root")]
Root,
Expand Down
5 changes: 2 additions & 3 deletions packages/macro-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ publish = false
[dependencies]
anyhow = "^1"
async-trait = "^0.1"
base64 = "^0.21"
base64 = "^0.22"
derive_more = "^0.99"
serde = { version = "^1", features = ["derive"] }
serde_json = "^1"
strum = "^0.25"
strum_macros = "^0.25"
strum = { version = "^0.26", features = ["derive"] }
3 changes: 1 addition & 2 deletions packages/macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ anyhow = "^1"
derive_more = "^0.99"
serde = { version = "^1", features = ["derive"] }
serde_json = "^1"
strum = "^0.25"
strum_macros = "^0.25"
strum = { version = "^0.26", features = ["derive"] }

syn = { version = "^2", features = ["full"] }
proc-macro2 = "^1"
Expand Down
5 changes: 2 additions & 3 deletions packages/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ chrono = { version = "^0.4", features = [
log = "^0.4"
serde = { version = "^1", features = ["derive"] }
serde_json = { version = "^1" }
strum = "^0.25"
strum_macros = "^0.25"
strum = { version = "^0.26", features = ["derive"] }
uuid = { version = "^1", features = [
'v4',
'fast-rng',
Expand All @@ -29,4 +28,4 @@ uuid = { version = "^1", features = [
] }

bcrypt = "^0.15"
sea-orm = { version = "^0.12", features = ["proxy"] }
sea-orm = { version = "1.0.0-rc.3", features = ["proxy"] }
2 changes: 1 addition & 1 deletion packages/utils/src/types/functions/user.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use strum_macros::{Display, EnumIter};
use strum::{Display, EnumIter};
use uuid::Uuid;

#[derive(Copy, Clone, Debug, PartialEq, EnumIter, Deserialize, Serialize, Display)]
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/src/types/proto/frontend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub struct LimitOffset {

pub mod filter {
use serde::{Deserialize, Serialize};
use strum_macros::{Display, EnumString};
use strum::{Display, EnumString};

#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct FilterPackage {
Expand Down
10 changes: 5 additions & 5 deletions packages/vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ bytes = "^1"
async-trait = "^0.1"
serde = { version = "^1", features = ["derive"] }
serde_json = "^1"
reqwest = { version = "^0.11", features = ["blocking"] }
reqwest = { version = "^0.12", features = ["blocking"] }
lazy_static = "^1"
flume = "^0.11"
async-std = { version = "^1", features = ["attributes", "tokio1"] }
uuid = "^1"

wit-component = "^0.19"
wasmtime = { version = "^15", features = ["component-model"] }
wasmtime-wasi = "^15"
sea-orm = { version = "^0.12", features = ["proxy"] }
wit-component = "*"
wasmtime = { version = "^19", features = ["component-model", "async"] }
wasmtime-wasi = "^19"
sea-orm = { version = "1.0.0-rc.3", features = ["proxy"] }
gluesql = { version = "^0.15" }
Binary file modified packages/vm/res/wasi_snapshot_preview1.command.wasm
Binary file not shown.

0 comments on commit 301594c

Please sign in to comment.