From a62d43be18e9e0999ca989e04036151bf81c022d Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 4 Jun 2024 15:02:14 -0700 Subject: [PATCH] 2024.5.1-beta.1 (#40) Fix Linux and Windows launch errors --- .tauriignore | 1 - package-lock.json | 88 ++++++------- package.json | 2 +- src-tauri/Cargo.lock | 123 +++++++++---------- src-tauri/Cargo.toml | 29 ++--- src-tauri/grpc/Cargo.toml | 4 +- src-tauri/src/lib.rs | 7 -- src-tauri/src/tauri_plugin_windows_window.rs | 97 --------------- src-tauri/tauri.conf.json | 6 +- src-web/components/Portal.tsx | 1 + 10 files changed, 117 insertions(+), 241 deletions(-) delete mode 100644 .tauriignore delete mode 100644 src-tauri/src/tauri_plugin_windows_window.rs diff --git a/.tauriignore b/.tauriignore deleted file mode 100644 index 5a02d108..00000000 --- a/.tauriignore +++ /dev/null @@ -1 +0,0 @@ -plugins diff --git a/package-lock.json b/package-lock.json index cfd378c0..8acdc98d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "devDependencies": { "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tanstack/react-query-devtools": "^5.35.5", - "@tauri-apps/cli": "^2.0.0-beta.15", + "@tauri-apps/cli": ">=2.0.0-beta.0", "@types/node": "^18.7.10", "@types/papaparse": "^5.3.7", "@types/parse-color": "^1.0.1", @@ -2309,9 +2309,9 @@ } }, "node_modules/@tauri-apps/cli": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.0.0-beta.15.tgz", - "integrity": "sha512-3pCvc54QfsRY+i9B7w3Q5jPAGtf8p+g7N/BamWPeiW6YqDqbHi9rNVI3SzrHkRRNOJnzMW8E5a8G0HziOluZGg==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.0.0-beta.20.tgz", + "integrity": "sha512-707q9uIc2oNrYHd2dtMvxTrpZXVpart5EIktnRymNOpphkLlB6WUBjHD+ga45WqTU6cNGKbYvkKqTNfshNul9Q==", "dev": true, "bin": { "tauri": "tauri.js" @@ -2324,22 +2324,22 @@ "url": "https://opencollective.com/tauri" }, "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "2.0.0-beta.15", - "@tauri-apps/cli-darwin-x64": "2.0.0-beta.15", - "@tauri-apps/cli-linux-arm-gnueabihf": "2.0.0-beta.15", - "@tauri-apps/cli-linux-arm64-gnu": "2.0.0-beta.15", - "@tauri-apps/cli-linux-arm64-musl": "2.0.0-beta.15", - "@tauri-apps/cli-linux-x64-gnu": "2.0.0-beta.15", - "@tauri-apps/cli-linux-x64-musl": "2.0.0-beta.15", - "@tauri-apps/cli-win32-arm64-msvc": "2.0.0-beta.15", - "@tauri-apps/cli-win32-ia32-msvc": "2.0.0-beta.15", - "@tauri-apps/cli-win32-x64-msvc": "2.0.0-beta.15" + "@tauri-apps/cli-darwin-arm64": "2.0.0-beta.20", + "@tauri-apps/cli-darwin-x64": "2.0.0-beta.20", + "@tauri-apps/cli-linux-arm-gnueabihf": "2.0.0-beta.20", + "@tauri-apps/cli-linux-arm64-gnu": "2.0.0-beta.20", + "@tauri-apps/cli-linux-arm64-musl": "2.0.0-beta.20", + "@tauri-apps/cli-linux-x64-gnu": "2.0.0-beta.20", + "@tauri-apps/cli-linux-x64-musl": "2.0.0-beta.20", + "@tauri-apps/cli-win32-arm64-msvc": "2.0.0-beta.20", + "@tauri-apps/cli-win32-ia32-msvc": "2.0.0-beta.20", + "@tauri-apps/cli-win32-x64-msvc": "2.0.0-beta.20" } }, "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-beta.15.tgz", - "integrity": "sha512-M4owBLoRdJb2/IK48KOQDU3j5xrjqGxa539rDXMjvaKydBk8x+aLdk3xZNsk/owHTI1GnrQZsPCMQaOgetYHaw==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-beta.20.tgz", + "integrity": "sha512-oCJOCib7GuYkwkBXx+ekamR8NZZU+2i3MLP+DHpDxK5gS2uhCE+CBkamJkNt6y1x6xdVnwyqZOm5RvN4SRtyIA==", "cpu": [ "arm64" ], @@ -2353,9 +2353,9 @@ } }, "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-beta.15.tgz", - "integrity": "sha512-ECpatfJdT4xKyFoE7tNEtTUIRxjQ2XSXa0TQkP3g7Kn7H/jRse+7pYe69jASA7shixajatAwmD4bXNT8jYRyNA==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-beta.20.tgz", + "integrity": "sha512-lC5QSnRExedYN4Ds6ZlSvC2PxP8qfIYBJQ5ktf+PJI5gQALdNeVtd6YnTG1ODCEklfLq9WKkGwp7JdALTU5wDA==", "cpu": [ "x64" ], @@ -2369,9 +2369,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-beta.15.tgz", - "integrity": "sha512-GQz2nnPwIamzDbmmfGWvmmoLthOkOBs0RO5u72KYAa78ZRFTx7S6AovnxJv48Fq+zeGGdDKoD9+ZG2Ue+sCL4w==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-beta.20.tgz", + "integrity": "sha512-nZCeBMHHye5DLOJV5k2w658hnCS+LYaOZ8y/G9l3ei+g0L/HBjlSy6r4simsAT5TG8+l3oCZzLBngfTMdDS/YA==", "cpu": [ "arm" ], @@ -2385,9 +2385,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-beta.15.tgz", - "integrity": "sha512-YBIfq0GbmIsWmRy6dVuDv3oMJN7a3R8HGVPMsa1W526AdCxoZDiPOQpSQN4VihJlbebUHxS/HyYF6maCY8uGzA==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-beta.20.tgz", + "integrity": "sha512-B79ISVLPVBgwnCchVqwTKU+vxnFYqxKomcR4rmsvxfs0NVtT5QuNzE1k4NUQnw3966yjwhYR3mnHsSJQSB4Eyw==", "cpu": [ "arm64" ], @@ -2401,9 +2401,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-beta.15.tgz", - "integrity": "sha512-2ZBXoShz7UfqVGmc85mhwjI6ckdtrk15V69adxt/x+VS68yK6Ddbj+yqlffpeFNL90fZrsVhFoRIDqgkxtwksQ==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-beta.20.tgz", + "integrity": "sha512-ojIkv/1uZHhcrgfIN8xgn4BBeo/Xg+bnV0wer6lD78zyxkUMWeEZ+u3mae1ejCJNhhaZOxNaUQ67MvDOiGyr5Q==", "cpu": [ "arm64" ], @@ -2417,9 +2417,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-beta.15.tgz", - "integrity": "sha512-cwJqIIdc4Kq9sBl/vYc+Y95iMe+mlTYUj7ZnSn4YAbLKFz432bGg6uBn2qHXFN5jzwXtEOVZiB1zDZ2kveVoAQ==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-beta.20.tgz", + "integrity": "sha512-xBy1FNbHKlc7T6pOmFQQPECxJaI5A9QWX7Kb9N64cNVusoOGlvc3xHYkXMS4PTr7xXOT0yiE1Ww2OwDRJ3lYsg==", "cpu": [ "x64" ], @@ -2433,9 +2433,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-beta.15.tgz", - "integrity": "sha512-nNuxZ8/qs0vQbdLO2hovskZGxwGn2z4x1QFJuL4xwd6Tryy9vVcznvyZS+t/72dCLoIkY9pKZQq5nYtAHYfTEg==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-beta.20.tgz", + "integrity": "sha512-+O6zq5jmtUxA1FUAAwF2ywPysy4NRo2Y6G+ESZDkY9XosRwdt5OUjqAsYktZA3AxDMZVei8r9buwTqUwi9ny/g==", "cpu": [ "x64" ], @@ -2449,9 +2449,9 @@ } }, "node_modules/@tauri-apps/cli-win32-arm64-msvc": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-beta.15.tgz", - "integrity": "sha512-DXiXMTE00INjBkTgq1CYduMWgUwQ0NvLw+uXfu8BUupA+aOlv9ODhsGu7bZSaxKx4/glwxNAGZum4kQ0E0AxUg==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-beta.20.tgz", + "integrity": "sha512-RswgMbWyOQcv53CHvIuiuhAh4kKDqaGyZfWD4VlxqX/XhkoF5gsNgr0MxzrY7pmoL+89oVI+fiGVJz4nOQE5vA==", "cpu": [ "arm64" ], @@ -2465,9 +2465,9 @@ } }, "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-beta.15.tgz", - "integrity": "sha512-ajEQdW2jx2raPp7eDYryJkbBrgI8PIY1dz5ro8FweRrRmbotaUlclsro1kfNMQrfDah8+qfwnRvW3MahOBE5Wg==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-beta.20.tgz", + "integrity": "sha512-5lgWmDVXhX3SBGbiv5SduM1yajiRnUEJClWhSdRrEEJeXdsxpCsBEhxYnUnDCEzPKxLLn5fdBv3VrVctJ03csQ==", "cpu": [ "ia32" ], @@ -2481,9 +2481,9 @@ } }, "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "2.0.0-beta.15", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-beta.15.tgz", - "integrity": "sha512-yzsSgoiY0PmFiR5LvVOFr1b7h9l3aLPPQFlDG6+kRMrxCo7x7Pbyh4D5cqiMUuZO0QacwSP38EH6w0F88Y+4OA==", + "version": "2.0.0-beta.20", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-beta.20.tgz", + "integrity": "sha512-SuSiiVQTQPSzWlsxQp/NMzWbzDS9TdVDOw7CCfgiG5wnT2GsxzrcIAVN6i7ILsVFLxrjr0bIgPldSJcdcH84Yw==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index 8247457e..a26a8aab 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "devDependencies": { "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tanstack/react-query-devtools": "^5.35.5", - "@tauri-apps/cli": "^2.0.0-beta.15", + "@tauri-apps/cli": ">=2.0.0-beta.0", "@types/node": "^18.7.10", "@types/papaparse": "^5.3.7", "@types/parse-color": "^1.0.1", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 99e49568..90036f0e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -162,12 +162,12 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ "event-listener 5.3.1", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -179,7 +179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -200,9 +200,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock", "cfg-if", @@ -219,20 +219,20 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", @@ -261,9 +261,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" dependencies = [ "async-io", "async-lock", @@ -373,7 +373,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.29", "itoa 1.0.11", "matchit", "memchr", @@ -1606,17 +1606,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "event-listener" version = "5.3.1" @@ -1628,16 +1617,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" @@ -2188,7 +2167,7 @@ name = "grpc" version = "0.1.0" dependencies = [ "anyhow", - "hyper 0.14.28", + "hyper 0.14.29", "hyper-rustls 0.24.2", "log", "prost", @@ -2467,9 +2446,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -2516,7 +2495,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.29", "log", "rustls 0.21.12", "rustls-native-certs", @@ -2547,7 +2526,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.28", + "hyper 0.14.29", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -2560,7 +2539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.29", "native-tls", "tokio", "tokio-native-tls", @@ -3683,9 +3662,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.3" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" +checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" dependencies = [ "is-wsl", "libc", @@ -3726,9 +3705,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.0+3.3.0" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -4066,9 +4045,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -4131,9 +4110,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", @@ -4226,9 +4205,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -4588,7 +4567,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.29", "hyper-tls", "ipnet", "js-sys", @@ -5973,7 +5952,8 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" version = "2.1.0-beta.4" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76fceedc022b7590245c5bd0ba0ef5909e44480d84b72fb498b76ba8bc0da7db" dependencies = [ "arboard", "image 0.24.9", @@ -5988,7 +5968,8 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" version = "2.0.0-beta.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bfc538a38845f08c7a63acd9e03737b5e89c815273ed8e2a447780a4e2583f4" dependencies = [ "dunce", "log", @@ -6007,7 +5988,8 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" version = "2.0.0-beta.9" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed4b22c59f7b04ae2a0bed8241aa715b41973c3f042c84aa67a1f4dc0174a8d" dependencies = [ "dunce", "log", @@ -6024,7 +6006,8 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" version = "2.0.0-beta.9" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa91955751f329e0aa431b87c199b7378b6f91ec0765d2ad9d4c64e017c3cda" dependencies = [ "anyhow", "glob", @@ -6042,7 +6025,8 @@ dependencies = [ [[package]] name = "tauri-plugin-log" version = "2.0.0-beta.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28be50bb36ac6b5181a360cee0606a4364d9e0bdcdd8974c40710d7af12e60ec" dependencies = [ "android_logger", "byte-unit", @@ -6062,7 +6046,8 @@ dependencies = [ [[package]] name = "tauri-plugin-os" version = "2.0.0-beta.6" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae3c8aeb113ce614cc36a43b1061fdf64381f7635d02c390052ce7579ec628" dependencies = [ "gethostname", "log", @@ -6079,7 +6064,8 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" version = "2.0.0-beta.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8675bf7ab71f571a99192d0685ae870eb7af1264bdbbb66a1d655609f6c7ebd" dependencies = [ "encoding_rs", "log", @@ -6099,7 +6085,8 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" version = "2.0.0-beta.7" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b0bec1fe304e1ff350b5e7be5048047f9bdec19dcc224ba266e9f2a692b8e" dependencies = [ "base64 0.22.1", "dirs-next", @@ -6127,7 +6114,8 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" version = "2.0.0-beta.9" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#0f739dbc483a1f091977cbe575c3862fd39f8cf1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b5596f41b90668ea37562d512e1dead687d9ae5eadb49f9faa8b875a2740a3" dependencies = [ "bitflags 2.5.0", "log", @@ -6537,7 +6525,7 @@ dependencies = [ "h2", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.29", "hyper-timeout", "percent-encoding", "pin-project", @@ -6791,9 +6779,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -7557,9 +7545,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.40.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd42682bad8d1efd0e0d0593770c602c13b8922bb1ca705cb845967de81bbc4" +checksum = "1fa597526af53f310a8e6218630c5024fdde8271f229e70d7d2fc70b52b8fb1e" dependencies = [ "base64 0.22.1", "block", @@ -7702,7 +7690,6 @@ dependencies = [ "tokio", "tokio-stream", "uuid", - "windows 0.56.0", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8aac84c9..0ce0c6e2 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # Produce a library for mobile support [lib] name = "tauri_app_lib" -crate-type = ["staticlib", "cdylib", "rlib"] +crate-type = ["staticlib", "cdylib", "lib"] [profile.release] strip = true # Automatically strip symbols from the binary. @@ -20,13 +20,6 @@ tauri-build = { version = "2.0.0-beta", features = [] } objc = "0.2.7" cocoa = "0.25.0" -[target.'cfg(target_os = "windows")'.dependencies] -windows = { version = "0.56.0", features = [ - "Win32_Graphics_Dwm", - "Win32_Foundation", - "Win32_UI_Controls", -] } - [target.'cfg(target_os = "linux")'.dependencies] openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work @@ -41,16 +34,16 @@ reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "br serde = { version = "1.0.198", features = ["derive"] } serde_json = { version = "1.0.116", features = ["raw_value"] } sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] } -tauri = { version = "2.0.0-beta.22", features = ["config-toml", "devtools", "protocol-asset"] } -tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2", features = ["colored"] } -tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } -tauri-plugin-deep-link = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri = { version = "2.0.0-beta", features = ["config-toml", "devtools", "protocol-asset"] } +tauri-plugin-clipboard-manager = "2.1.0-beta" +tauri-plugin-dialog = "2.0.0-beta" +tauri-plugin-log = { version = "2.0.0-beta", features = ["colored"] } +tauri-plugin-shell = "2.0.0-beta" +tauri-plugin-os = "2.0.0-beta" +tauri-plugin-updater = "2.0.0-beta" +tauri-plugin-window-state = "2.0.0-beta" +tauri-plugin-fs = "2.0.0-beta" +tauri-plugin-deep-link = "2.0.0-beta" tokio = { version = "1.36.0", features = ["sync"] } uuid = "1.7.0" log = "0.4.21" diff --git a/src-tauri/grpc/Cargo.toml b/src-tauri/grpc/Cargo.toml index 84bed58b..d888c3e3 100644 --- a/src-tauri/grpc/Cargo.toml +++ b/src-tauri/grpc/Cargo.toml @@ -18,5 +18,5 @@ anyhow = "1.0.79" hyper = { version = "0.14" } hyper-rustls = { version = "0.24.0", features = ["http2"] } uuid = { version = "1.7.0", features = ["v4"] } -tauri = { version = "2.0.0-beta.16" } -tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } +tauri = { version = "2.0.0-beta" } +tauri-plugin-shell = "2.0.0-beta" diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 1bc5203e..0b02de4e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -69,8 +69,6 @@ mod plugin; mod render; #[cfg(target_os = "macos")] mod tauri_plugin_mac_window; -#[cfg(target_os = "windows")] -mod tauri_plugin_windows_window; mod updates; mod window_menu; @@ -1553,11 +1551,6 @@ pub fn run() { .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_fs::init()); - #[cfg(target_os = "windows")] - { - builder = builder.plugin(tauri_plugin_windows_window::init()); - } - #[cfg(target_os = "macos")] { builder = builder.plugin(tauri_plugin_mac_window::init()); diff --git a/src-tauri/src/tauri_plugin_windows_window.rs b/src-tauri/src/tauri_plugin_windows_window.rs deleted file mode 100644 index d40ad003..00000000 --- a/src-tauri/src/tauri_plugin_windows_window.rs +++ /dev/null @@ -1,97 +0,0 @@ -use hex_color::HexColor; -use tauri::{Manager, Runtime, Window, WindowEvent}; - -use std::mem::transmute; -use std::{ffi::c_void, mem::size_of, ptr}; -use tauri::plugin::{Builder, TauriPlugin}; - -use windows::Win32::UI::Controls::{ - WTA_NONCLIENT, WTNCA_NODRAWICON, WTNCA_NOMIRRORHELP, WTNCA_NOSYSMENU, -}; - -use windows::Win32::Foundation::COLORREF; -use windows::Win32::Foundation::{BOOL, HWND}; -use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute; -use windows::Win32::Graphics::Dwm::DWMWA_CAPTION_COLOR; -use windows::Win32::Graphics::Dwm::DWMWA_USE_IMMERSIVE_DARK_MODE; -use windows::Win32::UI::Controls::SetWindowThemeAttribute; -use windows::Win32::UI::Controls::WTNCA_NODRAWCAPTION; - -pub fn init() -> TauriPlugin { - Builder::new("windows_window") - .on_window_ready(|window| { - #[cfg(target_os = "windows")] - setup_win_window(window); - return; - }) - .build() -} - -fn hex_color_to_colorref(color: HexColor) -> COLORREF { - // TODO: Remove this unsafe, This operation doesn't need to be unsafe! - unsafe { COLORREF(transmute::<[u8; 4], u32>([color.r, color.g, color.b, 0])) } -} - -struct WinThemeAttribute { - #[allow(dead_code)] - flag: u32, - #[allow(dead_code)] - mask: u32, -} - -#[cfg(target_os = "windows")] -fn update_bg_color(hwnd: &HWND, bg_color: HexColor) { - let use_dark_mode = BOOL::from(true); - - let final_color = hex_color_to_colorref(bg_color); - - unsafe { - DwmSetWindowAttribute( - HWND(hwnd.0), - DWMWA_USE_IMMERSIVE_DARK_MODE, - ptr::addr_of!(use_dark_mode) as *const c_void, - size_of::().try_into().unwrap(), - ) - .unwrap(); - - DwmSetWindowAttribute( - HWND(hwnd.0), - DWMWA_CAPTION_COLOR, - ptr::addr_of!(final_color) as *const c_void, - size_of::().try_into().unwrap(), - ) - .unwrap(); - - let flags = WTNCA_NODRAWCAPTION | WTNCA_NODRAWICON; - let mask = WTNCA_NODRAWCAPTION | WTNCA_NODRAWICON | WTNCA_NOSYSMENU | WTNCA_NOMIRRORHELP; - let options = WinThemeAttribute { flag: flags, mask }; - - SetWindowThemeAttribute( - HWND(hwnd.0), - WTA_NONCLIENT, - ptr::addr_of!(options) as *const c_void, - size_of::().try_into().unwrap(), - ) - .unwrap(); - } -} - -#[cfg(target_os = "windows")] -pub fn setup_win_window(window: Window) { - let win_handle = window.hwnd().unwrap(); - let win_clone = win_handle.clone(); - - let event_id = window.listen("yaak_bg_changed", move |ev| { - let payload = serde_json::from_str::<&str>(ev.payload()).unwrap().trim(); - let color = HexColor::parse_rgb(payload).unwrap(); - update_bg_color(&HWND(win_clone.0), color); - }); - - let h = window.app_handle().clone(); - window.on_window_event(move |e| match e { - WindowEvent::Destroyed => { - h.unlisten(event_id); - } - _ => {} - }) -} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7cac88fb..eb92bb05 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,13 +1,13 @@ { + "productName": "yaak", + "version": "2024.5.1-beta.1", + "identifier": "app.yaak.desktop", "build": { "beforeBuildCommand": "npm run build", "beforeDevCommand": "npm run dev", "devUrl": "http://localhost:1420", "frontendDist": "../dist" }, - "productName": "Yaak", - "version": "2024.5.0", - "identifier": "app.yaak.desktop", "app": { "withGlobalTauri": false, "security": { diff --git a/src-web/components/Portal.tsx b/src-web/components/Portal.tsx index 5c4169e7..25184dfd 100644 --- a/src-web/components/Portal.tsx +++ b/src-web/components/Portal.tsx @@ -1,6 +1,7 @@ import type { ReactNode } from 'react'; import { createPortal } from 'react-dom'; import { usePortal } from '../hooks/usePortal'; + interface Props { children: ReactNode; name: string;