From 95d7012c8db7441cc0a4a9411e1866811177ba7b Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 6 Mar 2024 02:00:24 -0800 Subject: [PATCH] fix hashing system, bump wasm-bindgen --- Cargo.lock | 44 ++++++++++++++-------------- Cargo.toml | 2 +- examples/file_upload.rs | 4 ++- packages/interpreter/build.rs | 2 +- packages/interpreter/src/js/hash.txt | 2 +- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d1ebad8e..71af3de8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10089,9 +10089,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -10099,9 +10099,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -10114,9 +10114,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806a045c4ec4ef7c3ad86dc27bcb641b84d9eeb3846200f56d7ab0885241d654" +checksum = "ca821da8c1ae6c87c5e94493939a206daa8587caff227c6032e0061a3d80817f" dependencies = [ "anyhow", "base64", @@ -10136,9 +10136,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ac5fca1d0992d2328147488169ea166bfe899c88f8ad06cf583f4c492fcf" +checksum = "102582726b35a30d53157fbf8de3d0f0fed4c40c0c7951d69a034e9ef01da725" dependencies = [ "anyhow", "walrus", @@ -10158,9 +10158,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10168,9 +10168,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -10181,9 +10181,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e019acde479e2f090fb7f14a51fa0077ec3a7bb12a56e0e888a82be7b5bd3f" +checksum = "3498e4799f43523d780ceff498f04d882a8dbc9719c28020034822e5952f32a4" dependencies = [ "anyhow", "walrus", @@ -10191,9 +10191,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-bindgen-test" @@ -10222,9 +10222,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a2e577034352f9aa9352730fcf2562c68957f2e9b9ee70ab6379510e49e2fe" +checksum = "2d5add359b7f7d09a55299a9d29be54414264f2b8cf84f8c8fda5be9269b5dd9" dependencies = [ "anyhow", "walrus", @@ -10233,9 +10233,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6b653f6820409609bda0f176e6949302307af7a7b9479cd4d4b1bdc31eb9cd" +checksum = "8c04e3607b810e76768260db3a5f2e8beb477cb089ef8726da85c8eb9bd3b575" dependencies = [ "anyhow", "walrus", @@ -10243,9 +10243,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682940195a701dbf887f20017418b8cac916a37b3f91ededec33226619e973c1" +checksum = "9ea966593c8243a33eb4d643254eb97a69de04e89462f46cf6b4f506aae89b3a" dependencies = [ "anyhow", "log", diff --git a/Cargo.toml b/Cargo.toml index 41137da2f..c07bd33d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ slab = "0.4.2" futures-channel = "0.3.21" futures-util = { version = "0.3", default-features = false } rustc-hash = "1.1.0" -wasm-bindgen = "0.2.88" +wasm-bindgen = "0.2.92" html_parser = "0.7.0" thiserror = "1.0.40" prettyplease = { package = "prettier-please", version = "0.2", features = [ diff --git a/examples/file_upload.rs b/examples/file_upload.rs index 3a433250e..62d30bb79 100644 --- a/examples/file_upload.rs +++ b/examples/file_upload.rs @@ -9,7 +9,7 @@ use dioxus::prelude::*; use dioxus::{html::HasFileData, prelude::dioxus_elements::FileEngine}; fn main() { - LaunchBuilder::desktop().launch(app); + launch(app); } struct UploadedFile { @@ -80,6 +80,8 @@ fn app() -> Element { "ondragleave": "this.style.backgroundColor='#FFFFFF';", "ondrop": "this.style.backgroundColor='#FFFFFF';", id: "drop-zone", + prevent_default: "ondragover", + prevent_default: "ondrop", ondrop: handle_file_drop, "Drop files here" } diff --git a/packages/interpreter/build.rs b/packages/interpreter/build.rs index f28c38ecc..7320361d4 100644 --- a/packages/interpreter/build.rs +++ b/packages/interpreter/build.rs @@ -27,7 +27,7 @@ fn main() { /// Hashes the contents of a directory fn hash_dir(dir: &str) -> u128 { - let mut out = 0_128; + let mut out = 0; for entry in std::fs::read_dir(dir).unwrap() { let entry = entry.unwrap(); diff --git a/packages/interpreter/src/js/hash.txt b/packages/interpreter/src/js/hash.txt index 623ff5f16..0964a8ca3 100644 --- a/packages/interpreter/src/js/hash.txt +++ b/packages/interpreter/src/js/hash.txt @@ -1 +1 @@ -63611502429846612446 \ No newline at end of file +63611502429846612318 \ No newline at end of file