From 5b6afb0b670931ad7d6ab14c68ccbfdef3e68fa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 13:54:52 +0000 Subject: [PATCH 1/7] build(deps): bump maud from 0.25.0 to 0.26.0 (#559) --- Cargo.lock | 11 +++++------ Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f34153..c44f8b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2037,9 +2037,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", @@ -2049,14 +2049,14 @@ 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.78", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -2666,7 +2666,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.109", "version_check", ] diff --git a/Cargo.toml b/Cargo.toml index fd6e873..7584f59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ tokio = { version = "1.32.0", features = [ ], 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 = [ +maud = { version = "0.26.0", default-features = false, features = [ "actix-web", ] } scraper = { version = "0.18.1", default-features = false } From fe959efd0e236aa3bba069eb716a20a70987eab0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 13:59:45 +0000 Subject: [PATCH 2/7] build(deps): bump async-trait from 0.1.77 to 0.1.80 (#560) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c44f8b4..1f53d3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -365,9 +365,9 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index 7584f59..1a5f1b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", From 1386cd673986c3d163ddddb85a730cceb7f4a568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 14:06:17 +0000 Subject: [PATCH 3/7] build(deps): bump serde_json from 1.0.114 to 1.0.116 (#561) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f53d3f..f43fb69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3315,9 +3315,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa 1.0.10", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 1a5f1b3..0bd11a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ 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 } +serde_json = { version = "1.0.116", default-features = false } maud = { version = "0.26.0", default-features = false, features = [ "actix-web", ] } From 9f90caf262c15dda952c92d0dc3d471ba8d3473b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 14:11:45 +0000 Subject: [PATCH 4/7] build(deps): bump keyword_extraction from 1.3.0 to 1.4.3 (#562) --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f43fb69..4edf9a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1848,9 +1848,9 @@ dependencies = [ [[package]] name = "keyword_extraction" -version = "1.3.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c25710ba2c50e4762b267b7387a989d8d1a8235f5cf26cd84e34aac30b263140" +checksum = "f0efa28e79b3a5f72586318c07c24477a169c688e5065fde647c71b3952a2d42" dependencies = [ "regex", "unicode-segmentation", @@ -2945,9 +2945,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick 1.1.2", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 0bd11a7..4bf5ce5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", From 9058b68f7845c75d506a6622de69e302fefd093b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 14:25:11 +0000 Subject: [PATCH 5/7] build(deps): bump lightningcss from 1.0.0-alpha.54 to 1.0.0-alpha.55 (#563) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4edf9a4..2680843 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1906,9 +1906,9 @@ dependencies = [ [[package]] name = "lightningcss" -version = "1.0.0-alpha.54" +version = "1.0.0-alpha.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d306844e5af1753490c420c0d6ae3d814b00725092d106332762827ca8f0fe" +checksum = "3bd5bed3814fb631bfc1e24c2be6f7e86a9837c660909acab79a38374dcb8798" dependencies = [ "ahash", "bitflags 2.4.2", diff --git a/Cargo.toml b/Cargo.toml index 4bf5ce5..ad68bd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ 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 } From 2e50fa4edb76c89186beb89bc1867c27e28de9c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 14:31:00 +0000 Subject: [PATCH 6/7] build(deps): bump rust from 1.76.0-alpine3.18 to 1.77.2-alpine3.18 (#564) --- Dockerfile | 2 +- dev.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 408858a91e39af2429e697c904be7b4e78101c28 Mon Sep 17 00:00:00 2001 From: ddotthomas Date: Sat, 4 May 2024 10:57:40 -0600 Subject: [PATCH 7/7] :bandage: fix: temporary fix for minifying js files (#565) --- Cargo.lock | 11 +++++------ Cargo.toml | 7 ++++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2680843..e2469ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -996,9 +996,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deranged" @@ -2123,8 +2123,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", @@ -2431,9 +2430,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 ad68bd6..38a9378 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,7 +99,12 @@ tempfile = { version = "3.10.1", default-features = false } 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