diff --git a/desktop/angular/package-lock.json b/desktop/angular/package-lock.json index 6709037c..b8527c1d 100644 --- a/desktop/angular/package-lock.json +++ b/desktop/angular/package-lock.json @@ -23,13 +23,13 @@ "@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0", "@fortawesome/free-solid-svg-icons": "^6.4.0", - "@tauri-apps/api": ">=2.0.0-beta.0", - "@tauri-apps/plugin-cli": ">=2.0.0-beta.0", - "@tauri-apps/plugin-clipboard-manager": ">=2.0.0-beta.0", - "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0", - "@tauri-apps/plugin-notification": ">=2.0.0-beta.0", - "@tauri-apps/plugin-os": ">=2.0.0-beta.0", - "@tauri-apps/plugin-shell": "^2.0.0-beta", + "@tauri-apps/api": ">=2.0.0-rc.1", + "@tauri-apps/plugin-cli": ">=2.0.0-rc.1", + "@tauri-apps/plugin-clipboard-manager": ">=2.0.0-rc.1", + "@tauri-apps/plugin-dialog": ">=2.0.0-rc.1", + "@tauri-apps/plugin-notification": ">=2.0.0-rc.1", + "@tauri-apps/plugin-os": ">=2.0.0-rc.1", + "@tauri-apps/plugin-shell": "^2.0.0-rc", "autoprefixer": "^10.4.14", "d3": "^7.8.4", "data-urls": "^5.0.0", @@ -4406,77 +4406,67 @@ "peer": true }, "node_modules/@tauri-apps/api": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-beta.4.tgz", - "integrity": "sha512-Nxtj28NYUo5iwYkpYslxmOPkdI2WkELU2e3UH9nbJm9Ydki2CQwJVGQxx4EANtdZcMNsEsUzRqaDTvEUYH1l6w==", - "engines": { - "node": ">= 18", - "npm": ">= 6.6.0", - "yarn": ">= 1.19.1" - }, + "version": "2.0.0-rc.4", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-rc.4.tgz", + "integrity": "sha512-UNiIhhKG08j4ooss2oEEVexffmWkgkYlC2M3GcX3VPtNsqFgVNL8Mcw/4Y7rO9M9S+ffAMnLOF5ypzyuyb8tyg==", + "license": "Apache-2.0 OR MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/tauri" } }, "node_modules/@tauri-apps/plugin-cli": { - "version": "2.0.0-beta.1", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-cli/-/plugin-cli-2.0.0-rc.1.tgz", + "integrity": "sha512-EcSTRfEU3zzlNbgwVtZVzqB19z3PNjyXD9H+YXuuLpV+Hwuh6Oi1fhUdCI0mp5zr9HSMWE+HzHkpBI7sVP1RyA==", "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.2" - } - }, - "node_modules/@tauri-apps/plugin-cli/node_modules/@tauri-apps/api": { - "version": "2.0.0-beta.2", - "license": "Apache-2.0 OR MIT", - "engines": { - "node": ">= 18", - "npm": ">= 6.6.0", - "yarn": ">= 1.19.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/tauri" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tauri-apps/plugin-clipboard-manager": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-clipboard-manager/-/plugin-clipboard-manager-2.0.0-beta.2.tgz", - "integrity": "sha512-yue7KTO9r9rlpgjcyRB9xcMyZKTrGOP2bWQnL/EoyVkECsr+8e8W8UMlvajXjv1hinFoiycXJe6GaSTPGO0Jlg==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-clipboard-manager/-/plugin-clipboard-manager-2.0.0-rc.1.tgz", + "integrity": "sha512-hFgUABMmQuVGKwHb8PR9fuqfk0WRkedbWUt/ZV5sL4Q6kLrsp3JYJvtzVPeMYdeBvMqHl8WXNxAc/zwSld2h9w==", + "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tauri-apps/plugin-dialog": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0-beta.2.tgz", - "integrity": "sha512-WugTn/8d5jYA0GL1JRIJgA1OSxG0h2V4PSZZzehgA3v7rPlIU6w9s2+dSRqj55aMj6hm3Az9YbQqC18nuaHkpw==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0-rc.1.tgz", + "integrity": "sha512-H28gh6BfZtjflHQ+HrmWwunDriBI3AQLAKnMs50GA6zeNUULqbQr7VXbAAKeJL/0CmWcecID4PKXVoSlaWRhEg==", + "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tauri-apps/plugin-notification": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.0.0-beta.2.tgz", - "integrity": "sha512-OxMuKawWkXGR04hALFrPhRXhA3vGRyMy+kRT3vdHoAwngZHcBGetRqm6CuW0tSNWCgwuUYXpN57636CfUReg5g==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.0.0-rc.1.tgz", + "integrity": "sha512-ddDj7xM8XR7Zv2vdpofNXlLjcp49p/VjlL0D+/eBcMuyooaLNMor3jz/+H6s23iHerdxMWA50mzy26BRN1BySA==", + "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tauri-apps/plugin-os": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0-beta.2.tgz", - "integrity": "sha512-rhJ/sEYvEAeMUQt6UiFODi5dT6F/ciNZYBQrbFTwhIqwQ2fp87dmzsscMy7FQ9LOor8AW+kL1KWoadfgzA/mSA==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0-rc.1.tgz", + "integrity": "sha512-PV8zlSTmYfiN2xzILUmlDSEycS7UYbH2yXk/ZqF+qQU6/s+OVQvmSth4EhllFjcpvPbtqELvpzfjw+2qEouchA==", + "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tauri-apps/plugin-shell": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0-beta.2.tgz", - "integrity": "sha512-9rWsfN7Wt+EuWmpmNnK8bCs+04fzhEYrHtWyLIAYxb9diFdcJrEoctCP9YM2v+Uf8/y8qFC7VCbZ/9VQHANymQ==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0-rc.1.tgz", + "integrity": "sha512-JtNROc0rqEwN/g93ig5pK4cl1vUo2yn+osCpY9de64cy/d9hRzof7AuYOgvt/Xcd5VPQmlgo2AGvUh5sQRSR1A==", + "license": "MIT or APACHE-2.0", "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "node_modules/@tootallnate/once": { @@ -21077,59 +21067,56 @@ "peer": true }, "@tauri-apps/api": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-beta.4.tgz", - "integrity": "sha512-Nxtj28NYUo5iwYkpYslxmOPkdI2WkELU2e3UH9nbJm9Ydki2CQwJVGQxx4EANtdZcMNsEsUzRqaDTvEUYH1l6w==" + "version": "2.0.0-rc.4", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-rc.4.tgz", + "integrity": "sha512-UNiIhhKG08j4ooss2oEEVexffmWkgkYlC2M3GcX3VPtNsqFgVNL8Mcw/4Y7rO9M9S+ffAMnLOF5ypzyuyb8tyg==" }, "@tauri-apps/plugin-cli": { - "version": "2.0.0-beta.1", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-cli/-/plugin-cli-2.0.0-rc.1.tgz", + "integrity": "sha512-EcSTRfEU3zzlNbgwVtZVzqB19z3PNjyXD9H+YXuuLpV+Hwuh6Oi1fhUdCI0mp5zr9HSMWE+HzHkpBI7sVP1RyA==", "requires": { - "@tauri-apps/api": "2.0.0-beta.2" - }, - "dependencies": { - "@tauri-apps/api": { - "version": "2.0.0-beta.2" - } + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tauri-apps/plugin-clipboard-manager": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-clipboard-manager/-/plugin-clipboard-manager-2.0.0-beta.2.tgz", - "integrity": "sha512-yue7KTO9r9rlpgjcyRB9xcMyZKTrGOP2bWQnL/EoyVkECsr+8e8W8UMlvajXjv1hinFoiycXJe6GaSTPGO0Jlg==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-clipboard-manager/-/plugin-clipboard-manager-2.0.0-rc.1.tgz", + "integrity": "sha512-hFgUABMmQuVGKwHb8PR9fuqfk0WRkedbWUt/ZV5sL4Q6kLrsp3JYJvtzVPeMYdeBvMqHl8WXNxAc/zwSld2h9w==", "requires": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tauri-apps/plugin-dialog": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0-beta.2.tgz", - "integrity": "sha512-WugTn/8d5jYA0GL1JRIJgA1OSxG0h2V4PSZZzehgA3v7rPlIU6w9s2+dSRqj55aMj6hm3Az9YbQqC18nuaHkpw==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0-rc.1.tgz", + "integrity": "sha512-H28gh6BfZtjflHQ+HrmWwunDriBI3AQLAKnMs50GA6zeNUULqbQr7VXbAAKeJL/0CmWcecID4PKXVoSlaWRhEg==", "requires": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tauri-apps/plugin-notification": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.0.0-beta.2.tgz", - "integrity": "sha512-OxMuKawWkXGR04hALFrPhRXhA3vGRyMy+kRT3vdHoAwngZHcBGetRqm6CuW0tSNWCgwuUYXpN57636CfUReg5g==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.0.0-rc.1.tgz", + "integrity": "sha512-ddDj7xM8XR7Zv2vdpofNXlLjcp49p/VjlL0D+/eBcMuyooaLNMor3jz/+H6s23iHerdxMWA50mzy26BRN1BySA==", "requires": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tauri-apps/plugin-os": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0-beta.2.tgz", - "integrity": "sha512-rhJ/sEYvEAeMUQt6UiFODi5dT6F/ciNZYBQrbFTwhIqwQ2fp87dmzsscMy7FQ9LOor8AW+kL1KWoadfgzA/mSA==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0-rc.1.tgz", + "integrity": "sha512-PV8zlSTmYfiN2xzILUmlDSEycS7UYbH2yXk/ZqF+qQU6/s+OVQvmSth4EhllFjcpvPbtqELvpzfjw+2qEouchA==", "requires": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tauri-apps/plugin-shell": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0-beta.2.tgz", - "integrity": "sha512-9rWsfN7Wt+EuWmpmNnK8bCs+04fzhEYrHtWyLIAYxb9diFdcJrEoctCP9YM2v+Uf8/y8qFC7VCbZ/9VQHANymQ==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0-rc.1.tgz", + "integrity": "sha512-JtNROc0rqEwN/g93ig5pK4cl1vUo2yn+osCpY9de64cy/d9hRzof7AuYOgvt/Xcd5VPQmlgo2AGvUh5sQRSR1A==", "requires": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "^2.0.0-rc.4" } }, "@tootallnate/once": { diff --git a/desktop/angular/package.json b/desktop/angular/package.json index f54fdfa7..5e916e51 100644 --- a/desktop/angular/package.json +++ b/desktop/angular/package.json @@ -37,13 +37,13 @@ "@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0", "@fortawesome/free-solid-svg-icons": "^6.4.0", - "@tauri-apps/api": ">=2.0.0-beta.0", - "@tauri-apps/plugin-cli": ">=2.0.0-beta.0", - "@tauri-apps/plugin-clipboard-manager": ">=2.0.0-beta.0", - "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0", - "@tauri-apps/plugin-notification": ">=2.0.0-beta.0", - "@tauri-apps/plugin-os": ">=2.0.0-beta.0", - "@tauri-apps/plugin-shell": "^2.0.0-beta", + "@tauri-apps/api": ">=2.0.0-rc.1", + "@tauri-apps/plugin-cli": ">=2.0.0-rc.1", + "@tauri-apps/plugin-clipboard-manager": ">=2.0.0-rc.1", + "@tauri-apps/plugin-dialog": ">=2.0.0-rc.1", + "@tauri-apps/plugin-notification": ">=2.0.0-rc.1", + "@tauri-apps/plugin-os": ">=2.0.0-rc.1", + "@tauri-apps/plugin-shell": "^2.0.0-rc", "autoprefixer": "^10.4.14", "d3": "^7.8.4", "data-urls": "^5.0.0", diff --git a/desktop/angular/src/app/integration/taur-app.ts b/desktop/angular/src/app/integration/taur-app.ts index 0e1d9e59..ad663e6b 100644 --- a/desktop/angular/src/app/integration/taur-app.ts +++ b/desktop/angular/src/app/integration/taur-app.ts @@ -3,7 +3,7 @@ import { writeText } from '@tauri-apps/plugin-clipboard-manager'; import { open } from '@tauri-apps/plugin-shell'; import { listen, once } from '@tauri-apps/api/event'; import { invoke } from '@tauri-apps/api/core' -import { getCurrent, Window } from '@tauri-apps/api/window'; +import { getCurrentWindow, Window } from '@tauri-apps/api/window'; // Returns a new uuidv4. If crypto.randomUUID is not available it fals back to // using Math.random(). While this is not as random as it should be it's still @@ -102,7 +102,7 @@ export class TauriIntegrationService implements IntegrationService { // we waste some system resources due to tauri window objects and the angular // application. - getCurrent().hide() + getCurrentWindow().hide() return Promise.resolve(); } @@ -164,7 +164,7 @@ export class TauriIntegrationService implements IntegrationService { } openApp() { - Window.getByLabel("splash")?.close(); + Window.getByLabel("splash").then(splash => { splash?.close();}); const current = Window.getCurrent() current.isVisible() @@ -177,7 +177,7 @@ export class TauriIntegrationService implements IntegrationService { } closePrompt() { - Window.getByLabel("prompt")?.close(); + Window.getByLabel("prompt").then(window => { window?.close();}); } openPrompt() { @@ -185,32 +185,34 @@ export class TauriIntegrationService implements IntegrationService { return; } - if (Window.getByLabel("prompt")) { - return; - } + Window.getByLabel("prompt").then(prompt => { + if (prompt) { + return; + } - const promptWindow = new Window("prompt", { - alwaysOnTop: true, - decorations: false, - minimizable: false, - maximizable: false, - resizable: false, - title: 'Portmaster Prompt', - visible: false, // the prompt marks it self as visible. - skipTaskbar: true, - closable: false, - center: true, - width: 600, - height: 300, + const promptWindow = new Window("prompt", { + alwaysOnTop: true, + decorations: false, + minimizable: false, + maximizable: false, + resizable: false, + title: 'Portmaster Prompt', + visible: false, // the prompt marks it self as visible. + skipTaskbar: true, + closable: false, + center: true, + width: 600, + height: 300, - // in src/main.ts we check the current location path - // and if it matches /prompt, we bootstrap the PromptEntryPointComponent - // instead of the AppComponent. - url: `http://${window.location.host}/prompt`, - } as any) + // in src/main.ts we check the current location path + // and if it matches /prompt, we bootstrap the PromptEntryPointComponent + // instead of the AppComponent. + url: `http://${window.location.host}/prompt`, + } as any) - promptWindow.once("tauri://error", (err) => { - console.error(err); + promptWindow.once("tauri://error", (err) => { + console.error(err); + }); }); } } diff --git a/desktop/angular/src/app/prompt-entrypoint/prompt-entrypoint.ts b/desktop/angular/src/app/prompt-entrypoint/prompt-entrypoint.ts index 23bf9f01..d8f1887f 100644 --- a/desktop/angular/src/app/prompt-entrypoint/prompt-entrypoint.ts +++ b/desktop/angular/src/app/prompt-entrypoint/prompt-entrypoint.ts @@ -1,10 +1,10 @@ import { CommonModule } from "@angular/common"; import { Component, OnInit, TrackByFunction, inject } from "@angular/core"; import { AppProfile, AppProfileService, PortapiService } from "@safing/portmaster-api"; -import { combineLatest, combineLatestAll, forkJoin, map, merge, mergeAll, of, switchMap } from "rxjs"; +import { combineLatest, forkJoin, map, merge, mergeAll, of, switchMap } from "rxjs"; import { ConnectionPrompt, NotificationType, NotificationsService } from "../services"; import { SfngAppIconModule } from "../shared/app-icon"; -import { getCurrent } from '@tauri-apps/api/window'; +import { getCurrentWindow } from '@tauri-apps/api/window'; import { CountryFlagModule } from "../shared/country-flag"; interface Prompt { @@ -64,7 +64,7 @@ export class PromptEntryPointComponent implements OnInit { // show the prompt now since we're ready if (this.prompts.length) { - getCurrent()!.show(); + getCurrentWindow()!.show(); } }) } diff --git a/desktop/tauri/src-tauri/Cargo.lock b/desktop/tauri/src-tauri/Cargo.lock index d7efb5ec..c3096c3a 100644 --- a/desktop/tauri/src-tauri/Cargo.lock +++ b/desktop/tauri/src-tauri/Cargo.lock @@ -1089,12 +1089,12 @@ dependencies = [ [[package]] name = "cargo-mobile2" -version = "0.13.2" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebaedf7b7e292b7f41f892f5c96ee15544e21814e89d0b6b8dc06740a69dabe5" +checksum = "d0b8132519bea2d46174e777bd36d480d93afbe1df31c27cacfb411ff152bba1" dependencies = [ "colored", - "core-foundation 0.9.4", + "core-foundation 0.10.0", "deunicode", "duct", "dunce", @@ -1119,7 +1119,7 @@ dependencies = [ "toml 0.8.19", "ureq", "which", - "windows 0.57.0", + "windows 0.58.0", "x509-certificate", ] @@ -7466,9 +7466,9 @@ dependencies = [ [[package]] name = "swift-rs" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" dependencies = [ "base64 0.21.7", "serde", @@ -7579,9 +7579,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6775bcf3c1da33f848ede9cff5883ed1e45a29f66533ce42ad06c93ae514ed59" +checksum = "d3a97abbc7d6cfd0720da3e06fcb1cf2ac87cbfdb5bbbce103a1279a211c4d81" dependencies = [ "bitflags 2.6.0", "cocoa 0.26.0", @@ -7652,9 +7652,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.3" +version = "2.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79776954e2cd6b6c3b56e2cd99905a3a166017495a39ac8eb4c85dd8ea8704b4" +checksum = "e8345ccc676ef16e26b61fc0f5340b4e770678b1e1f53f08c69ebdac5e56b422" dependencies = [ "anyhow", "bytes", @@ -7688,7 +7688,7 @@ dependencies = [ "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "thiserror", "tokio", "tray-icon", @@ -7702,9 +7702,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.3" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc103bde77870e08d5fc8765615b9615997827550b626fbc4ebbd7a1fbfe2a2" +checksum = "7d5ad5fcfaf02cf79aa6727f6c5df38567d8dce172b00b62690c6bc46c08b7ce" dependencies = [ "anyhow", "cargo_toml", @@ -7716,7 +7716,7 @@ dependencies = [ "semver", "serde", "serde_json", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "tauri-winres", "toml 0.8.19", "walkdir", @@ -7724,9 +7724,9 @@ dependencies = [ [[package]] name = "tauri-bundler" -version = "2.0.1-rc.2" +version = "2.0.1-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45d29230559aed6c972799165ba0eab8c99ed5af7d5ae91649d16bd589246" +checksum = "00a0e120d67416e774923fc07a7b531ba6898ed08f0d6e07fe79d7e3da7e0c04" dependencies = [ "anyhow", "ar", @@ -7754,7 +7754,7 @@ dependencies = [ "tar", "tauri-icns", "tauri-macos-sign", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "tempfile", "thiserror", "time", @@ -7768,9 +7768,9 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.0.0-rc.4" +version = "2.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390d66d643b86de471b9c38b409357096f626ff2425cb02a9ff9f77eed1ecf32" +checksum = "ddc42d318b25224c40f88550308f8cc8746a38534d450ce9c553f8c93f335499" dependencies = [ "anyhow", "axum", @@ -7830,7 +7830,8 @@ dependencies = [ "tauri-icns", "tauri-macos-sign", "tauri-utils 1.6.0", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", + "tempfile", "tokio", "toml 0.8.19", "toml_edit 0.22.20", @@ -7842,9 +7843,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.3" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea061e6be9b37ab455eadc189f45617deafc85c94f78f9cd584862a6deaa83d1" +checksum = "809ef6316726fc72593d296cf6f4e7461326e310c313d6a6c42b6e7f1e2671cf" dependencies = [ "base64 0.22.1", "brotli", @@ -7859,7 +7860,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.75", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "thiserror", "time", "url", @@ -7898,16 +7899,16 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.3" +version = "2.0.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e20d6f6f96f55a43339c465b3c8205d71940372d54d7c665c5329e8e4ba35d0" +checksum = "1359e8861d210d25731f8b1bfbb4d111dd06406cf73c59659366ef450364d811" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.75", "tauri-codegen", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", ] [[package]] @@ -7922,7 +7923,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "toml 0.8.19", "walkdir", ] @@ -8092,9 +8093,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.3" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e736d3293f8347e5d2c5b250fe0e5b873499f5483578b139445dbbf802e2e5" +checksum = "75c72b844f387bfc3341c355f3e16b8cbf4161848fa4e348670effb222cd3ba5" dependencies = [ "dpi", "gtk", @@ -8103,7 +8104,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "thiserror", "url", "windows 0.58.0", @@ -8111,9 +8112,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.3" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fead81c1bd0205d5f02580e64f522704618274e784c2d1c127e4ba19acd0b79" +checksum = "73accf936a7cd01d1382de7850726fdf6c1f6ab3b01ccb7a0950cb852e332596" dependencies = [ "cocoa 0.26.0", "gtk", @@ -8125,7 +8126,7 @@ dependencies = [ "softbuffer", "tao", "tauri-runtime", - "tauri-utils 2.0.0-rc.3", + "tauri-utils 2.0.0-rc.7", "url", "webkit2gtk", "webview2-com", @@ -8166,9 +8167,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.3" +version = "2.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285af18e09665ea15fdda04cb28fb579a4d71b4e1640628489fecca98838ca9a" +checksum = "d53d9fe87e985b273696ae22ce2b9f099a8f1b44bc8fb127467bda5fcb3e4371" dependencies = [ "aes-gcm", "brotli", @@ -8713,9 +8714,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b92252d649d771105448969f2b2dda4342ba48b77731b60d37c93665e26615b" +checksum = "131a65b2cef2081bc14dbcd414c906edbfa3bb5323dd7e748cc298614681196b" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -9452,16 +9453,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.58.0" @@ -9503,18 +9494,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.58.0" @@ -9539,17 +9518,6 @@ dependencies = [ "syn 2.0.75", ] -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - [[package]] name = "windows-implement" version = "0.58.0" @@ -9572,17 +9540,6 @@ dependencies = [ "syn 2.0.75", ] -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.75", -] - [[package]] name = "windows-interface" version = "0.58.0" diff --git a/desktop/tauri/src-tauri/Cargo.toml b/desktop/tauri/src-tauri/Cargo.toml index beb9d5da..2325c9b9 100644 --- a/desktop/tauri/src-tauri/Cargo.toml +++ b/desktop/tauri/src-tauri/Cargo.toml @@ -12,11 +12,11 @@ rust-version = "1.60" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-rc.3", features = [] } +tauri-build = { version = "2.0.0-rc.7", features = [] } [dependencies] # Tauri -tauri = { version = "2.0.0-rc.3", features = ["tray-icon", "image-png", "config-json5", "devtools"] } +tauri = { version = "2.0.0-rc.8", features = ["tray-icon", "image-png", "config-json5", "devtools"] } tauri-plugin-shell = "2.0.0-rc" tauri-plugin-dialog = "2.0.0-rc" tauri-plugin-clipboard-manager = "2.0.0-rc" @@ -26,7 +26,7 @@ tauri-plugin-notification = "2.0.0-rc" tauri-plugin-log = "2.0.0-rc" tauri-plugin-window-state = "2.0.0-rc" -tauri-cli = "2.0.0-rc.4" +tauri-cli = "2.0.0-rc.8" clap = { version = "4" } # General diff --git a/desktop/tauri/src-tauri/capabilities/default.json b/desktop/tauri/src-tauri/capabilities/default.json index 18a42634..701c7228 100644 --- a/desktop/tauri/src-tauri/capabilities/default.json +++ b/desktop/tauri/src-tauri/capabilities/default.json @@ -22,6 +22,7 @@ "core:window:allow-is-visible", "core:window:allow-set-focus", "core:window:allow-close", + "core:window:allow-get-all-windows", "core:app:default", "core:image:default", "core:resources:default", diff --git a/desktop/tauri/src-tauri/gen/schemas/capabilities.json b/desktop/tauri/src-tauri/gen/schemas/capabilities.json index 66bbb674..1a35eff1 100644 --- a/desktop/tauri/src-tauri/gen/schemas/capabilities.json +++ b/desktop/tauri/src-tauri/gen/schemas/capabilities.json @@ -1 +1 @@ -{"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["core:path:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:window:allow-hide","core:window:allow-show","core:window:allow-is-visible","core:window:allow-set-focus","core:window:allow-close","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}} \ No newline at end of file +{"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["core:path:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:window:allow-hide","core:window:allow-show","core:window:allow-is-visible","core:window:allow-set-focus","core:window:allow-close","core:window:allow-get-all-windows","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}} \ No newline at end of file