From fb847ac1f0e444ae4e3ea4fca939dddf412904bb Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 9 Aug 2024 07:49:48 -0700 Subject: [PATCH] Switch to proper log plugin --- package-lock.json | 33 +++++------------ package.json | 2 +- src-tauri/Cargo.lock | 85 +++++++++++++++++++++++--------------------- src-tauri/Cargo.toml | 2 +- src-web/main.tsx | 4 +-- 5 files changed, 57 insertions(+), 69 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8912ca8f..22db28bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.0", "@tauri-apps/plugin-dialog": "^2.0.0-rc.0", "@tauri-apps/plugin-fs": "^2.0.0-rc.0", + "@tauri-apps/plugin-log": "^2.0.0-rc.0", "@tauri-apps/plugin-os": "^2.0.0-rc.0", "@tauri-apps/plugin-shell": "^2.0.0-rc.0", "@yaakapp/api": "^0.1.4", @@ -50,7 +51,6 @@ "react-router-dom": "^6.8.1", "react-use": "^17.4.0", "slugify": "^1.6.6", - "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2", "uuid": "^9.0.0", "xml-formatter": "^3.6.2" }, @@ -2568,6 +2568,14 @@ "@tauri-apps/api": "^2.0.0-rc.0" } }, + "node_modules/@tauri-apps/plugin-log": { + "version": "2.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-log/-/plugin-log-2.0.0-rc.0.tgz", + "integrity": "sha512-ztKfzUcq03dtr08vBu+xcwIEPusP6mCpuLAt6kpXEwG+HvYsC8e1/KFFokn3xvfwD+oBJ3UTL1h4kdM30GAqGw==", + "dependencies": { + "@tauri-apps/api": "^2.0.0-rc.0" + } + }, "node_modules/@tauri-apps/plugin-os": { "version": "2.0.0-rc.0", "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0-rc.0.tgz", @@ -11103,29 +11111,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "optional": true }, - "node_modules/tauri-plugin-log-api": { - "name": "@tauri-apps/plugin-log", - "version": "2.0.0-beta.4", - "resolved": "git+ssh://git@github.com/tauri-apps/tauri-plugin-log.git#1dc096891b697dc9af1241450c4608cbc33695da", - "license": "MIT or APACHE-2.0", - "dependencies": { - "@tauri-apps/api": "2.0.0-beta.11" - } - }, - "node_modules/tauri-plugin-log-api/node_modules/@tauri-apps/api": { - "version": "2.0.0-beta.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-beta.11.tgz", - "integrity": "sha512-wJRY+fBUm3KpqZDHMIz5HRv+1vlnvRJ/dFxiyY3NlINTx2qXqDou5qWYcP1CuZXsd39InWVPV3FAZvno/kGCkA==", - "engines": { - "node": ">= 18", - "npm": ">= 6.6.0", - "yarn": ">= 1.19.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/tauri" - } - }, "node_modules/term-size": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", diff --git a/package.json b/package.json index f7962497..7ed8f195 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "@tauri-apps/plugin-fs": "^2.0.0-rc.0", "@tauri-apps/plugin-os": "^2.0.0-rc.0", "@tauri-apps/plugin-shell": "^2.0.0-rc.0", + "@tauri-apps/plugin-log": "^2.0.0-rc.0", "@yaakapp/api": "^0.1.4", "buffer": "^6.0.3", "classnames": "^2.3.2", @@ -66,7 +67,6 @@ "react-router-dom": "^6.8.1", "react-use": "^17.4.0", "slugify": "^1.6.6", - "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2", "uuid": "^9.0.0", "xml-formatter": "^3.6.2" }, diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 10c80d62..28ea2d5e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cesu8" @@ -1570,14 +1570,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -2480,9 +2480,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -2881,6 +2881,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -3423,9 +3424,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -4155,9 +4156,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", @@ -4165,6 +4166,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls 0.23.12", + "socket2", "thiserror", "tokio", "tracing", @@ -4172,9 +4174,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand 0.8.5", @@ -4196,6 +4198,7 @@ dependencies = [ "libc", "once_cell", "socket2", + "tracing", "windows-sys 0.52.0", ] @@ -4630,9 +4633,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" @@ -4715,9 +4718,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -4934,9 +4937,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -4964,9 +4967,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -5729,9 +5732,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255e746089a370802ec4eb896dccc6f27c1dd2a203c1dc484fd996db954e2300" +checksum = "19ee93e545e49458813d4ed16179c67ee6141dba140ec3d4f078dda3b8d4e0d1" dependencies = [ "anyhow", "bytes", @@ -5779,9 +5782,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ceb8d082c3b17b4b2eb134a39363a22c696ddba473d6e5c0ab1caadad4cfca" +checksum = "96a58b3a716b51d7f671f729bb8c0a53cd2551eec8450c64e828ef4e6c9f948e" dependencies = [ "anyhow", "cargo_toml", @@ -5801,9 +5804,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2407c7d37a491b16e530445c9611d91091cae198eea2ed424913b740215605f2" +checksum = "90a9e63ecd827d57228864764e0234935c9aac230099cf145197c8c08e754ced" dependencies = [ "base64 0.22.1", "brotli 3.5.0", @@ -5828,9 +5831,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d210893b693be00f569b4f54456803debe104b7675f368205f2b6e94bac09b34" +checksum = "a54f5d5b289aa6215ffcfed7d4ff9960a04b7a854436d04519a9fcf911050cba" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5842,9 +5845,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b352e4478af27bd7c76724bb426ebb32fc51baafb2186afabed4e706dc9e39d4" +checksum = "03ce2ac5e182251ff932750d69c9b240a78e44901a7a6234814d63c595b43660" dependencies = [ "anyhow", "glob", @@ -6017,9 +6020,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6624fdf383ccafc9e8ad9205fe6e5c976b318efcd6b3662dde658c74e4254792" +checksum = "8f01b129b1ebdf09563c354760dbe7c0e96a166b4e33362d9c8d207f527c7ea5" dependencies = [ "dpi", "gtk", @@ -6036,9 +6039,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd1a785c4281f8231b091593393b40cb3a800810c407b1ffed52de27ff1640a" +checksum = "fcda27639094ace2bf25f00bc10e35ea4e3af2f92753b1bdd2a174d1fa5a6292" dependencies = [ "cocoa", "gtk", @@ -6060,9 +6063,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.0" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f435eeaae1e69cf93cf19da0f727989eed2e5eb6fc63a8d21432f59dd3ac4ac" +checksum = "28bb83cffa26e9cb7a2b3d0c31ab87bf277f44aaaa90f17159aef4d37aabd051" dependencies = [ "brotli 3.5.0", "cargo_metadata", @@ -6105,15 +6108,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 01372bbd..f1f6ff19 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -62,5 +62,5 @@ mime_guess = "2.0.5" [workspace.dependencies] yaak_models = { path = "yaak_models" } -tauri = { version = "2.0.0-rc.0", features = ["devtools", "protocol-asset"] } +tauri = { version = "2.0.0-rc.2", features = ["devtools", "protocol-asset"] } tauri-plugin-shell = "2.0.0-rc.0" diff --git a/src-web/main.tsx b/src-web/main.tsx index 510c199b..65b5b54e 100644 --- a/src-web/main.tsx +++ b/src-web/main.tsx @@ -3,7 +3,7 @@ import { type } from '@tauri-apps/plugin-os'; import { StrictMode } from 'react'; import { createRoot } from 'react-dom/client'; import { pdfjs } from 'react-pdf'; -import { attachConsole } from 'tauri-plugin-log-api'; +import { attachConsole } from '@tauri-apps/plugin-log'; import { App } from './components/App'; import './main.css'; @@ -13,7 +13,7 @@ pdfjs.GlobalWorkerOptions.workerSrc = new URL( ).toString(); // Hide decorations here because it doesn't work in Rust for some reason (bug?) -const osType = await type(); +const osType = type(); if (osType !== 'macos') { await getCurrentWebviewWindow().setDecorations(false); }