archive-gh-me/workers-rs
1
0
Fork 0
mirror of https://github.com/cloudflare/workers-rs.git synced 2025-12-08 18:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Update versions, improved version mismatch errors

Browse Source
This commit is contained in:
Guy Bedford 2025-11-25 04:34:56 +01:00
parent 1e12473829
commit f643fdcb8a
31 changed files with 102 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1482,7 +1482,6 @@ version = "0.1.0"
dependencies = [
"serde_json",
"worker",
"worker-kv",
]
[[package]]
@ -2040,7 +2039,6 @@ dependencies = [
name = "queue-on-workers"
version = "0.1.0"
dependencies = [
"js-sys",
"serde",
"worker",
]

114
examples/axum/Cargo.lock generated
View File

@ -34,40 +34,13 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "axum"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
dependencies = [
"async-trait",
"axum-core 0.4.5",
"bytes",
"futures-util",
"http",
"http-body",
"http-body-util",
"itoa",
"matchit 0.7.3",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
"rustversion",
"serde",
"sync_wrapper",
"tower",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
dependencies = [
"axum-core 0.5.2",
"axum-core",
"bytes",
"futures-util",
"http",
@ -87,26 +60,6 @@ dependencies = [
"tower-service",
]
[[package]]
name = "axum-core"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
dependencies = [
"async-trait",
"bytes",
"futures-util",
"http",
"http-body",
"http-body-util",
"mime",
"pin-project-lite",
"rustversion",
"sync_wrapper",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum-core"
version = "0.5.2"
@ -130,7 +83,7 @@ dependencies = [
name = "axum-on-workers"
version = "0.1.0"
dependencies = [
"axum 0.8.4",
"axum",
"tower-service",
"wasm-bindgen-futures",
"worker",
@ -592,17 +545,6 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde-wasm-bindgen"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
dependencies = [
"js-sys",
"serde",
"wasm-bindgen",
]
[[package]]
name = "serde-wasm-bindgen"
version = "0.6.5"
@ -698,26 +640,6 @@ dependencies = [
"syn",
]
[[package]]
name = "thiserror"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tinystr"
version = "0.8.1"
@ -934,12 +856,12 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "worker"
version = "0.5.0"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "727789ca7eff9733efbea9d0e97779edc1cf1926e98aee7d7d8afe32805458aa"
checksum = "d9320293035d2074f1fb84baf7d79d7932c183dd04a7e0c143dc75db0d0037ac"
dependencies = [
"async-trait",
"axum 0.7.9",
"axum",
"bytes",
"chrono",
"futures-channel",
@ -950,7 +872,7 @@ dependencies = [
"matchit 0.7.3",
"pin-project",
"serde",
"serde-wasm-bindgen 0.6.5",
"serde-wasm-bindgen",
"serde_json",
"serde_urlencoded",
"tokio",
@ -959,31 +881,15 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
"worker-kv",
"worker-macros",
"worker-sys",
]
[[package]]
name = "worker-kv"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f06d4d1416a9f8346ee9123b0d9a11b3cfa38e6cfb5a139698017d1597c4d41"
dependencies = [
"js-sys",
"serde",
"serde-wasm-bindgen 0.5.0",
"serde_json",
"thiserror",
"wasm-bindgen",
"wasm-bindgen-futures",
]
[[package]]
name = "worker-macros"
version = "0.5.0"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d625c24570ba9207a2617476013335f28a95cbe513e59bb814ffba092a18058"
checksum = "eb37d4f9d99921836a1e4dc21e6041df9b0c2c5fe3c230edddd172a8ef9e251e"
dependencies = [
"async-trait",
"proc-macro2",
@ -997,9 +903,9 @@ dependencies = [
[[package]]
name = "worker-sys"
version = "0.5.0"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34563340d41016b4381257c5a16b0d2bc590dbe00500ecfbebcaa16f5f85ce90"
checksum = "07b4e2ca5d405247a986d533bba78c396c941835747977631168b8b05304f1b6"
dependencies = [
"cfg-if",
"js-sys",

4
examples/axum/Cargo.toml
View File

@ -10,8 +10,8 @@ release = false
crate-type = ["cdylib"]
[dependencies]
worker = { version = "0.6.7", features = ['http', 'axum'] }
worker-macros = { version = "0.6.7", features = ['http'] }
worker = { version = "0.7", features = ['http', 'axum'] }
worker-macros = { version = "0.7", features = ['http'] }
axum = { version = "0.8", default-features = false }
tower-service = "0.3.3"
wasm-bindgen-futures = "0.4"

2
examples/axum/wrangler.toml
View File

@ -2,4 +2,4 @@ name = "axum-on-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build && worker-build@0.7 --release"

2
examples/custom-req/wrangler.toml
View File

@ -2,4 +2,4 @@ name = "custom-req-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/digest/Cargo.toml
View File

@ -10,5 +10,5 @@ release = false
crate-type = ["cdylib"]
[dependencies]
worker = { workspace = true }
worker.workspace = true
hex = "0.4"

2
examples/digest/wrangler.toml
View File

@ -2,4 +2,4 @@ name = "digest-stream-on-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/fetcher/Cargo.toml
View File

@ -10,6 +10,6 @@ release = false
crate-type = ["cdylib"]
[dependencies]
worker = { workspace = true }
worker.workspace = true
serde = "1.0.188"
serde_json = "1.0.108"

2
examples/fetcher/wrangler.toml
View File

@ -3,4 +3,4 @@ main = "build/worker/shim.mjs"
compatibility_date = "2023-03-22"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

3
examples/kv/Cargo.toml
View File

@ -11,6 +11,5 @@ release = false
crate-type = ["cdylib", "rlib"]
[dependencies]
serde_json.workspace = true
serde_json = "1.0"
worker.workspace = true
worker-kv.workspace = true

2
examples/kv/src/lib.rs
View File

@ -1,5 +1,5 @@
use worker::{event, Env, Request, Response, Result};
use worker_kv::KvError;
use worker::kv::KvError;
#[event(fetch)]
async fn main(_req: Request, env: Env, _: worker::Context) -> Result<Response> {

1
examples/queue/Cargo.toml
View File

@ -12,4 +12,3 @@ crate-type = ["cdylib"]
[dependencies]
serde = "1"
worker = { workspace = true, features = ["queue"] }
js-sys.workspace = true

2
examples/queue/wrangler.toml
View File

@ -2,7 +2,7 @@ name = "queue-on-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"
[[queues.consumers]]
queue = "mymessages"

2
examples/router/wrangler.toml
View File

@ -2,4 +2,4 @@ name = "router-on-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/rpc-client/wrangler.toml
View File

@ -7,4 +7,4 @@ services = [
]
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/rpc-server/wrangler.toml
View File

@ -3,4 +3,4 @@ main = "build/index.js"
compatibility_date = "2024-04-05"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/tokio-postgres/wrangler.toml
View File

@ -6,4 +6,4 @@ binding = "DB"
id = ""
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

2
examples/tracing/Cargo.toml
View File

@ -10,8 +10,8 @@ release = false
crate-type = ["cdylib"]
[dependencies]
worker.workspace = true
tracing = "0.1"
tracing-web = "0.1"
tracing-subscriber = { version = "0.3", features = ['time', 'json'] }
time = { version = "0.3", features = ['wasm-bindgen'] }
worker.workspace = true

2
examples/tracing/wrangler.toml
View File

@ -2,4 +2,4 @@ name = "tracing-on-workers"
main = "build/index.js"
[build]
command = "cargo install worker-build && worker-build --release"
command = "cargo install worker-build@0.7 && worker-build --release"

4
templates/axum/Cargo.toml
View File

@ -8,7 +8,7 @@ authors = ["{{authors}}"]
crate-type = ["cdylib"]
[dependencies]
worker = { version = "0.6", features = ['http', 'axum'] }
worker-macros = { version = "0.6", features = ['http'] }
worker = { version = "0.7", features = ['http', 'axum'] }
worker-macros = { version = "0.7", features = ['http'] }
axum = { version = "0.8", default-features = false }
tower-service = "0.3.3"

2
templates/axum/wrangler.toml
View File

@ -3,4 +3,4 @@ main = "build/index.js"
compatibility_date = "{{ "now" | date: "%Y-%m-%d" }}"
[build]
command = "cargo install -q worker-build && worker-build --release"
command = "cargo install -q worker-build@0.7 && worker-build --release"

4
templates/hello-world-http/Cargo.toml
View File

@ -8,6 +8,6 @@ authors = ["{{authors}}"]
crate-type = ["cdylib"]
[dependencies]
worker = { version = "0.6", features = ['http'] }
worker-macros = { version = "0.6", features = ['http'] }
worker = { version = "0.7", features = ['http'] }
worker-macros = { version = "0.7", features = ['http'] }
http = "1.3"

2
templates/hello-world-http/wrangler.toml
View File

@ -3,4 +3,4 @@ main = "build/index.js"
compatibility_date = "{{ "now" | date: "%Y-%m-%d" }}"
[build]
command = "cargo install -q worker-build && worker-build --release"
command = "cargo install -q worker-build@0.7 && worker-build --release"

4
templates/hello-world/Cargo.toml
View File

@ -8,5 +8,5 @@ authors = ["{{authors}}"]
crate-type = ["cdylib"]
[dependencies]
worker = { version = "0.6" }
worker-macros = { version = "0.6" }
worker = { version = "0.7" }
worker-macros = { version = "0.7" }

2
templates/hello-world/wrangler.toml
View File

@ -3,4 +3,4 @@ main = "build/index.js"
compatibility_date = "{{ "now" | date: "%Y-%m-%d" }}"
[build]
command = "cargo install -q worker-build && worker-build --release"
command = "cargo install -q worker-build@0.7 && worker-build --release"

2
templates/leptos/Cargo.toml
View File

@ -22,7 +22,7 @@ leptos_meta = { version = "0.8" }
leptos_router = { version = "0.8"{% if use_nightly %}, features = ["nightly"]{% endif %} }
tower-service = "0.3"
wasm-bindgen = "0.2"
worker = { version = "0.6", features = ["http", "axum", "d1"], optional = true }
worker = { version = "0.7", features = ["http", "axum", "d1"], optional = true }
[features]
hydrate = ["leptos/hydrate"]

2
templates/leptos/wrangler.toml
View File

@ -3,7 +3,7 @@ main = "build/index.js"
compatibility_date = "{{ "now" | date: "%Y-%m-%d" }}"
[build]
command = "cargo leptos build --release && cargo install -q worker-build && LEPTOS_OUTPUT_NAME={{project-name}} worker-build --release --features ssr"
command = "cargo leptos build --release && cargo install -q worker-build@0.7 && LEPTOS_OUTPUT_NAME={{project-name}} worker-build --release --features ssr"
[assets]
directory = "./target/site"

42
worker-build/src/build/mod.rs
View File

@ -1,6 +1,6 @@
use crate::binary::{GetBinary, WasmOpt};
use crate::emoji;
use crate::lockfile::Lockfile;
use crate::lockfile::{DepCheckError, Lockfile};
use crate::versions::{
CUR_WASM_BINDGEN_VERSION, CUR_WORKER_VERSION, MIN_WASM_BINDGEN_LIB_VERSION,
MIN_WORKER_LIB_VERSION,
@ -11,6 +11,7 @@ mod progressbar;
mod target;
mod utils;
use console::style;
use progressbar::ProgressOutput;
/// The global progress bar and user-facing message output.
@ -359,12 +360,39 @@ impl Build {
fn step_check_lib_versions(&mut self) -> Result<()> {
let lockfile = Lockfile::new(&self.crate_data.data)?;
lockfile.require_lib("worker", &MIN_WORKER_LIB_VERSION, &CUR_WORKER_VERSION)?;
lockfile.require_lib(
"wasm-bindgen",
&MIN_WASM_BINDGEN_LIB_VERSION,
&CUR_WASM_BINDGEN_VERSION,
)?;
lockfile.require_lib("worker", &MIN_WORKER_LIB_VERSION, &CUR_WORKER_VERSION).map_err(|err| match err {
DepCheckError::VersionError(msg, Some(version)) => {
anyhow!(
"{msg}\n\nEither upgrade to worker@{}, or use an older worker-build toolchain (e.g. by updating wrangler.toml to use `{}`).",
*MIN_WORKER_LIB_VERSION,
style(format!("cargo install worker-build@{}",
// Prior to worker@0.6 toolchain was 0.1 with no lock
if version.major == 0 && version.minor <= 6 {
"0.1".to_string()
// 0.x semver lock
} else if version.major == 0 {
format!("{}.{}", version.major, version.minor)
// N.x semver lock
} else {
version.major.to_string()
})).bold()
)
},
DepCheckError::VersionError(msg, None) => anyhow!(msg),
DepCheckError::Error(err) => err,
})?;
lockfile
.require_lib(
"wasm-bindgen",
&MIN_WASM_BINDGEN_LIB_VERSION,
&CUR_WASM_BINDGEN_VERSION,
)
.map_err(|err| match err {
DepCheckError::VersionError(msg, _) => anyhow!(msg),
DepCheckError::Error(err) => anyhow!(err),
})?;
Ok(())
}

41
worker-build/src/lockfile.rs
View File

@ -5,7 +5,6 @@
use std::fs;
use std::path::PathBuf;
use crate::versions::CUR_WORKER_VERSION;
use anyhow::{anyhow, bail, Context, Result};
use cargo_metadata::Metadata;
use console::style;
@ -27,6 +26,11 @@ struct Package {
dependencies: Option<Vec<String>>,
}
pub(crate) enum DepCheckError {
VersionError(String, Option<Version>),
Error(anyhow::Error),
}
impl Lockfile {
/// Read the `Cargo.lock` file for the crate at the given path.
pub fn new(crate_data: &Metadata) -> Result<Lockfile> {
@ -42,27 +46,36 @@ impl Lockfile {
/// Obtains and verifies the given library matches the given semver version
/// Min version is used for the semver comparison check
/// Cur version is only used for help text
/// Errors with the wrong version if incorrect.
pub fn require_lib(
&self,
lib_name: &str,
min_version: &Version,
cur_version: &Version,
) -> Result<()> {
let req = VersionReq::parse(&format!("^{min_version}"))?;
if let Some(version) = self.get_package_version(lib_name)? {
) -> Result<(), DepCheckError> {
let req = VersionReq::parse(&format!("^{min_version}")).unwrap();
if let Some(version) = self
.get_package_version(lib_name)
.map_err(|e| DepCheckError::Error(e))?
{
if !req.matches(&version) {
anyhow::bail!(
"Unsupported version {}, you must ensure {}\n\nAlternatively, use a different version of worker-build (currently running {}) that supports this {lib_name} version.",
style(format!("{lib_name}@{version}")).bold().red(),
cargo_dep_error(lib_name, cur_version),
*CUR_WORKER_VERSION
);
return Err(DepCheckError::VersionError(
format!(
"Unsupported version {}, expected {}.",
style(format!("{lib_name}@{version}")).bold().red(),
cargo_dep_error(lib_name, cur_version)
),
Some(version),
));
}
} else {
anyhow::bail!(
"Ensure that you have dependency {}",
cargo_dep_error(lib_name, cur_version)
);
return Err(DepCheckError::VersionError(
format!(
"Ensure that you have dependency {}",
cargo_dep_error(lib_name, cur_version)
),
None,
));
}
Ok(())
}

5
worker-build/src/main.rs
View File

@ -56,10 +56,7 @@ pub fn main() -> Result<()> {
env_logger::init();
let args: Vec<_> = env::args().collect();
if matches!(
args.first().map(String::as_str),
Some("--version") | Some("-v")
) {
if args.len() > 1 && (args[1].as_str() == "--version" || args[1].as_str() == "-v") {
println!("{}", VERSION);
return Ok(());
}

2
worker-build/src/versions.rs
View File

@ -8,7 +8,7 @@ macro_rules! version {
// Current build toolchain, always used exactly for builds, unless overridden by {}_BIN env vars
pub(crate) static CUR_WASM_BINDGEN_VERSION: LazyLock<semver::Version> = version!("0.2.105");
pub(crate) static CUR_WASM_OPT_VERSION: &str = "124";
pub(crate) static CUR_WASM_OPT_VERSION: &str = "125";
pub(crate) static CUR_ESBUILD_VERSION: LazyLock<semver::Version> = version!("0.27.0");
// Minimum required libraries, validated before build