diff --git a/Cargo.lock b/Cargo.lock index c13dcd16e..50a262c01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -213,7 +213,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-barcode-scanner", "tauri-plugin-biometric", "tauri-plugin-cli", @@ -246,7 +246,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-updater", "time", "tiny_http", @@ -259,7 +259,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-updater", "tiny_http", ] @@ -271,7 +271,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-store", ] @@ -922,21 +922,20 @@ dependencies = [ [[package]] name = "cef" -version = "144.1.0+144.0.7" +version = "146.4.1+146.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd219b8919445d9a848015e0c3d50fd6b89f5521e711e956aa13f7f6f52992eb" +checksum = "a5dad6495c583fedab04a24f6fc08274c59a28b33967ca87709398e1f11c2ebe" dependencies = [ "cef-dll-sys", "libloading 0.9.0", - "objc2 0.6.3", + "objc2 0.6.4", "windows-sys 0.61.2", ] [[package]] name = "cef-dll-sys" -version = "144.1.0+144.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb6189602922e778b99ffc8a8635e696b1417457be3270fd53831eb30bb4843" +version = "146.4.1+146.0.9" +source = "git+https://github.com/tauri-apps/cef-rs?branch=fix/146-location-windows#7fc79c7aa4f1d691ed9996d440f13eb34a151f2d" dependencies = [ "anyhow", "cmake", @@ -1086,6 +1085,15 @@ dependencies = [ "error-code", ] +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + [[package]] name = "colorchoice" version = "1.0.3" @@ -1172,6 +1180,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cookie" version = "0.18.1" @@ -1192,7 +1206,7 @@ dependencies = [ "cookie", "document-features", "idna", - "indexmap 2.9.0", + "indexmap 2.11.4", "log", "publicsuffix", "serde", @@ -1360,6 +1374,23 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.29.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf 0.10.1", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + [[package]] name = "cssparser" version = "0.36.0" @@ -1369,7 +1400,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf", + "phf 0.13.1", "smallvec", ] @@ -1496,7 +1527,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-deep-link", "tauri-plugin-log", "tauri-plugin-single-instance", @@ -1534,6 +1565,19 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.100", +] + [[package]] name = "derive_more" version = "2.0.1" @@ -1620,7 +1664,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.0", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1714,12 +1758,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89" dependencies = [ "bit-set", - "cssparser", + "cssparser 0.36.0", "foldhash 0.2.0", - "html5ever", + "html5ever 0.38.0", "precomputed-hash", - "selectors", - "tendril", + "selectors 0.36.1", + "tendril 0.5.0", ] [[package]] @@ -1736,9 +1780,8 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "download-cef" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6002a6b95f9f3bbe5693ac02a03221a8e3af6c9f5f4539f5734a8d6cde1a3616" +version = "2.3.1" +source = "git+https://github.com/tauri-apps/cef-rs?branch=fix/146-location-windows#7fc79c7aa4f1d691ed9996d440f13eb34a151f2d" dependencies = [ "bzip2", "clap", @@ -2195,6 +2238,16 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + [[package]] name = "futures" version = "0.3.31" @@ -2308,6 +2361,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "gdk" version = "0.18.2" @@ -2438,6 +2500,17 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -2767,6 +2840,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html5ever" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" +dependencies = [ + "log", + "mac", + "markup5ever 0.14.1", + "match_token", +] + [[package]] name = "html5ever" version = "0.38.0" @@ -2774,7 +2859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" dependencies = [ "log", - "markup5ever", + "markup5ever 0.38.0", ] [[package]] @@ -3422,6 +3507,18 @@ dependencies = [ "libc", ] +[[package]] +name = "kuchikiki" +version = "0.8.8-speedreader" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" +dependencies = [ + "cssparser 0.29.6", + "html5ever 0.29.1", + "indexmap 2.11.4", + "selectors 0.24.0", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -3611,6 +3708,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + [[package]] name = "mac-notification-sys" version = "0.6.4" @@ -3623,6 +3726,20 @@ dependencies = [ "time", ] +[[package]] +name = "markup5ever" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" +dependencies = [ + "log", + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache 0.8.9", + "string_cache_codegen 0.5.4", + "tendril 0.4.3", +] + [[package]] name = "markup5ever" version = "0.38.0" @@ -3630,10 +3747,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" dependencies = [ "log", - "tendril", + "tendril 0.5.0", "web_atoms", ] +[[package]] +name = "match_token" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + [[package]] name = "md-5" version = "0.10.6" @@ -3835,6 +3969,12 @@ dependencies = [ "memoffset 0.9.1", ] +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nom" version = "7.1.3" @@ -4016,10 +4156,15 @@ checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb" dependencies = [ "bitflags 2.9.0", "block2 0.6.2", + "libc", "objc2 0.6.4", + "objc2-cloud-kit", + "objc2-core-data", "objc2-core-foundation", "objc2-core-graphics", + "objc2-core-image", "objc2-foundation 0.3.0", + "objc2-quartz-core 0.3.0", ] [[package]] @@ -4039,6 +4184,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4" dependencies = [ + "bitflags 2.9.0", "objc2 0.6.4", "objc2-foundation 0.3.0", ] @@ -4185,6 +4331,17 @@ dependencies = [ "objc2-foundation 0.3.0", ] +[[package]] +name = "objc2-security" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3126341c65c5d5728423ae95d788e1b660756486ad0592307ab87ba02d9a7268" +dependencies = [ + "bitflags 2.9.0", + "objc2 0.6.4", + "objc2-core-foundation", +] + [[package]] name = "objc2-ui-kit" version = "0.3.0" @@ -4227,6 +4384,7 @@ dependencies = [ "objc2-app-kit", "objc2-core-foundation", "objc2-foundation 0.3.0", + "objc2-security", ] [[package]] @@ -4478,25 +4636,104 @@ dependencies = [ "indexmap 2.11.4", ] +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_shared 0.11.3", +] + [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.13.1", + "phf_shared 0.13.1", "serde", ] +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", +] + [[package]] name = "phf_codegen" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand 0.8.5", ] [[package]] @@ -4506,7 +4743,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -4515,20 +4766,47 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", "proc-macro2", "quote", "syn 2.0.100", ] +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher 1.0.1", +] + [[package]] name = "phf_shared" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ - "siphasher", + "siphasher 1.0.1", ] [[package]] @@ -4743,6 +5021,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.106" @@ -4888,6 +5172,20 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + [[package]] name = "rand" version = "0.8.5" @@ -4909,6 +5207,16 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -4929,6 +5237,15 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -4947,6 +5264,24 @@ dependencies = [ "getrandom 0.3.2", ] +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -5347,7 +5682,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5405,7 +5740,7 @@ dependencies = [ "security-framework 3.5.1", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5476,19 +5811,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" -dependencies = [ - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive 0.8.22", - "serde", - "serde_json", -] - [[package]] name = "schemars" version = "1.2.1" @@ -5497,25 +5819,13 @@ checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" dependencies = [ "dyn-clone", "ref-cast", - "schemars_derive 1.2.1", + "schemars_derive", "serde", "serde_json", "url", "uuid", ] -[[package]] -name = "schemars_derive" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.100", -] - [[package]] name = "schemars_derive" version = "1.2.1" @@ -5607,6 +5917,24 @@ dependencies = [ "libc", ] +[[package]] +name = "selectors" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +dependencies = [ + "bitflags 1.3.2", + "cssparser 0.29.6", + "derive_more 0.99.20", + "fxhash", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc 0.2.0", + "smallvec", +] + [[package]] name = "selectors" version = "0.36.1" @@ -5614,15 +5942,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" dependencies = [ "bitflags 2.9.0", - "cssparser", - "derive_more", + "cssparser 0.36.0", + "derive_more 2.0.1", "log", "new_debug_unreachable", - "phf", - "phf_codegen", + "phf 0.13.1", + "phf_codegen 0.13.1", "precomputed-hash", "rustc-hash", - "servo_arc", + "servo_arc 0.4.3", "smallvec", ] @@ -5693,7 +6021,7 @@ version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.11.4", "itoa", "memchr", "ryu", @@ -5793,6 +6121,16 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + [[package]] name = "servo_arc" version = "0.4.3" @@ -5890,11 +6228,17 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-cli", "tauri-plugin-single-instance", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "siphasher" version = "1.0.1" @@ -6244,6 +6588,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "string_cache" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.11.3", + "precomputed-hash", + "serde", +] + [[package]] name = "string_cache" version = "0.9.0" @@ -6252,18 +6609,30 @@ checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" dependencies = [ "new_debug_unreachable", "parking_lot", - "phf_shared", + "phf_shared 0.13.1", "precomputed-hash", ] +[[package]] +name = "string_cache_codegen" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", +] + [[package]] name = "string_cache_codegen" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", "proc-macro2", "quote", ] @@ -6520,9 +6889,8 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93bd86d231f0a8138f11a02a584769fe4b703dc36ae133d783228dbc4801405" +version = "2.11.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "anyhow", "bytes", @@ -6557,12 +6925,12 @@ dependencies = [ "serialize-to-javascript", "specta", "swift-rs", - "tauri-build 2.5.5", + "tauri-build", "tauri-macros", "tauri-runtime", "tauri-runtime-cef", "tauri-runtime-wry", - "tauri-utils", + "tauri-utils 2.9.0", "thiserror 2.0.12", "tokio", "tray-icon", @@ -6576,9 +6944,8 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a318b234cc2dea65f575467bafcfb76286bce228ebc3778e337d61d03213007" +version = "2.6.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "anyhow", "cargo_toml", @@ -6587,42 +6954,20 @@ dependencies = [ "heck 0.5.0", "json-patch", "quote", - "schemars 0.8.22", + "schemars", "semver", "serde", "serde_json", - "tauri-codegen 2.5.3", - "tauri-utils", + "tauri-codegen", + "tauri-utils 2.9.0", "tauri-winres", "walkdir", ] -[[package]] -name = "tauri-build" -version = "2.5.5" -source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#a4ea9711569e1143896d32cf53e99fc9742a95ab" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs 6.0.0", - "glob", - "heck 0.5.0", - "json-patch", - "schemars 1.2.1", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "toml 0.9.5", - "walkdir", -] - [[package]] name = "tauri-codegen" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd11644962add2549a60b7e7c6800f17d7020156e02f516021d8103e80cc528" +version = "2.6.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "base64 0.22.1", "ico", @@ -6636,32 +6981,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.100", - "tauri-utils", - "thiserror 2.0.12", - "time", - "url", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "2.5.4" -source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#a4ea9711569e1143896d32cf53e99fc9742a95ab" -dependencies = [ - "base64 0.22.1", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "sha2", - "syn 2.0.100", - "tauri-utils", + "tauri-utils 2.9.0", "thiserror 2.0.12", "time", "url", @@ -6671,31 +6991,29 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed9d3742a37a355d2e47c9af924e9fbc112abb76f9835d35d4780e318419502" +version = "2.6.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.100", - "tauri-codegen 2.5.4", - "tauri-utils", + "tauri-codegen", + "tauri-utils 2.9.0", ] [[package]] name = "tauri-plugin" version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d5f58bfd0cdcfdbc0a68dc08b354eea2afc551b421de91b07b69e0dd769d57" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "anyhow", "glob", "plist", - "schemars 1.2.1", + "schemars", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.9.0", "walkdir", ] @@ -6773,7 +7091,7 @@ dependencies = [ "serde_json", "tauri", "tauri-plugin", - "tauri-utils", + "tauri-utils 2.9.1", "thiserror 2.0.12", "tracing", "url", @@ -6809,13 +7127,13 @@ dependencies = [ "notify-debouncer-full", "objc2-foundation 0.3.0", "percent-encoding", - "schemars 1.2.1", + "schemars", "serde", "serde_json", "serde_repr", "tauri", "tauri-plugin", - "tauri-utils", + "tauri-utils 2.9.1", "thiserror 2.0.12", "toml 1.0.7+spec-1.1.0", "url", @@ -6870,7 +7188,7 @@ dependencies = [ "http", "regex", "reqwest 0.12.28", - "schemars 1.2.1", + "schemars", "serde", "serde_json", "tauri", @@ -6958,7 +7276,7 @@ dependencies = [ "objc2-app-kit", "objc2-foundation 0.3.0", "open", - "schemars 1.2.1", + "schemars", "serde", "serde_json", "tauri", @@ -7029,7 +7347,7 @@ dependencies = [ "open", "os_pipe", "regex", - "schemars 1.2.1", + "schemars", "serde", "serde_json", "shared_child", @@ -7190,9 +7508,8 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fef478ba1d2ac21c2d528740b24d0cb315e1e8b1111aae53fafac34804371fc" +version = "2.11.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "cookie", "dpi", @@ -7204,7 +7521,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.9.0", "thiserror 2.0.12", "url", "windows 0.61.1", @@ -7213,7 +7530,7 @@ dependencies = [ [[package]] name = "tauri-runtime-cef" version = "0.1.0" -source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#a4ea9711569e1143896d32cf53e99fc9742a95ab" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "base64 0.22.1", "cef", @@ -7221,10 +7538,10 @@ dependencies = [ "dioxus-debug-cell", "dirs 6.0.0", "gtk", - "html5ever", + "html5ever 0.29.1", "http", "kuchikiki", - "objc2 0.6.3", + "objc2 0.6.4", "objc2-app-kit", "objc2-foundation 0.3.0", "raw-window-handle", @@ -7232,7 +7549,7 @@ dependencies = [ "serde_json", "sha2", "tauri-runtime", - "tauri-utils", + "tauri-utils 2.9.0", "url", "windows 0.61.1", "x11-dl", @@ -7240,9 +7557,8 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3989df2ae1c476404fe0a2e8ffc4cfbde97e51efd613c2bb5355fbc9ab52cf0" +version = "2.11.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "gtk", "http", @@ -7250,13 +7566,14 @@ dependencies = [ "log", "objc2 0.6.4", "objc2-app-kit", + "objc2-web-kit", "once_cell", "percent-encoding", "raw-window-handle", "softbuffer", "tao", "tauri-runtime", - "tauri-utils", + "tauri-utils 2.9.0", "url", "webkit2gtk", "webview2-com", @@ -7266,9 +7583,8 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57200389a2f82b4b0a40ae29ca19b6978116e8f4d4e974c3234ce40c0ffbdec" +version = "2.9.0" +source = "git+https://github.com/tauri-apps/tauri.git?branch=feat/cef#d175c487acac135e7212a6314c61d651ea3cde27" dependencies = [ "aes-gcm", "anyhow", @@ -7278,17 +7594,19 @@ dependencies = [ "dunce", "getrandom 0.3.2", "glob", + "html5ever 0.29.1", "http", "infer", "json-patch", + "kuchikiki", "log", "memchr", - "phf", + "phf 0.13.1", "plist", "proc-macro2", "quote", "regex", - "schemars 1.2.1", + "schemars", "semver", "serde", "serde-untagged", @@ -7304,6 +7622,36 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tauri-utils" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d57200389a2f82b4b0a40ae29ca19b6978116e8f4d4e974c3234ce40c0ffbdec" +dependencies = [ + "anyhow", + "ctor", + "dunce", + "glob", + "http", + "infer", + "json-patch", + "log", + "memchr", + "phf 0.13.1", + "plist", + "regex", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "thiserror 2.0.12", + "toml 1.0.7+spec-1.1.0", + "url", + "urlpattern", + "uuid", +] + [[package]] name = "tauri-winres" version = "0.3.0" @@ -7336,7 +7684,18 @@ dependencies = [ "getrandom 0.3.2", "once_cell", "rustix 1.1.3", - "windows-sys 0.61.2", + "windows-sys 0.60.2", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", ] [[package]] @@ -7953,7 +8312,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-updater", "time", "tiny_http", @@ -8148,6 +8507,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -8352,10 +8717,10 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538" dependencies = [ - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", + "phf 0.13.1", + "phf_codegen 0.13.1", + "string_cache 0.9.0", + "string_cache_codegen 0.6.1", ] [[package]] @@ -8437,7 +8802,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.5.4", + "tauri-build", "tauri-plugin-websocket", "tokio", "tokio-tungstenite", diff --git a/Cargo.toml b/Cargo.toml index 8e722e6ab..13073523e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,3 +44,5 @@ opt-level = "s" tauri = { git = "https://github.com/tauri-apps/tauri.git", branch = "feat/cef" } tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", branch = "feat/cef" } tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", branch = "feat/cef" } +tauri-build = { git = "https://github.com/tauri-apps/tauri.git", branch = "feat/cef" } +cef-dll-sys = { git = "https://github.com/tauri-apps/cef-rs", branch = "fix/146-location-windows" }