diff --git a/.gitignore b/.gitignore
index 5fefbc2c..78d48e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ yarn-error.log*
.idea/
*.iml
+/lerna-debug.log
diff --git a/app/renderer/package.json b/app/renderer/package.json
index fd72f947..540b3559 100644
--- a/app/renderer/package.json
+++ b/app/renderer/package.json
@@ -33,6 +33,9 @@
},
"dependencies": {
"@pomatez/shareables": "*",
+ "@tauri-apps/api": "2.0.0-alpha.8",
+ "@tauri-apps/plugin-autostart": "^2.0.0-alpha.1",
+ "@tauri-apps/plugin-window": "^2.0.0-alpha.1",
"@types/autosize": "^3.0.7",
"@types/jest": "^26.0.24",
"@types/node": "^14.18.63",
@@ -57,7 +60,6 @@
"redux-devtools-extension": "^2.13.8",
"redux-undo": "^1.0.1",
"styled-components": "^5.3.11",
- "tauri-plugin-autostart-api": "https://github.com/tauri-apps/tauri-plugin-autostart#v1",
"use-stay-awake": "^0.1.5"
},
"devDependencies": {
diff --git a/app/renderer/public/index.html b/app/renderer/public/index.html
index 15e54280..0204f51f 100644
--- a/app/renderer/public/index.html
+++ b/app/renderer/public/index.html
@@ -4,7 +4,7 @@
-
+
Pomatez
diff --git a/app/renderer/src/components/Titlebar.tsx b/app/renderer/src/components/Titlebar.tsx
index 1de3e1b4..e9603a66 100644
--- a/app/renderer/src/components/Titlebar.tsx
+++ b/app/renderer/src/components/Titlebar.tsx
@@ -27,8 +27,9 @@ type Props = {
};
const Titlebar: React.FC = ({ darkMode, timerType }) => {
- const { onMinimizeCallback, onExitCallback } =
- useContext(ConnnectorContext);
+ const { onMinimizeCallback, onExitCallback } = useContext(
+ ConnnectorContext
+ );
const getAppIcon = useCallback(() => {
switch (timerType) {
@@ -44,7 +45,7 @@ const Titlebar: React.FC = ({ darkMode, timerType }) => {
}, [darkMode, timerType]);
return (
-
+
diff --git a/app/renderer/src/contexts/connectors/TauriConnector.tsx b/app/renderer/src/contexts/connectors/TauriConnector.tsx
index 4fe62388..6da66dd9 100644
--- a/app/renderer/src/contexts/connectors/TauriConnector.tsx
+++ b/app/renderer/src/contexts/connectors/TauriConnector.tsx
@@ -17,11 +17,10 @@ import {
} from "@pomatez/shareables";
import { encodeSvg } from "../../utils";
import { TraySVG } from "../../components";
-import { enable, disable } from "tauri-plugin-autostart-api";
+import { enable, disable } from "@tauri-apps/plugin-autostart";
+import { invoke } from "@tauri-apps/api/tauri";
export const TauriConnectorProvider: React.FC = ({ children }) => {
- const { invoke } = window.__TAURI__;
-
const settings: SettingTypes = useSelector(
(state: AppStateTypes) => state.settings
);
@@ -31,12 +30,9 @@ export const TauriConnectorProvider: React.FC = ({ children }) => {
* @param event
* @param payload
*/
- const send = useCallback(
- (event: string, ...payload: any) => {
- invoke(event.toLowerCase(), ...payload);
- },
- [invoke]
- );
+ const send = useCallback(async (event: string, ...payload: any) => {
+ await invoke(event.toLowerCase(), ...payload);
+ }, []);
useEffect(() => {
if (settings.openAtLogin) {
diff --git a/app/renderer/src/extensions/window.extension.ts b/app/renderer/src/extensions/window.extension.ts
index 44fed387..2ea2aaed 100644
--- a/app/renderer/src/extensions/window.extension.ts
+++ b/app/renderer/src/extensions/window.extension.ts
@@ -10,9 +10,6 @@ declare global {
options?: Electron.OpenExternalOptions
) => Promise;
};
- __TAURI__: {
- invoke: (command: string, ...args: any[]) => void;
- };
}
}
diff --git a/app/tauri/Cargo.lock b/app/tauri/Cargo.lock
index eabb3eb8..d72e4954 100644
--- a/app/tauri/Cargo.lock
+++ b/app/tauri/Cargo.lock
@@ -8,15 +8,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "aho-corasick"
version = "1.1.1"
@@ -186,9 +177,9 @@ dependencies = [
[[package]]
name = "atk"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
+checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf"
dependencies = [
"atk-sys",
"bitflags",
@@ -198,14 +189,14 @@ dependencies = [
[[package]]
name = "atk-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
+checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
@@ -216,9 +207,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "auto-launch"
-version = "0.5.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
+checksum = "5904a4d734f0235edf29aab320a14899f3e090446e594ff96508a6215f76f89c"
dependencies = [
"dirs",
"thiserror",
@@ -300,15 +291,6 @@ dependencies = [
"alloc-stdlib",
]
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "bumpalo"
version = "3.11.1"
@@ -338,26 +320,27 @@ dependencies = [
[[package]]
name = "cairo-rs"
-version = "0.15.12"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
+checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
dependencies = [
"bitflags",
"cairo-sys-rs",
"glib",
"libc",
+ "once_cell",
"thiserror",
]
[[package]]
name = "cairo-sys-rs"
-version = "0.15.1"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
@@ -396,15 +379,6 @@ dependencies = [
"uuid",
]
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec",
-]
-
[[package]]
name = "cfg-expr"
version = "0.11.0"
@@ -443,8 +417,24 @@ dependencies = [
"block",
"cocoa-foundation",
"core-foundation",
- "core-graphics",
- "foreign-types",
+ "core-graphics 0.22.3",
+ "foreign-types 0.3.2",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
"libc",
"objc",
]
@@ -459,7 +449,7 @@ dependencies = [
"block",
"core-foundation",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
"objc",
]
@@ -520,7 +510,20 @@ dependencies = [
"bitflags",
"core-foundation",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
"libc",
]
@@ -532,7 +535,7 @@ checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
dependencies = [
"bitflags",
"core-foundation",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
]
@@ -870,18 +873,6 @@ dependencies = [
"rustc_version 0.3.3",
]
-[[package]]
-name = "filetime"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "windows-sys 0.42.0",
-]
-
[[package]]
name = "flate2"
version = "1.0.25"
@@ -904,7 +895,28 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
]
[[package]]
@@ -913,11 +925,17 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
@@ -1030,9 +1048,9 @@ dependencies = [
[[package]]
name = "gdk"
-version = "0.15.4"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
+checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1"
dependencies = [
"bitflags",
"cairo-rs",
@@ -1046,9 +1064,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.15.11"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
@@ -1059,22 +1077,22 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
name = "gdk-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
+checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1084,33 +1102,33 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
name = "gdkwayland-sys"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba"
dependencies = [
"gdk-sys",
"glib-sys",
"gobject-sys",
"libc",
"pkg-config",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
name = "gdkx11-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
+checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af"
dependencies = [
"gdk-sys",
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
"x11",
]
@@ -1161,45 +1179,50 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.15.12"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
+checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-io",
+ "futures-util",
"gio-sys",
"glib",
"libc",
"once_cell",
+ "pin-project-lite",
+ "smallvec",
"thiserror",
]
[[package]]
name = "gio-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
+checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
"winapi",
]
[[package]]
name = "glib"
-version = "0.15.12"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
+checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
+ "futures-util",
+ "gio-sys",
"glib-macros",
"glib-sys",
"gobject-sys",
@@ -1211,12 +1234,12 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.11"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
+checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b"
dependencies = [
"anyhow",
- "heck 0.4.0",
+ "heck",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
@@ -1226,12 +1249,12 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
dependencies = [
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
@@ -1240,35 +1263,22 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-[[package]]
-name = "globset"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
-dependencies = [
- "aho-corasick 0.7.20",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
[[package]]
name = "gobject-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
name = "gtk"
-version = "0.15.5"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
+checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6"
dependencies = [
"atk",
"bitflags",
@@ -1289,9 +1299,9 @@ dependencies = [
[[package]]
name = "gtk-sys"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
+checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3"
dependencies = [
"atk-sys",
"cairo-sys-rs",
@@ -1302,14 +1312,14 @@ dependencies = [
"gobject-sys",
"libc",
"pango-sys",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
name = "gtk3-macros"
-version = "0.15.4"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"
+checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8"
dependencies = [
"anyhow",
"proc-macro-crate",
@@ -1350,15 +1360,6 @@ version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
[[package]]
name = "heck"
version = "0.4.0"
@@ -1386,20 +1387,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-[[package]]
-name = "html5ever"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.10.1",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
[[package]]
name = "html5ever"
version = "0.26.0"
@@ -1408,7 +1395,7 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
dependencies = [
"log",
"mac",
- "markup5ever 0.11.0",
+ "markup5ever",
"proc-macro2",
"quote",
"syn 1.0.107",
@@ -1416,9 +1403,9 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -1436,12 +1423,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
[[package]]
name = "httparse"
version = "1.8.0"
@@ -1478,19 +1459,6 @@ dependencies = [
"want",
]
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
[[package]]
name = "iana-time-zone"
version = "0.1.57"
@@ -1532,32 +1500,14 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
]
-[[package]]
-name = "ignore"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
-dependencies = [
- "crossbeam-utils",
- "globset",
- "lazy_static",
- "log",
- "memchr",
- "regex",
- "same-file",
- "thread_local",
- "walkdir",
- "winapi-util",
-]
-
[[package]]
name = "image"
version = "0.24.5"
@@ -1595,18 +1545,18 @@ dependencies = [
[[package]]
name = "infer"
-version = "0.9.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a"
+checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
dependencies = [
"cfb",
]
[[package]]
name = "infer"
-version = "0.12.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
+checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
dependencies = [
"cfb",
]
@@ -1651,9 +1601,9 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "javascriptcore-rs"
-version = "0.16.0"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
+checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056"
dependencies = [
"bitflags",
"glib",
@@ -1662,28 +1612,30 @@ dependencies = [
[[package]]
name = "javascriptcore-rs-sys"
-version = "0.4.0"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
+checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
[[package]]
name = "jni"
-version = "0.20.0"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
+ "cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -1714,15 +1666,14 @@ dependencies = [
]
[[package]]
-name = "kuchiki"
-version = "0.8.1"
+name = "keyboard-types"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
+checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68"
dependencies = [
- "cssparser",
- "html5ever 0.25.2",
- "matches",
- "selectors",
+ "bitflags",
+ "serde",
+ "unicode-segmentation",
]
[[package]]
@@ -1732,7 +1683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
dependencies = [
"cssparser",
- "html5ever 0.26.0",
+ "html5ever",
"indexmap 1.9.2",
"matches",
"selectors",
@@ -1746,9 +1697,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libappindicator"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8"
+checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f"
dependencies = [
"glib",
"gtk",
@@ -1759,9 +1710,9 @@ dependencies = [
[[package]]
name = "libappindicator-sys"
-version = "0.7.3"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa"
+checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918"
dependencies = [
"gtk-sys",
"libloading",
@@ -1836,19 +1787,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-[[package]]
-name = "mac-notification-sys"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5"
-dependencies = [
- "cc",
- "dirs-next",
- "objc-foundation",
- "objc_id",
- "time",
-]
-
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -1858,20 +1796,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
[[package]]
name = "markup5ever"
version = "0.11.0"
@@ -1953,33 +1877,35 @@ dependencies = [
]
[[package]]
-name = "native-tls"
-version = "0.2.11"
+name = "muda"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "41fe753ec4d3e8137a1d3ecb1aee1192b8f7661fe1247641968f5bf5f2e6ebbe"
dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
+ "cocoa 0.25.0",
+ "crossbeam-channel",
+ "gdk",
+ "gdk-pixbuf",
+ "gtk",
+ "keyboard-types",
+ "objc",
+ "once_cell",
+ "png",
+ "thiserror",
+ "windows-sys 0.48.0",
]
[[package]]
name = "ndk"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags",
"jni-sys",
"ndk-sys",
"num_enum",
+ "raw-window-handle",
"thiserror",
]
@@ -1991,9 +1917,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
-version = "0.3.0"
+version = "0.4.1+23.1.7779620"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
dependencies = [
"jni-sys",
]
@@ -2022,20 +1948,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-[[package]]
-name = "notify-rust"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509"
-dependencies = [
- "mac-notification-sys",
- "serde",
- "tauri-winrt-notification",
- "zbus",
- "zvariant",
- "zvariant_derive",
-]
-
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@@ -2117,17 +2029,6 @@ dependencies = [
"objc_exception",
]
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
[[package]]
name = "objc_exception"
version = "0.1.2"
@@ -2148,125 +2049,50 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
-name = "open"
-version = "3.2.0"
+name = "ordered-stream"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
dependencies = [
- "pathdiff",
- "windows-sys 0.42.0",
+ "futures-core",
+ "pin-project-lite",
]
[[package]]
-name = "openssl"
-version = "0.10.45"
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "pango"
+version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
dependencies = [
"bitflags",
- "cfg-if",
- "foreign-types",
+ "gio",
+ "glib",
"libc",
"once_cell",
- "openssl-macros",
- "openssl-sys",
+ "pango-sys",
]
[[package]]
-name = "openssl-macros"
-version = "0.1.0"
+name = "pango-sys"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "os_info"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
-dependencies = [
- "log",
- "serde",
- "winapi",
-]
-
-[[package]]
-name = "os_pipe"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639"
-dependencies = [
- "libc",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pango"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
-dependencies = [
- "bitflags",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps",
]
[[package]]
@@ -2298,17 +2124,11 @@ dependencies = [
"windows-sys 0.42.0",
]
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pest"
@@ -2498,7 +2318,7 @@ dependencies = [
"tauri",
"tauri-build",
"tauri-plugin-autostart",
- "window-shadows",
+ "tauri-plugin-window",
]
[[package]]
@@ -2563,15 +2383,6 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "quick-xml"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "quote"
version = "1.0.33"
@@ -2697,7 +2508,7 @@ version = "1.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
dependencies = [
- "aho-corasick 1.1.1",
+ "aho-corasick",
"memchr",
"regex-automata 0.3.9",
"regex-syntax 0.7.5",
@@ -2718,7 +2529,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
dependencies = [
- "aho-corasick 1.1.1",
+ "aho-corasick",
"memchr",
"regex-syntax 0.7.5",
]
@@ -2759,12 +2570,10 @@ dependencies = [
"http",
"http-body",
"hyper",
- "hyper-tls",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
@@ -2772,7 +2581,6 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"tokio",
- "tokio-native-tls",
"tokio-util",
"tower-service",
"url",
@@ -2783,30 +2591,6 @@ dependencies = [
"winreg 0.50.0",
]
-[[package]]
-name = "rfd"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
-dependencies = [
- "block",
- "dispatch",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "lazy_static",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.37.0",
-]
-
[[package]]
name = "rustc_version"
version = "0.3.3"
@@ -2866,16 +2650,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "schannel"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
-dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
-]
-
[[package]]
name = "scoped-tls"
version = "1.0.1"
@@ -2888,29 +2662,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "security-framework"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "selectors"
version = "0.22.0"
@@ -2945,9 +2696,6 @@ name = "semver"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
-dependencies = [
- "serde",
-]
[[package]]
name = "semver-parser"
@@ -3113,16 +2861,6 @@ dependencies = [
"lazy_static",
]
-[[package]]
-name = "shared_child"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "signal-hook"
version = "0.3.17"
@@ -3174,31 +2912,31 @@ dependencies = [
]
[[package]]
-name = "soup2"
-version = "0.2.1"
+name = "soup3"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
+checksum = "82bc46048125fefd69d30b32b9d263d6556c9ffe82a7a7df181a86d912da5616"
dependencies = [
"bitflags",
+ "futures-channel",
"gio",
"glib",
"libc",
"once_cell",
- "soup2-sys",
+ "soup3-sys",
]
[[package]]
-name = "soup2-sys"
-version = "0.2.0"
+name = "soup3-sys"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
+checksum = "014bbeb1c4cdb30739dc181e8d98b7908f124d9555843afa89b5570aaf4ec62b"
dependencies = [
- "bitflags",
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
[[package]]
@@ -3209,9 +2947,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "state"
-version = "0.5.3"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
dependencies = [
"loom",
]
@@ -3255,24 +2993,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
-name = "strum"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.22.0"
+name = "swift-rs"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
+checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204"
dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
+ "base64 0.21.4",
+ "serde",
+ "serde_json",
]
[[package]]
@@ -3297,59 +3025,32 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "sys-locale"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
-dependencies = [
- "js-sys",
- "libc",
- "wasm-bindgen",
- "web-sys",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml 0.5.10",
- "version-compare 0.0.11",
-]
-
[[package]]
name = "system-deps"
version = "6.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
dependencies = [
- "cfg-expr 0.11.0",
- "heck 0.4.0",
+ "cfg-expr",
+ "heck",
"pkg-config",
"toml 0.5.10",
- "version-compare 0.1.1",
+ "version-compare",
]
[[package]]
name = "tao"
-version = "0.16.3"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbc1134456b525a0e560ff48b185acb5178621df0dafa96e927826becb5184e"
+checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56"
dependencies = [
"bitflags",
"cairo-rs",
"cc",
- "cocoa",
+ "cocoa 0.24.1",
"core-foundation",
- "core-graphics",
+ "core-graphics 0.22.3",
"crossbeam-channel",
- "dirs-next",
"dispatch",
"gdk",
"gdk-pixbuf",
@@ -3364,7 +3065,6 @@ dependencies = [
"instant",
"jni",
"lazy_static",
- "libappindicator",
"libc",
"log",
"ndk",
@@ -3379,10 +3079,12 @@ dependencies = [
"serde",
"tao-macros",
"unicode-segmentation",
+ "url",
"uuid",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
"x11-dl",
+ "zbus",
]
[[package]]
@@ -3396,88 +3098,72 @@ dependencies = [
"syn 1.0.107",
]
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
[[package]]
name = "tauri"
-version = "1.5.0"
+version = "2.0.0-alpha.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72aee3277d0a0df01472cc704ab5934a51a1f25348838df17bfb3c5cb727880c"
+checksum = "46acc0b6d20fe3a7c27e6036d9ef52d2c28afd1b6178ffc2dd4881f9994fecd7"
dependencies = [
"anyhow",
"bytes",
- "cocoa",
+ "cocoa 0.25.0",
"dirs-next",
"embed_plist",
- "encoding_rs",
- "flate2",
"futures-util",
"glib",
"glob",
"gtk",
- "heck 0.4.0",
+ "heck",
"http",
- "ignore",
- "infer 0.9.0",
- "notify-rust",
+ "infer 0.15.0",
+ "jni",
+ "libc",
+ "log",
+ "mime",
+ "muda",
"objc",
"once_cell",
- "open",
- "os_info",
- "os_pipe",
"percent-encoding",
"png",
"rand 0.8.5",
"raw-window-handle",
- "regex",
"reqwest",
- "rfd",
- "semver 1.0.16",
"serde",
"serde_json",
"serde_repr",
"serialize-to-javascript",
- "shared_child",
"state",
- "sys-locale",
- "tar",
+ "swift-rs",
+ "tauri-build",
"tauri-macros",
"tauri-runtime",
"tauri-runtime-wry",
"tauri-utils",
- "tempfile",
"thiserror",
"tokio",
+ "tray-icon",
"url",
"uuid",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
name = "tauri-build"
-version = "1.5.0"
+version = "2.0.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
+checksum = "dc47d3c84f4aeac397cd956267f3b8060c5a2dba78288a5ccf9a8b7a8c1e7025"
dependencies = [
"anyhow",
"cargo_toml",
- "dirs-next",
- "heck 0.4.0",
+ "heck",
"json-patch",
+ "plist",
"semver 1.0.16",
"serde",
"serde_json",
+ "swift-rs",
"tauri-utils",
"tauri-winres",
"walkdir",
@@ -3485,9 +3171,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
-version = "1.4.1"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
+checksum = "7f98a67c7ef3cb3c25de91fe1fa16cc3681997f6ec99da0a7496d6feae2ea91e"
dependencies = [
"base64 0.21.4",
"brotli",
@@ -3497,7 +3183,6 @@ dependencies = [
"png",
"proc-macro2",
"quote",
- "regex",
"semver 1.0.16",
"serde",
"serde_json",
@@ -3505,17 +3190,18 @@ dependencies = [
"tauri-utils",
"thiserror",
"time",
+ "url",
"uuid",
"walkdir",
]
[[package]]
name = "tauri-macros"
-version = "1.4.1"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af"
+checksum = "b01cb5f945c71e040c5d191c32598565ae26cc266a9d5d4f7dd2dc324c5cfdd0"
dependencies = [
- "heck 0.4.0",
+ "heck",
"proc-macro2",
"quote",
"syn 1.0.107",
@@ -3525,8 +3211,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-autostart"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2"
+version = "2.0.0-alpha.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67ab81fb8a86b98627843c00b6d2f3951d18827a02272feb5830b8ce96d9c59"
dependencies = [
"auto-launch",
"log",
@@ -3536,15 +3223,26 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "tauri-plugin-window"
+version = "2.0.0-alpha.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "646c4d192ac58631b56059b5a3b26b254b42dcae91a455a818a22687bb841c39"
+dependencies = [
+ "serde",
+ "tauri",
+ "thiserror",
+]
+
[[package]]
name = "tauri-runtime"
-version = "0.14.1"
+version = "1.0.0-alpha.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
+checksum = "525c4dea52547a13e58816c655bd0928f6c30026515e7b2a77166bcd984da6d0"
dependencies = [
"gtk",
"http",
- "http-range",
+ "jni",
"rand 0.8.5",
"raw-window-handle",
"serde",
@@ -3553,18 +3251,19 @@ dependencies = [
"thiserror",
"url",
"uuid",
- "webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "0.14.1"
+version = "1.0.0-alpha.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895"
+checksum = "fce46e920b62699045e02db3006017d24324119189dfab2b12261aeebf98f4be"
dependencies = [
- "cocoa",
+ "cocoa 0.24.1",
"gtk",
+ "http",
+ "jni",
"percent-encoding",
"rand 0.8.5",
"raw-window-handle",
@@ -3573,26 +3272,25 @@ dependencies = [
"uuid",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
"wry",
]
[[package]]
name = "tauri-utils"
-version = "1.5.0"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
+checksum = "06bcd7c6f67fd6371dcc22da7d7f26ec12c4eae26ad7bc54943bb9f35b5db302"
dependencies = [
"brotli",
"ctor",
"dunce",
"glob",
- "heck 0.4.0",
- "html5ever 0.26.0",
+ "heck",
+ "html5ever",
"infer 0.12.0",
"json-patch",
"kuchikiki",
- "log",
"memchr",
"phf 0.10.1",
"proc-macro2",
@@ -3604,7 +3302,7 @@ dependencies = [
"thiserror",
"url",
"walkdir",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
@@ -3617,17 +3315,6 @@ dependencies = [
"toml 0.7.8",
]
-[[package]]
-name = "tauri-winrt-notification"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b"
-dependencies = [
- "quick-xml",
- "strum",
- "windows 0.39.0",
-]
-
[[package]]
name = "tempfile"
version = "3.3.0"
@@ -3747,16 +3434,6 @@ dependencies = [
"windows-sys 0.42.0",
]
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
[[package]]
name = "tokio-util"
version = "0.7.8"
@@ -3882,6 +3559,25 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tray-icon"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447"
+dependencies = [
+ "cocoa 0.25.0",
+ "core-graphics 0.23.1",
+ "crossbeam-channel",
+ "dirs-next",
+ "libappindicator",
+ "muda",
+ "objc",
+ "once_cell",
+ "png",
+ "thiserror",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "treediff"
version = "4.0.2"
@@ -3921,9 +3617,9 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
@@ -3948,9 +3644,9 @@ checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
dependencies = [
"form_urlencoded",
"idna",
@@ -3966,9 +3662,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "uuid"
-version = "1.2.2"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"getrandom 0.2.8",
]
@@ -3979,18 +3675,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
[[package]]
name = "version-compare"
version = "0.1.1"
@@ -4152,9 +3836,9 @@ dependencies = [
[[package]]
name = "webkit2gtk"
-version = "0.18.2"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
+checksum = "6f8db2963d7f1bd4ac2a208ab925881b4779dd20fee853b09a0bbf69289827c2"
dependencies = [
"bitflags",
"cairo-rs",
@@ -4170,20 +3854,18 @@ dependencies = [
"javascriptcore-rs",
"libc",
"once_cell",
- "soup2",
+ "soup3",
"webkit2gtk-sys",
]
[[package]]
name = "webkit2gtk-sys"
-version = "0.18.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
+checksum = "864ebc9a39649baf49e46c713cd8b741cca14dd59d24cd77bc611ba9419fa18d"
dependencies = [
- "atk-sys",
"bitflags",
"cairo-sys-rs",
- "gdk-pixbuf-sys",
"gdk-sys",
"gio-sys",
"glib-sys",
@@ -4191,46 +3873,46 @@ dependencies = [
"gtk-sys",
"javascriptcore-rs-sys",
"libc",
- "pango-sys",
"pkg-config",
- "soup2-sys",
- "system-deps 6.0.3",
+ "soup3-sys",
+ "system-deps",
]
[[package]]
name = "webview2-com"
-version = "0.19.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
+checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad"
dependencies = [
"webview2-com-macros",
"webview2-com-sys",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
+ "windows-interface",
]
[[package]]
name = "webview2-com-macros"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
+checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.107",
+ "syn 2.0.37",
]
[[package]]
name = "webview2-com-sys"
-version = "0.19.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
+checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5"
dependencies = [
"regex",
"serde",
"serde_json",
"thiserror",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-bindgen",
"windows-metadata",
]
@@ -4266,38 +3948,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "window-shadows"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d30320647cfc3dc45554c8ad825b84831def81f967a2f7589931328ff9b16d"
-dependencies = [
- "cocoa",
- "objc",
- "raw-window-handle",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
[[package]]
name = "windows"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
dependencies = [
- "windows-implement",
"windows_aarch64_msvc 0.39.0",
"windows_i686_gnu 0.39.0",
"windows_i686_msvc 0.39.0",
@@ -4311,14 +3967,16 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
+ "windows-implement",
+ "windows-interface",
"windows-targets 0.48.5",
]
[[package]]
name = "windows-bindgen"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
+checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6"
dependencies = [
"windows-metadata",
"windows-tokens",
@@ -4326,32 +3984,31 @@ dependencies = [
[[package]]
name = "windows-implement"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
dependencies = [
+ "proc-macro2",
+ "quote",
"syn 1.0.107",
- "windows-tokens",
]
[[package]]
-name = "windows-metadata"
-version = "0.39.0"
+name = "windows-interface"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
[[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows-metadata"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
+checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d"
[[package]]
name = "windows-sys"
@@ -4418,9 +4075,9 @@ dependencies = [
[[package]]
name = "windows-tokens"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
+checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4"
[[package]]
name = "windows_aarch64_gnullvm"
@@ -4434,18 +4091,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.39.0"
@@ -4464,18 +4109,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
[[package]]
name = "windows_i686_gnu"
version = "0.39.0"
@@ -4494,18 +4127,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
[[package]]
name = "windows_i686_msvc"
version = "0.39.0"
@@ -4524,18 +4145,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.39.0"
@@ -4566,18 +4175,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.39.0"
@@ -4636,23 +4233,24 @@ dependencies = [
[[package]]
name = "wry"
-version = "0.24.4"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e"
+checksum = "bf906b43b8042615c85a978dceb4d4b72214d27b850b54abc3edeb7c5a67abab"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.4",
"block",
- "cocoa",
- "core-graphics",
+ "cocoa 0.24.1",
+ "core-graphics 0.22.3",
"crossbeam-channel",
"dunce",
"gdk",
"gio",
"glib",
"gtk",
- "html5ever 0.25.2",
+ "html5ever",
"http",
- "kuchiki",
+ "javascriptcore-rs",
+ "kuchikiki",
"libc",
"log",
"objc",
@@ -4661,14 +4259,14 @@ dependencies = [
"serde",
"serde_json",
"sha2",
- "soup2",
+ "soup3",
"tao",
"thiserror",
"url",
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
]
@@ -4684,24 +4282,15 @@ dependencies = [
[[package]]
name = "x11-dl"
-version = "2.20.1"
+version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
dependencies = [
- "lazy_static",
"libc",
+ "once_cell",
"pkg-config",
]
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "xdg-home"
version = "1.0.0"
diff --git a/app/tauri/Cargo.toml b/app/tauri/Cargo.toml
index 8e48a203..1a5bea2f 100644
--- a/app/tauri/Cargo.toml
+++ b/app/tauri/Cargo.toml
@@ -14,14 +14,14 @@ rust-version = "1.57"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
-tauri-build = { version = "1.4.0", features = [] }
+tauri-build = { version = "2.0.0-alpha.8", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.4.1", features = [ "system-tray", "api-all", "icon-png"] }
-tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-window-shadows = "0.2.1"
+tauri = { version = "2.0.0-alpha.14", features = ["tray-icon", "icon-png"] }
+tauri-plugin-window = "2.0.0-alpha"
+tauri-plugin-autostart = "2.0.0-alpha"
base64 = { version = "0.21.4", features = [] }
[features]
diff --git a/app/tauri/src/commands.rs b/app/tauri/src/commands.rs
index 55d23a9a..102e9196 100644
--- a/app/tauri/src/commands.rs
+++ b/app/tauri/src/commands.rs
@@ -4,11 +4,11 @@
use std::sync::Mutex;
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
use tauri::{Builder, Icon, PhysicalSize, Runtime, Wry};
-#[cfg(any(target_os = "macos", target_os = "windows"))]
-use window_shadows::set_shadow;
-use tauri::{CustomMenuItem, SystemTrayMenu, SystemTrayMenuItem, SystemTrayEvent};
+use tauri::{
+ menu::{MenuBuilder, MenuItemBuilder},
+ tray::{ClickType, TrayIconBuilder},
+};
-use tauri::SystemTray;
use tauri::Manager;
use base64;
use base64::Engine;
@@ -159,11 +159,7 @@ fn set_native_titlebar(use_native_titlebar: bool, window: tauri::Win
Ok(_) => (),
Err(e) => println!("There was a problem setting the window decorations! {:?}", e),
}
- #[cfg(not(target_os = "linux"))]
- match set_shadow(&window, true) {
- Ok(_) => (),
- Err(e) => println!("There was a problem setting the window shadows! {:?}", e),
- }
+ window.start_dragging();
println!("set_native_titlebar! {}", use_native_titlebar);
}
@@ -181,7 +177,13 @@ fn tray_icon_update(data_url: String, window: tauri::Window) {
};
let icon: Icon = Icon::Raw(decoded_vec);
- let _ = window.app_handle().tray_handle().set_icon(icon);
+ let tray = window.app_handle().tray();
+
+ if let Some(tray) = tray {
+ if let Err(e) = tray.set_icon(Some(icon)) {
+ eprintln!("Error setting tray icon: {}", e);
+ }
+ }
}
/**
@@ -205,21 +207,17 @@ impl PomatezExtras for Builder {
fn set_pomatez_system_tray(self) -> tauri::Builder {
println!("Setting system tray");
- let show = CustomMenuItem::new("show".to_string(), "Show");
- let quit = CustomMenuItem::new("quit".to_string(), "Quit");
- let tray_menu = SystemTrayMenu::new()
- .add_item(show)
- .add_native_item(SystemTrayMenuItem::Separator)
- .add_item(quit);
- let tray = SystemTray::new().with_menu(tray_menu);
- self.system_tray(tray).on_system_tray_event(|app, event| match event {
- SystemTrayEvent::LeftClick { .. } => {
- let window = app.get_window("main").unwrap();
- window.show().unwrap();
- window.set_focus().unwrap();
- }
- SystemTrayEvent::MenuItemClick { id, .. } => {
- match id.as_str() {
+ self.setup(|app| {
+ // Was defined in tauri.config.json to start in v1
+ // That was created with an id of 1 though this gives more control
+
+ let show = MenuItemBuilder::with_id("show", "Show").build(app);
+ let quit = MenuItemBuilder::with_id("quit", "Quit").build(app);
+ let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
+ let tray = TrayIconBuilder::new()
+ .menu(&menu)
+ .tooltip("Pomatez")
+ .on_menu_event(move |app, event| match event.id().as_ref() {
"show" => {
let window = app.get_window("main").unwrap();
window.show().unwrap();
@@ -229,9 +227,18 @@ impl PomatezExtras for Builder {
app.exit(0);
}
_ => {}
- }
- }
- _ => {}
+ })
+ .on_tray_event(|tray, event| {
+ if event.click_type == ClickType::Left {
+ let app = tray.app_handle();
+ let window = app.get_window("main").unwrap();
+ window.show().unwrap();
+ window.set_focus().unwrap();
+ }
+ })
+ .icon(Icon::File("./icons/icon.png".into()))
+ .build(app)?;
+ Ok(())
})
}
}
diff --git a/app/tauri/src/main.rs b/app/tauri/src/main.rs
index 3e47075e..e9e42b9b 100644
--- a/app/tauri/src/main.rs
+++ b/app/tauri/src/main.rs
@@ -4,6 +4,7 @@ windows_subsystem = "windows"
)]
use tauri_plugin_autostart::MacosLauncher;
+use tauri_plugin_window;
#[macro_use]
mod commands;
@@ -13,7 +14,9 @@ use commands::PomatezExtras;
fn main() {
tauri::Builder::default()
.plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None))
+ .plugin(tauri_plugin_window::init())
+ .register_pomatez_commands()
.set_pomatez_system_tray()
- .register_pomatez_commands().run(tauri::generate_context!())
+ .run(tauri::generate_context!())
.expect("error while running tauri application");
}
diff --git a/app/tauri/tauri.conf.json b/app/tauri/tauri.conf.json
index e5fd3915..b090dca0 100644
--- a/app/tauri/tauri.conf.json
+++ b/app/tauri/tauri.conf.json
@@ -1,30 +1,21 @@
{
"build": {
- "beforeDevCommand": "yarn dev:tauri",
"beforeBuildCommand": "yarn run tauri:updateversion && yarn build",
- "withGlobalTauri": true,
+ "beforeDevCommand": "yarn dev:tauri",
"devPath": "http://localhost:3000",
- "distDir": "../renderer/build"
+ "distDir": "../renderer/build",
+ "withGlobalTauri": true
},
"package": {
"productName": "Pomatez",
"version": "1.3.0"
},
+ "plugins": {},
"tauri": {
- "allowlist": {
- "all": true
- },
- "systemTray": {
- "iconPath": "icons/icon.png",
- "iconAsTemplate": true
- },
"bundle": {
"active": true,
- "publisher": "Roldan Montilla Jr",
- "shortDescription": "Attractive pomodoro timer for Windows, Mac, and Linux.",
"category": "Productivity",
- "targets": ["all"],
- "copyright": "",
+ "copyright": "Copyright © 2020 Roldan Montilla Jr",
"deb": {
"depends": []
},
@@ -45,6 +36,7 @@
"providerShortName": null,
"signingIdentity": null
},
+ "publisher": "Roldan Montilla Jr",
"resources": [],
"shortDescription": "",
"targets": "all",
@@ -53,18 +45,15 @@
"digestAlgorithm": "sha256",
"timestampUrl": "",
"wix": {
- "license": "../../LICENSE",
"bannerPath": "./installer/banner.bmp",
- "dialogImagePath": "./installer/dialog.bmp"
+ "dialogImagePath": "./installer/dialog.bmp",
+ "license": "../../LICENSE"
}
}
},
"security": {
"csp": null
},
- "updater": {
- "active": false
- },
"windows": [
{
"fullscreen": false,
diff --git a/package.json b/package.json
index 922c7d63..f3ead324 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
]
},
"devDependencies": {
+ "@tauri-apps/cli": "^2.0.0-alpha.14",
"commitizen": "^4.1.2",
"copyfiles": "2.4.1",
"cross-env": "^7.0.3",
@@ -58,11 +59,13 @@
"rollup": "^2.79.1",
"rollup-plugin-typescript2": "^0.27.3",
"typescript": "4.9.4",
- "wait-on": "7.0.1",
- "@tauri-apps/cli": "1.4.0"
+ "wait-on": "7.0.1"
},
"resolutions": {
"//": "Check https://github.com/facebook/create-react-app/issues/11773 to see if it has been fixed yet",
"react-error-overlay": "6.0.9"
+ },
+ "dependencies": {
+ "@tauri-apps/api": "^2.0.0-alpha.8"
}
}
diff --git a/yarn.lock b/yarn.lock
index 8b83d0d8..ef02c628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3649,76 +3649,95 @@
dependencies:
defer-to-connect "^1.0.1"
-"@tauri-apps/api@1.5.0":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.5.0.tgz#46a0f9b6edd4bfc39be32afc4ad242e0b8cca3ea"
- integrity sha512-yQY9wpVNuiYhLLuyDlu1nBpqJELT1fGp7OctN4rW9I2W1T2p7A3tqPxsEzQprEwneQRBAlPM9vC8NsnMbct+pg==
-
-"@tauri-apps/cli-darwin-arm64@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.4.0.tgz#e76bb8515ae31f03f2cbd440c1a09b237a79b3ac"
- integrity sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==
-
-"@tauri-apps/cli-darwin-x64@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.4.0.tgz#dd1472460550d0aa0ec6e699b073be2d77e5b962"
- integrity sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==
-
-"@tauri-apps/cli-linux-arm-gnueabihf@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.4.0.tgz#325e90e47d260ba71a499850ce769b5a6bdfd48d"
- integrity sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==
-
-"@tauri-apps/cli-linux-arm64-gnu@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.4.0.tgz#b5d8f5cba3f8f7c7d44d071681f0ab0a37f2c46e"
- integrity sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==
-
-"@tauri-apps/cli-linux-arm64-musl@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.4.0.tgz#f805ab2ee415875900f4b456f17dc4900d2a7911"
- integrity sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==
-
-"@tauri-apps/cli-linux-x64-gnu@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.4.0.tgz#d3f5e69c22420c7ac9e4021b7a94bce2e48cb45d"
- integrity sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==
-
-"@tauri-apps/cli-linux-x64-musl@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.4.0.tgz#2e7f718272ffdd9ace80f57a35023ba0c74767ad"
- integrity sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==
-
-"@tauri-apps/cli-win32-arm64-msvc@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.4.0.tgz#85cdb52a06feb92da785def4d02512099464525e"
- integrity sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==
-
-"@tauri-apps/cli-win32-ia32-msvc@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.4.0.tgz#0b7c921204058215aec9a5a00f735e73909bd330"
- integrity sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==
-
-"@tauri-apps/cli-win32-x64-msvc@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.4.0.tgz#23abe3f08c0df89111c29602f91c21a23577b908"
- integrity sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==
-
-"@tauri-apps/cli@1.4.0":
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.4.0.tgz#72732ae61e6b7d097e44a8a2ef5f211b2d01d98b"
- integrity sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==
+"@tauri-apps/api@2.0.0-alpha.6":
+ version "2.0.0-alpha.6"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-alpha.6.tgz#16b94359e5c8266ed2b774b4f2e1339c594c4cb4"
+ integrity sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==
+
+"@tauri-apps/api@2.0.0-alpha.8", "@tauri-apps/api@^2.0.0-alpha.8":
+ version "2.0.0-alpha.8"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-alpha.8.tgz#8caecf6e514ab2090f207e466aef9fec6fa0ed0b"
+ integrity sha512-3hZ+7EzUA11KN+O/Y4KgmjR+ldhXLdNllkw//hv/AaNsktEopCRBuKfVRLzVK3yov+Z+GzgxqFlwgJ1v6g1iKw==
+
+"@tauri-apps/cli-darwin-arm64@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-alpha.14.tgz#1f27250f5659d0b058be36837c7e95afc721dc2f"
+ integrity sha512-3K416rvSUt8el/fdPnSnHJOI2j5Os9Kyy17XZp+z3PKRRuo/iJPp9L3w0zFGYsh7C+ylzV4OBUSVTi+e+gO5qA==
+
+"@tauri-apps/cli-darwin-x64@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-alpha.14.tgz#446f87b8629756cd68985ba368e0df0da1dfd7a3"
+ integrity sha512-aLEUGG8Z0UpTENe4/UG6DU8bnB2e1uxyxYvcmFKrHv+EAtR9nLH14alBxPl2K54YXy3JLR4bKROW15a/sFrX9g==
+
+"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-alpha.14.tgz#3212d346a519f8ba0ab9370f5fbf449275c18368"
+ integrity sha512-Lu7unNvurBccxfHIaUQ0gPgUioTkQBMtWGrqO/auZ/JbjPR1W2eBlRwVNXf+nBWX9HwomPR3YD5yZuZmzxRV2g==
+
+"@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-alpha.14.tgz#577e9d66b23250f14792c5e25a732aad02290319"
+ integrity sha512-g8HkwKvAsWLLMJzPup7B1BCilYmXKwXdee7sf8QFbaIUSccR8i5pXLK5N/quKw5lmldYgFveEyuW9Qs8RgTYnQ==
+
+"@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-alpha.14.tgz#72c24b8de5ab37ea6c0060be8965d48856c018de"
+ integrity sha512-ag4UuX6zg7vmBFWmg9ChyiJI7GTMkc8tjr/qobd3Lg9ddmjnVWwLUHt6v1kYhXiU7iLPD5DYDIjU8x/POc3hSA==
+
+"@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-alpha.14.tgz#d9abbd46b689751162ff8f2aca3c213bf24d3028"
+ integrity sha512-+CviROc4fzrGqqyHQXh3uc2dGr/oYr19I8r2k+LJ2CDfmtj7CbNd/oC5oehHbHdw1oGFKuDPudrTGvzdRNygYA==
+
+"@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-alpha.14.tgz#6dfc09a7c335d019db08f28637b51bb3f67f7cfb"
+ integrity sha512-aCP51HOAQXgVhyPHXKy627bYVRkNnpCvSU3L03pYV8YDoGo+veeuek5UiW7PlNdwx52B/yC3Jz7Dr3gEbFimfQ==
+
+"@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-alpha.14.tgz#9154b1340bb04967347e96fdba618697b427b537"
+ integrity sha512-b6Ei5ERUF0KS1bttM7i6U62GmjIvlgK03XZqvL/KLNvUfqRMu8F7JA1ejSExgTxhEhKSWA768HiTXpXk2GjFFw==
+
+"@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-alpha.14.tgz#e80318d4a495575e80fb77fc62babd9867e15523"
+ integrity sha512-TDkvu5pd37bKxZ6N+BqngCNGcefY7aHxyJ3BdBGxF+wRMjEMh70mgEXk8i0uM/aUi/Kl1GQoO6xJfUDlIMPXOA==
+
+"@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-alpha.14.tgz#eef8d38a0cc39c9b8c23bd9e8c16c290fb441f2a"
+ integrity sha512-9yfoEe2RSykKr5hCifVAL5o0gHXgRCS+Wo+RJjQ9L2+QHY7XPLZYAhj/h8jdcAdRveyIQwat3k7wl+SW87v1eg==
+
+"@tauri-apps/cli@^2.0.0-alpha.14":
+ version "2.0.0-alpha.14"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-alpha.14.tgz#f4b0b83fccdc3f70b75d3779e3fd6b93b971af60"
+ integrity sha512-4/IQwN5S94D6LTXQrDWbSea0pGb9TTC4BwxHUFmhep4NjFxms161v1zadAUIsq/N2x6WwCBGrsdq9SIkgKv49Q==
optionalDependencies:
- "@tauri-apps/cli-darwin-arm64" "1.4.0"
- "@tauri-apps/cli-darwin-x64" "1.4.0"
- "@tauri-apps/cli-linux-arm-gnueabihf" "1.4.0"
- "@tauri-apps/cli-linux-arm64-gnu" "1.4.0"
- "@tauri-apps/cli-linux-arm64-musl" "1.4.0"
- "@tauri-apps/cli-linux-x64-gnu" "1.4.0"
- "@tauri-apps/cli-linux-x64-musl" "1.4.0"
- "@tauri-apps/cli-win32-arm64-msvc" "1.4.0"
- "@tauri-apps/cli-win32-ia32-msvc" "1.4.0"
- "@tauri-apps/cli-win32-x64-msvc" "1.4.0"
+ "@tauri-apps/cli-darwin-arm64" "2.0.0-alpha.14"
+ "@tauri-apps/cli-darwin-x64" "2.0.0-alpha.14"
+ "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-alpha.14"
+ "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-alpha.14"
+ "@tauri-apps/cli-linux-arm64-musl" "2.0.0-alpha.14"
+ "@tauri-apps/cli-linux-x64-gnu" "2.0.0-alpha.14"
+ "@tauri-apps/cli-linux-x64-musl" "2.0.0-alpha.14"
+ "@tauri-apps/cli-win32-arm64-msvc" "2.0.0-alpha.14"
+ "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-alpha.14"
+ "@tauri-apps/cli-win32-x64-msvc" "2.0.0-alpha.14"
+
+"@tauri-apps/plugin-autostart@^2.0.0-alpha.1":
+ version "2.0.0-alpha.1"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-autostart/-/plugin-autostart-2.0.0-alpha.1.tgz#4617d0a1aeb3b620e156e2ec010865de2bb947ec"
+ integrity sha512-xs72S8KCYzt9puML4vrmPvg2/wpUuRg4NMEp+12A7XwCP4mQ9js0fFPKSma770TVeJGpzhdJFvDTdWgrVyhYng==
+ dependencies:
+ "@tauri-apps/api" "2.0.0-alpha.6"
+
+"@tauri-apps/plugin-window@^2.0.0-alpha.1":
+ version "2.0.0-alpha.1"
+ resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-window/-/plugin-window-2.0.0-alpha.1.tgz#28a0217100fc5a34fb2a6d76103ba056b2348286"
+ integrity sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==
+ dependencies:
+ "@tauri-apps/api" "2.0.0-alpha.6"
"@tootallnate/once@1":
version "1.1.2"
@@ -14892,10 +14911,10 @@ react-dom@^16.14.0:
prop-types "^15.6.2"
scheduler "^0.19.1"
-react-error-overlay@6.0.9, react-error-overlay@^6.0.11:
- version "6.0.9"
- resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
- integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
+react-error-overlay@^6.0.11:
+ version "6.0.11"
+ resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
+ integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.6:
version "16.13.1"
@@ -16846,12 +16865,6 @@ tar@^6.1.2:
mkdirp "^1.0.3"
yallist "^4.0.0"
-"tauri-plugin-autostart-api@https://github.com/tauri-apps/tauri-plugin-autostart#v1":
- version "0.0.0"
- resolved "https://github.com/tauri-apps/tauri-plugin-autostart#ddb8917170309ce52fb9d433f58570b5caf6b27a"
- dependencies:
- "@tauri-apps/api" "1.5.0"
-
temp-dir@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"