Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update/use workspace dependencies (wasm_bindgen, etc) #472

Merged
merged 9 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,21 @@ exclude = ["examples/coredump"]
resolver = "2"

[workspace.dependencies]
worker = { path="./worker" }
worker = { path = "./worker" }
async-trait = "0.1.74"
chrono = { version = "0.4.35", default-features = false, features = [
"wasmbind",
] }
chrono-tz = { version = "0.8.4", default-features = false }
futures-channel = "0.3.29"
futures-util = { version = "0.3.29", default-features = false }
http = "1.0.0"
js-sys = "0.3.66"
wasm-bindgen = "0.2.91"
wasm-bindgen-cli-support = "0.2.91"
wasm-bindgen-futures = "0.4.39"
wasm-bindgen-macro-support = "0.2.91"
wasm-bindgen-test = "0.3.39"

[profile.release]
# rustc supports two "optimize for size" levels: opt-level = "s" and "z".
Expand All @@ -35,4 +49,3 @@ lto = true
[profile.release.package."*"]
codegen-units = 1
opt-level = "z"

2 changes: 1 addition & 1 deletion worker-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ tar = "0.4.38"
ureq = { version = "2.6.2", features = ["tls", "gzip"] }

[dev-dependencies]
wasm-bindgen-cli-support = "0.2.87"
wasm-bindgen-cli-support.workspace = true
8 changes: 4 additions & 4 deletions worker-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ proc-macro = true
path = "src/lib.rs"

[dependencies]
async-trait = "0.1.68"
async-trait.workspace = true
wasm-bindgen.workspace = true
wasm-bindgen-futures.workspace = true
wasm-bindgen-macro-support.workspace = true
worker-sys = { path = "../worker-sys", version = "0.0.12" }
syn = "2.0.17"
proc-macro2 = "1.0.60"
quote = "1.0.28"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4.36"
wasm-bindgen-macro-support = "0.2.87"

[features]
queue = []
12 changes: 6 additions & 6 deletions worker-sandbox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ path = "src/lib.rs"
default = ["console_error_panic_hook"]

[dependencies]
futures-channel.workspace = true
futures-util.workspace = true
blake2 = "0.10.6"
chrono = { version = "0.4.26", default-features = false, features = [
chrono = { version = "0.4.35", default-features = false, features = [
"wasmbind",
"clock",
] }
Expand All @@ -30,16 +32,15 @@ regex = "1.8.4"
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.96"
worker = { path = "../worker", version = "0.0.20", features = ["queue", "d1"] }
futures-channel = "0.3.28"
futures-util = { version = "0.3.28", default-features = false }
rand = "0.8.5"
uuid = { version = "1.3.3", features = ["v4", "serde"] }
serde-wasm-bindgen = "0.6.1"
md5 = "0.7.0"

[dev-dependencies]
futures-channel = { version = "0.3.28", features = ["sink"] }
futures-util = { version = "0.3.28", default-features = false, features = [
wasm-bindgen-test.workspace = true
futures-channel = { version = "0.3.29", features = ["sink"] }
futures-util = { version = "0.3.29", default-features = false, features = [
"sink",
] }
reqwest = { version = "0.11.18", features = [
Expand All @@ -50,5 +51,4 @@ reqwest = { version = "0.11.18", features = [
] }
tokio = { version = "1.28.2", features = ["macros", "rt", "test-util"] }
tungstenite = "0.21"
wasm-bindgen-test = "0.3.36"
retry = "2.0.0"
4 changes: 2 additions & 2 deletions worker-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ repository = "https://github.com/cloudflare/workers-rs/tree/main/worker-sys"
description = "Low-level extern definitions / FFI bindings to the Cloudflare Workers JS Runtime."

[dependencies]
js-sys.workspace = true
wasm-bindgen.workspace = true
cfg-if = "1.0.0"
js-sys = "0.3.63"
wasm-bindgen = "0.2"

[dependencies.web-sys]
version = "0.3.63"
Expand Down
20 changes: 9 additions & 11 deletions worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,21 @@ readme = "../README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.68"
chrono = { version = "0.4.26", default-features = false, features = [
"wasmbind",
] }
chrono-tz = { version = "0.8.2", default-features = false }
futures-channel = "0.3.28"
futures-util = { version = "0.3.28", default-features = false }
async-trait.workspace = true
chrono.workspace = true
chrono-tz.workspace = true
futures-channel.workspace = true
futures-util.workspace = true
wasm-bindgen.workspace = true
wasm-bindgen-futures.workspace = true
js-sys.workspace = true
http = "1"
js-sys = "0.3.63"
matchit = "0.7"
pin-project = "1.1.0"
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.96"
tokio = { version = "1.28", default-features = false }
url = "2.4.0"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4.36"
serde-wasm-bindgen = "0.6.1"
serde_urlencoded = "0.7"
wasm-streams = "0.4"
Expand All @@ -47,7 +45,7 @@ features = [

[dependencies.tokio-postgres]
version = "0.7"
default-features=false
default-features = false
features = ["js"]
optional = true

Expand Down
Loading