diff --git a/Cargo.lock b/Cargo.lock index 36599cf..f44c0d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2058,9 +2058,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maud" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0bab19cef8a7fe1c18a43e881793bfc9d4ea984befec3ae5bd0415abf3ecf00" +checksum = "df518b75016b4289cdddffa1b01f2122f4a49802c93191f3133f6dc2472ebcaa" dependencies = [ "actix-web", "futures-util", @@ -2070,9 +2070,9 @@ dependencies = [ [[package]] name = "maud_macros" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be95d66c3024ffce639216058e5bae17a83ecaf266ffc6e4d060ad447c9eed2" +checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18" dependencies = [ "proc-macro-error", "proc-macro2 1.0.81", @@ -2144,8 +2144,7 @@ dependencies = [ [[package]] name = "minify-js" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e" +source = "git+https://github.com/RuairidhWilliamson/minify-js?branch=master#8637df12fdb1d86d7586dde8adf4b8a5d39e7067" dependencies = [ "aho-corasick 0.7.20", "lazy_static", @@ -2452,9 +2451,9 @@ dependencies = [ [[package]] name = "parse-js" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e" +checksum = "26f2abaec4434c4c5ec8bb3abfa112c9779f774b54ef3d9a6321e022cfcced5f" dependencies = [ "aho-corasick 0.7.20", "bumpalo", diff --git a/Cargo.toml b/Cargo.toml index 671ea71..71b7070 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ tokio = { version = "1.32.0", features = [ "io-util", ], default-features = false } serde = { version = "1.0.196", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.109", default-features = false } -maud = { version = "0.25.0", default-features = false, features = [ +serde_json = { version = "1.0.116", default-features = false } +maud = { version = "0.26.0", default-features = false, features = [ "actix-web", ] } scraper = { version = "0.18.1", default-features = false } @@ -52,7 +52,7 @@ blake3 = { version = "1.5.0", default-features = false } error-stack = { version = "0.4.0", default-features = false, features = [ "std", ] } -async-trait = { version = "0.1.76", default-features = false } +async-trait = { version = "0.1.80", default-features = false } regex = { version = "1.9.4", features = ["perf"], default-features = false } smallvec = { version = "1.13.1", features = [ "union", @@ -79,7 +79,7 @@ base64 = { version = "0.21.5", default-features = false, features = [ "std", ], optional = true } cfg-if = { version = "1.0.0", default-features = false, optional = true } -keyword_extraction = { version = "1.3.0", default-features = false, features = [ +keyword_extraction = { version = "1.4.3", default-features = false, features = [ "tf_idf", @@ -96,10 +96,15 @@ criterion = { version = "0.5.1", default-features = false } tempfile = { version = "3.10.1", default-features = false } [build-dependencies] -lightningcss = { version = "1.0.0-alpha.52", default-features = false, features = [ +lightningcss = { version = "1.0.0-alpha.55", default-features = false, features = [ "grid", ] } -minify-js = { version = "0.6.0", default-features = false } +# Disabled until bug fixing update +# minify-js = { version = "0.6.0", default-features = false } +# Temporary fork with fix +minify-js = { git = "https://github.com/RuairidhWilliamson/minify-js", branch = "master", version = "0.6.0", default-features = false} + + [profile.dev] opt-level = 0 diff --git a/Dockerfile b/Dockerfile index e7d4d01..9c5d612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM rust:1.76.0-alpine3.18 AS chef +FROM --platform=$BUILDPLATFORM rust:1.77.2-alpine3.18 AS chef # We only pay the installation cost once, # it will be cached from the second build onwards RUN apk add --no-cache alpine-sdk musl-dev g++ make libcrypto3 libressl-dev upx perl build-base diff --git a/dev.Dockerfile b/dev.Dockerfile index 58dc29d..c2280d2 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,5 +1,5 @@ # Create Builder image -FROM --platform=$BUILDPLATFORM rust:1.76.0-alpine3.18 +FROM --platform=$BUILDPLATFORM rust:1.77.2-alpine3.18 # Install required dependencies RUN apk add --no-cache alpine-sdk musl-dev g++ make libcrypto3 libressl-dev perl build-base