Merge branch 'rolling' into FEAT/566_initial-support-for-low-powered-devices-with-other-architectures

🚨 chore: make clippy checks happy (#566 )
:bandage: fix: temporary fix for minifying js files (#565 )
2024-11-23 06:28:23 -05:00 · 2024-05-06 20:35:17 +00:00 · 2024-05-06 23:19:25 +03:00 · 2024-05-04 19:57:40 +03:00 · 2024-05-02 14:31:00 +00:00 · 2024-05-02 14:25:11 +00:00
4 changed files with 38 additions and 35 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -321,9 +321,9 @@ checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"

 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"

 [[package]]
 name = "arc-swap"
@ -603,9 +603,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"

 [[package]]
 name = "cfg-if"
@ -1433,9 +1433,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@ -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",
@ -3241,11 +3240,11 @@ dependencies = [

 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
 "core-foundation",
 "core-foundation-sys",
 "libc",
@ -3254,9 +3253,9 @@ dependencies = [

 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
 "core-foundation-sys",
 "libc",
@ -3971,16 +3970,15 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
 "bytes 1.6.0",
 "futures-core",
 "futures-sink",
 "pin-project-lite",
 "tokio 1.37.0",
- "tracing",
 ]

 [[package]]
@ -4569,18 +4567,18 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393"
 dependencies = [
 "proc-macro2 1.0.81",
 "quote 1.0.36",
--- 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
@ -132,7 +137,7 @@ inherits = "release"
 opt-level = "s"

 [profile.bsr2]
-inherits = "bsr"
+inherits = "bsr1"
 opt-level = "z"

 [profile.lpcb1]
--- a/2
+++ b/2
@ -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
--- 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
Author	SHA1	Message	Date
neon_arch	33363a83ef	Merge branch 'rolling' into FEAT/566_initial-support-for-low-powered-devices-with-other-architectures	2024-05-06 20:35:17 +00:00
neon_arch	6200c5d53c	🚨 chore: make clippy checks happy (#566 )	2024-05-06 23:19:25 +03:00
ddotthomas	408858a91e	:bandage: fix: temporary fix for minifying js files (#565 )	2024-05-04 19:57:40 +03:00
dependabot[bot]	2e50fa4edb	build(deps): bump rust from 1.76.0-alpine3.18 to 1.77.2-alpine3.18 (#564 )	2024-05-02 14:31:00 +00:00
dependabot[bot]	9058b68f78	build(deps): bump lightningcss from 1.0.0-alpha.54 to 1.0.0-alpha.55 (#563 )	2024-05-02 14:25:11 +00:00
dependabot[bot]	9f90caf262	build(deps): bump keyword_extraction from 1.3.0 to 1.4.3 (#562 )	2024-05-02 14:11:45 +00:00
dependabot[bot]	1386cd6739	build(deps): bump serde_json from 1.0.114 to 1.0.116 (#561 )	2024-05-02 14:06:17 +00:00
dependabot[bot]	fe959efd0e	build(deps): bump async-trait from 0.1.77 to 0.1.80 (#560 )	2024-05-02 13:59:45 +00:00
dependabot[bot]	5b6afb0b67	build(deps): bump maud from 0.25.0 to 0.26.0 (#559 )	2024-05-02 13:54:52 +00:00