From 3c9771e28733d09278670efd476ef565af8260d0 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Thu, 18 May 2023 11:39:46 -0300 Subject: [PATCH] feat: update to tauri 2.0.0-alpha.9 (#372) --- Cargo.lock | 35 +-- Cargo.toml | 4 +- examples/api/package.json | 4 +- examples/api/src/views/Welcome.svelte | 2 +- plugins/app/package.json | 2 +- plugins/authenticator/package.json | 2 +- plugins/autostart/package.json | 2 +- plugins/cli/package.json | 2 +- plugins/clipboard/package.json | 2 +- plugins/dialog/package.json | 2 +- plugins/fs/guest-js/index.ts | 32 +-- plugins/fs/package.json | 2 +- plugins/global-shortcut/package.json | 2 +- plugins/http/package.json | 2 +- plugins/log/package.json | 2 +- plugins/notification/guest-js/index.ts | 57 +---- plugins/notification/package.json | 2 +- plugins/os/package.json | 2 +- plugins/positioner/package.json | 2 +- plugins/process/package.json | 2 +- plugins/shell/package.json | 2 +- .../examples/vanilla/package.json | 4 +- plugins/sql/package.json | 2 +- plugins/store/package.json | 2 +- plugins/stronghold/package.json | 2 +- plugins/updater/guest-js/index.ts | 30 +-- plugins/updater/package.json | 2 +- plugins/updater/tests/app-updater/src/main.rs | 1 - plugins/upload/guest-js/index.ts | 30 +-- plugins/upload/package.json | 2 +- .../examples/svelte-app/package.json | 3 +- plugins/websocket/package.json | 2 +- plugins/window-state/package.json | 2 +- plugins/window/package.json | 2 +- pnpm-lock.yaml | 201 +++++++++--------- shared/template/package.json | 2 +- 36 files changed, 163 insertions(+), 288 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 650b88bf..72e63f92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4959,8 +4959,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.8" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "2.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695b6c1cdf861002bc2ea17a53cf0669e62da5def6ffcbff02fa00c7515d40b4" dependencies = [ "anyhow", "bytes 1.4.0", @@ -5009,8 +5010,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "2.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34a5b16abedfa53fdb6ad4c68c41612e097dbfac1c18390fe6e4ded18d9ec28d" dependencies = [ "anyhow", "cargo_toml", @@ -5029,8 +5031,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "2.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f03863ab7ecf1fea3a748c4a9ace7b0a6a2051b4ce10ae954ec546957fb529" dependencies = [ "base64 0.21.0", "brotli", @@ -5054,8 +5057,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "2.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f9a2623fed6b5bc04f2e1344c88df6415617bd223599c60a4171630b63fb74" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -5437,8 +5441,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "0.13.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de05147581dd8cfdac638455029eb06c57fa64eb17eb03d5d7f229c571941cd9" dependencies = [ "gtk", "http", @@ -5457,8 +5462,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "0.13.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7784048ef49a57ff32d55bf4ce89ec72fc97e3d4fdc68785d164b23965170e49" dependencies = [ "cocoa", "gtk", @@ -5477,8 +5483,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" +version = "2.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58eca5e3b6714c6bd87052182ebb7d5392d551f478f994878f136f49d4e6d640" dependencies = [ "aes-gcm 0.10.1", "brotli", diff --git a/Cargo.toml b/Cargo.toml index c70e53f1..7d05f86c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next" } +tauri = "2.0.0-alpha.9" +tauri-build = "2.0.0-alpha.5" serde_json = "1" thiserror = "1" diff --git a/examples/api/package.json b/examples/api/package.json index 56e9e165..bbfe9622 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -8,8 +8,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-alpha.3", - "@tauri-apps/cli": "2.0.0-alpha.8", + "@tauri-apps/api": "2.0.0-alpha.4", "@zerodevx/svelte-json-view": "0.2.1", "@tauri-apps/plugin-app": "1.0.0", "@tauri-apps/plugin-cli": "1.0.0", @@ -29,6 +28,7 @@ "@iconify-json/codicon": "^1.1.10", "@iconify-json/ph": "^1.1.1", "@sveltejs/vite-plugin-svelte": "^1.0.1", + "@tauri-apps/cli": "2.0.0-alpha.9", "internal-ip": "^7.0.0", "svelte": "^3.49.0", "unocss": "^0.39.3", diff --git a/examples/api/src/views/Welcome.svelte b/examples/api/src/views/Welcome.svelte index 09eb1405..50048295 100644 --- a/examples/api/src/views/Welcome.svelte +++ b/examples/api/src/views/Welcome.svelte @@ -3,7 +3,7 @@ import { relaunch, exit } from "@tauri-apps/plugin-process"; let version = "1.0.0"; - let tauriversion = "1.0.0"; + let tauriVersion = "1.0.0"; let appName = "Unknown"; getName().then((n) => { diff --git a/plugins/app/package.json b/plugins/app/package.json index 5142e85a..6297bbe5 100644 --- a/plugins/app/package.json +++ b/plugins/app/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/authenticator/package.json b/plugins/authenticator/package.json index 8402ac3f..51130faf 100644 --- a/plugins/authenticator/package.json +++ b/plugins/authenticator/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json index 60dbad28..6bb53385 100644 --- a/plugins/autostart/package.json +++ b/plugins/autostart/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/cli/package.json b/plugins/cli/package.json index ff10d73b..a4baf1a8 100644 --- a/plugins/cli/package.json +++ b/plugins/cli/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/clipboard/package.json b/plugins/clipboard/package.json index d77c8497..84b2c998 100644 --- a/plugins/clipboard/package.json +++ b/plugins/clipboard/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json index ad1b6523..1622c1c4 100644 --- a/plugins/dialog/package.json +++ b/plugins/dialog/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/fs/guest-js/index.ts b/plugins/fs/guest-js/index.ts index 8801ce11..93f4998c 100644 --- a/plugins/fs/guest-js/index.ts +++ b/plugins/fs/guest-js/index.ts @@ -74,6 +74,7 @@ */ import { invoke } from "@tauri-apps/api/tauri"; +import { BaseDirectory } from "@tauri-apps/api/path"; interface Permissions { /** @@ -182,37 +183,6 @@ interface BackendMetadata { blocks: number | undefined; } -// TODO: pull BaseDirectory from @tauri-apps/api/path -/** - * @since 1.0.0 - */ -enum BaseDirectory { - Audio = 1, - Cache, - Config, - Data, - LocalData, - Document, - Download, - Picture, - Public, - Video, - Resource, - Temp, - AppConfig, - AppData, - AppLocalData, - AppCache, - AppLog, - - Desktop, - Executable, - Font, - Home, - Runtime, - Template, -} - /** * @since 1.0.0 */ diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 129a2b38..0b520585 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -28,6 +28,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json index 28574ff3..686cb64e 100644 --- a/plugins/global-shortcut/package.json +++ b/plugins/global-shortcut/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/http/package.json b/plugins/http/package.json index c349369b..a238bb68 100644 --- a/plugins/http/package.json +++ b/plugins/http/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/log/package.json b/plugins/log/package.json index e0c33dd5..575dcfb6 100644 --- a/plugins/log/package.json +++ b/plugins/log/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/notification/guest-js/index.ts b/plugins/notification/guest-js/index.ts index 78919356..b11127eb 100644 --- a/plugins/notification/guest-js/index.ts +++ b/plugins/notification/guest-js/index.ts @@ -24,7 +24,11 @@ * @module */ -import { invoke, transformCallback } from "@tauri-apps/api/tauri"; +import { + invoke, + PluginListener, + addPluginListener, +} from "@tauri-apps/api/tauri"; /** * Options to send a notification. @@ -551,59 +555,16 @@ async function channels(): Promise { return invoke("plugin:notification|getActive"); } -class EventChannel { - id: number; - unregisterFn: (channel: EventChannel) => Promise; - - constructor( - id: number, - unregisterFn: (channel: EventChannel) => Promise - ) { - this.id = id; - this.unregisterFn = unregisterFn; - } - - toJSON(): string { - return `__CHANNEL__:${this.id}`; - } - - async unregister(): Promise { - return this.unregisterFn(this); - } -} - -// TODO: use addPluginListener API on @tauri-apps/api/tauri 2.0.0-alpha.4 async function onNotificationReceived( cb: (notification: Options) => void -): Promise { - const channelId = transformCallback(cb); - const handler = new EventChannel(channelId, (channel) => - invoke("plugin:notification|remove_listener", { - event: "notification", - channelId: channel.id, - }) - ); - return invoke("plugin:notification|register_listener", { - event: "notification", - handler, - }).then(() => handler); +): Promise { + return addPluginListener("notification", "notification", cb); } -// TODO: use addPluginListener API on @tauri-apps/api/tauri 2.0.0-alpha.4 async function onAction( cb: (notification: Options) => void -): Promise { - const channelId = transformCallback(cb); - const handler = new EventChannel(channelId, (channel) => - invoke("plugin:notification|remove_listener", { - event: "actionPerformed", - channelId: channel.id, - }) - ); - return invoke("plugin:notification|register_listener", { - event: "actionPerformed", - handler, - }).then(() => handler); +): Promise { + return addPluginListener("notification", "actionPerformed", cb); } export type { diff --git a/plugins/notification/package.json b/plugins/notification/package.json index 00bef173..f43df637 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/os/package.json b/plugins/os/package.json index 5552fdd4..b6022045 100644 --- a/plugins/os/package.json +++ b/plugins/os/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index c4709f8d..0dea96d4 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/process/package.json b/plugins/process/package.json index aca539de..9f2542ec 100644 --- a/plugins/process/package.json +++ b/plugins/process/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/shell/package.json b/plugins/shell/package.json index 3fe86628..56aa7f66 100644 --- a/plugins/shell/package.json +++ b/plugins/shell/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index a2967169..750f083e 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -8,7 +8,7 @@ }, "author": "", "license": "MIT", - "dependencies": { - "@tauri-apps/cli": "^2.0.0-alpha.8" + "devDependencies": { + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/plugins/sql/package.json b/plugins/sql/package.json index 907555b0..86342845 100644 --- a/plugins/sql/package.json +++ b/plugins/sql/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/store/package.json b/plugins/store/package.json index 1de3f640..00882a96 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json index d6dc517a..04c0aacd 100644 --- a/plugins/stronghold/package.json +++ b/plugins/stronghold/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/updater/guest-js/index.ts b/plugins/updater/guest-js/index.ts index 6c2363c8..7fb766e0 100644 --- a/plugins/updater/guest-js/index.ts +++ b/plugins/updater/guest-js/index.ts @@ -1,4 +1,4 @@ -import { invoke, transformCallback } from "@tauri-apps/api/tauri"; +import { invoke, Channel } from "@tauri-apps/api/tauri"; interface CheckOptions { /** @@ -23,34 +23,6 @@ interface UpdateResponse { body?: string; } -// TODO: use channel from @tauri-apps/api on v2 -class Channel { - id: number; - // @ts-expect-error field used by the IPC serializer - private readonly __TAURI_CHANNEL_MARKER__ = true; - #onmessage: (response: T) => void = () => { - // no-op - }; - - constructor() { - this.id = transformCallback((response: T) => { - this.#onmessage(response); - }); - } - - set onmessage(handler: (response: T) => void) { - this.#onmessage = handler; - } - - get onmessage(): (response: T) => void { - return this.#onmessage; - } - - toJSON(): string { - return `__CHANNEL__:${this.id}`; - } -} - type DownloadEvent = | { event: "Started"; data: { contentLength?: number } } | { event: "Progress"; data: { chunkLength: number } } diff --git a/plugins/updater/package.json b/plugins/updater/package.json index c995086c..7de4db59 100644 --- a/plugins/updater/package.json +++ b/plugins/updater/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/updater/tests/app-updater/src/main.rs b/plugins/updater/tests/app-updater/src/main.rs index 9efc9b0b..b08d8df9 100644 --- a/plugins/updater/tests/app-updater/src/main.rs +++ b/plugins/updater/tests/app-updater/src/main.rs @@ -17,7 +17,6 @@ fn main() { // It must be the last parameter used in the command line and must not contain any quotes, even if the path contains spaces. // Only absolute paths are supported. // NOTE: we only need this because this is an integration test and we don't want to install the app in the programs folder - // TODO mutate plugin config updater = updater.installer_args(vec![format!( "/D={}", tauri::utils::platform::current_exe() diff --git a/plugins/upload/guest-js/index.ts b/plugins/upload/guest-js/index.ts index f13a1627..96e34659 100644 --- a/plugins/upload/guest-js/index.ts +++ b/plugins/upload/guest-js/index.ts @@ -1,4 +1,4 @@ -import { invoke, transformCallback } from "@tauri-apps/api/tauri"; +import { invoke, Channel } from "@tauri-apps/api/tauri"; interface ProgressPayload { progress: number; @@ -7,34 +7,6 @@ interface ProgressPayload { type ProgressHandler = (progress: ProgressPayload) => void; -// TODO: use channel from @tauri-apps/api on v2 -class Channel { - id: number; - // @ts-expect-error field used by the IPC serializer - private readonly __TAURI_CHANNEL_MARKER__ = true; - #onmessage: (response: T) => void = () => { - // no-op - }; - - constructor() { - this.id = transformCallback((response: T) => { - this.#onmessage(response); - }); - } - - set onmessage(handler: (response: T) => void) { - this.#onmessage = handler; - } - - get onmessage(): (response: T) => void { - return this.#onmessage; - } - - toJSON(): string { - return `__CHANNEL__:${this.id}`; - } -} - async function upload( url: string, filePath: string, diff --git a/plugins/upload/package.json b/plugins/upload/package.json index bf3233ac..6bc205bb 100644 --- a/plugins/upload/package.json +++ b/plugins/upload/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index 5f1f5511..67d63a59 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/kit": "^1.15.5", - "@tauri-apps/cli": "^1.2.3", + "@tauri-apps/cli": "2.0.0-alpha.9", "svelte": "^3.58.0", "svelte-check": "^3.2.0", "tslib": "^2.5.0", @@ -21,7 +21,6 @@ "vite": "^4.2.1" }, "dependencies": { - "@tauri-apps/cli": "^2.0.0-alpha.8", "@tauri-apps/plugin-websocket": "link:../../" }, "type": "module" diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json index 7142f964..e2fc865c 100644 --- a/plugins/websocket/package.json +++ b/plugins/websocket/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json index 19f384a3..01f524d8 100644 --- a/plugins/window-state/package.json +++ b/plugins/window-state/package.json @@ -28,6 +28,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/plugins/window/package.json b/plugins/window/package.json index 578d58bf..2de9b3bb 100644 --- a/plugins/window/package.json +++ b/plugins/window/package.json @@ -27,6 +27,6 @@ "tslib": "^2.5.0" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 464bc7e9..96d380f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,11 +56,8 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.0-alpha.3 - version: 2.0.0-alpha.3 - '@tauri-apps/cli': - specifier: 2.0.0-alpha.8 - version: 2.0.0-alpha.8 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 '@tauri-apps/plugin-app': specifier: 1.0.0 version: link:../../plugins/app @@ -113,6 +110,9 @@ importers: '@sveltejs/vite-plugin-svelte': specifier: ^1.0.1 version: 1.0.1(svelte@3.55.1)(vite@3.0.9) + '@tauri-apps/cli': + specifier: 2.0.0-alpha.9 + version: 2.0.0-alpha.9 internal-ip: specifier: ^7.0.0 version: 7.0.0 @@ -129,8 +129,8 @@ importers: plugins/app: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -139,8 +139,8 @@ importers: plugins/authenticator: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -149,8 +149,8 @@ importers: plugins/autostart: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -159,8 +159,8 @@ importers: plugins/cli: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -169,8 +169,8 @@ importers: plugins/clipboard: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -179,8 +179,8 @@ importers: plugins/dialog: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -189,8 +189,8 @@ importers: plugins/fs: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -199,8 +199,8 @@ importers: plugins/global-shortcut: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -209,8 +209,8 @@ importers: plugins/http: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -219,8 +219,8 @@ importers: plugins/log: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -229,8 +229,8 @@ importers: plugins/notification: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 @@ -239,8 +239,8 @@ importers: plugins/os: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -249,8 +249,8 @@ importers: plugins/positioner: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -259,8 +259,8 @@ importers: plugins/process: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -269,24 +269,24 @@ importers: plugins/shell: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.4.1 version: 2.4.1 plugins/single-instance/examples/vanilla: - dependencies: + devDependencies: '@tauri-apps/cli': - specifier: ^2.0.0-alpha.8 - version: 2.0.0-alpha.8 + specifier: ^2.0.0-alpha.9 + version: 2.0.0-alpha.9 plugins/sql: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -295,8 +295,8 @@ importers: plugins/store: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -305,8 +305,8 @@ importers: plugins/stronghold: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -315,8 +315,8 @@ importers: plugins/updater: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -325,8 +325,8 @@ importers: plugins/upload: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -335,8 +335,8 @@ importers: plugins/websocket: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -344,9 +344,6 @@ importers: plugins/websocket/examples/svelte-app: dependencies: - '@tauri-apps/cli': - specifier: ^2.0.0-alpha.8 - version: 2.0.0-alpha.8 '@tauri-apps/plugin-websocket': specifier: link:../../ version: link:../.. @@ -357,6 +354,9 @@ importers: '@sveltejs/kit': specifier: ^1.15.5 version: 1.15.8(svelte@3.58.0)(vite@4.3.3) + '@tauri-apps/cli': + specifier: 2.0.0-alpha.9 + version: 2.0.0-alpha.9 svelte: specifier: ^3.58.0 version: 3.58.0 @@ -376,8 +376,8 @@ importers: plugins/window: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -386,8 +386,8 @@ importers: plugins/window-state: dependencies: '@tauri-apps/api': - specifier: ^1.2.0 - version: 1.2.0 + specifier: 2.0.0-alpha.4 + version: 2.0.0-alpha.4 devDependencies: tslib: specifier: ^2.5.0 @@ -1043,112 +1043,107 @@ packages: - supports-color dev: true - /@tauri-apps/api@1.2.0: - resolution: {integrity: sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==} + /@tauri-apps/api@2.0.0-alpha.4: + resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/api@2.0.0-alpha.3: - resolution: {integrity: sha512-F6seMDlcaxeCPy4gS0zJdp6Tet+0rd1qJi/fbKrOrhLM6Y5UtkiG1aSDnMPi+1udThSfadjhUwrLHINvfMCjzQ==} - engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - dev: false - - /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.8: - resolution: {integrity: sha512-ZF9nkkYCDiAEKZFwjEbuqTcFVp+DBgem3edKjsZDYPQpWg0VcZOSYr0o3/RPC81T1/FAy1lq478mkcMe0efvEw==} + /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.9: + resolution: {integrity: sha512-h7AQY4MbHyy7CLANfoegJyaypKQ3fYPlBA3mnhtF+zntrMxVTv+HO9sgn98jGnwlOak8y0NPPKJ6gZFu5GYiNg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-darwin-x64@2.0.0-alpha.8: - resolution: {integrity: sha512-N5V+tbP3qeAoXrrTZXvaLIeEWKCq11tqXoNFTkIZNGNC5yQdNpZSX0LqFqzmxVR1SHiOymebvcUlx+ADIpuXGw==} + /@tauri-apps/cli-darwin-x64@2.0.0-alpha.9: + resolution: {integrity: sha512-8RtvzZ4/1gZU8SvMaCygtjc9Q0bMnA0NuQKOMrehRfpvvy2gw/q8MMdw3WEawYGQHqEbr6YtNJmaR5wlsVk+IQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.8: - resolution: {integrity: sha512-7LHfZA99ncMDUO/wCGMtrqmDHt1uEKZiNmuzPljWLUwVvbAn0pNWNygnvPNVLEOyav5NnZSGPqT1Zmn+L6Fpyg==} + /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.9: + resolution: {integrity: sha512-nHAgFEJ2DXXEx96FLPnqZ9vfFGw7Hr2ZaY+xy28llXWljCOguWi8wdHv4OMnq0hbOkegVGplYPc4RSQ5uUia2Q==} engines: {node: '>= 10'} cpu: [arm] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.8: - resolution: {integrity: sha512-imq2MdhWdREvL2sqbU26mzH9sgSvfNWP0uvCPvPxUhK157xqdtGw+Gqm00hwnhTuT5bOFlsUNfnG2U19k1qMpA==} + /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.9: + resolution: {integrity: sha512-ETmUoTp+UgHypPpsq3OYwbcmX8MqjCGIUAzDHoVFpYuj2oqHw0ZaCx2lQPTnqW5G5L9X9VXhMAcRB8OBZG5KFw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.8: - resolution: {integrity: sha512-7hXEyvCosBHIN6ahkbFOI5JoyWZAulc0sYd3hWh9V/MBfU+LlPiapsJi6fdde0zew5nnzwcCtfEKkoR737tAig==} + /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.9: + resolution: {integrity: sha512-S55E2u4LsQajoxkpYqd2skPEVG5hp+Mkhhnixfi+87q87n9iIvIqcH+4ejDXAPUrWNMsRKIWVURV2ZzivqK5Kw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.8: - resolution: {integrity: sha512-S9T/trKpXcLc7hVIv7xFrRBlaivHD/HLUz0nYAkI2izNGFmbP3QpkqQDdwpWN/fxneodNgI2/mDFC3NULClj+A==} + /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.9: + resolution: {integrity: sha512-/0J5sJDu+cSrj67L4Q4FVANe1ffpsz3LZMQRkbWmT2ggd2Mxg8LZBtg7y5ysMfJg8xjKvymi+1mS2yU1B7/k9Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.8: - resolution: {integrity: sha512-90mx6vSFNBbctaPaKhkH+um51gOoRJwLFOadOkklHS5Q6S6GjtSa1lmBEFyKUTAfFPtmiacuNYtoKx7nqm+z1Q==} + /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.9: + resolution: {integrity: sha512-zjtf5H3c4amlBjIdDiQ3pmiMV/cmcPxaiH4KgyRD6NZXY9+gDk5dkzj3WAWegiD1ycz3bv5INO/tDxjk5ZSYlw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.8: - resolution: {integrity: sha512-VAMsLJYfp6iVI7oJ+uIkfe8DKPRMtWDiSEkfFqvDyFX0WMTQl23B0AzYyapVwZc+WkTkLuoMLpIWMQCgAoQWfQ==} + /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.9: + resolution: {integrity: sha512-Hn0xDaEEMeXRzWCtew2MIYDky8hF+BOos0PP4qyCX14LfChpgSIT0aMYC8xbSfj9N9pwznhNBxgOtCADaTPWcg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.8: - resolution: {integrity: sha512-zvWd13hRfRM0AEJJZ4t4CeB/cyru8hvbB6c+sxYDS9GPRWfHSH5dIeKoHhnMwP5fEOPZLN7VaeEP6tC88trD6g==} + /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.9: + resolution: {integrity: sha512-541nR7UoasX/fnEWhC14H4Ppj17Aa1fbCyFb9+zmWjupVkEGf/yQFvdWRHdmCkgOdGuxPahR5hbOPh+jvaklFw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@tauri-apps/cli@2.0.0-alpha.8: - resolution: {integrity: sha512-cXt6pxh7oiV8Htz7eTPor7if4aN9f9emn10+5h2Y82YzST7I7wKXsrjuk0HIyzUiqiQjUgl3iT9gh791zgtI3w==} + /@tauri-apps/cli@2.0.0-alpha.9: + resolution: {integrity: sha512-roQNpFC3Ijni/c7TCkCpUg3gWKfxs1ftWSQJyCthqIPRM5J7I2vOfhcUXIZw9glrxDp5npyRW0xYyI7W/424uQ==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.8 - '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.8 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.8 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.8 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.8 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.8 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.8 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.8 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.8 - dev: false + '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.9 + '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.9 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.9 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.9 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.9 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.9 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.9 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.9 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.9 + dev: true /@tauri-apps/toml@2.2.4: resolution: {integrity: sha512-NJV/pdgJObDlDWi5+MTHZ2qyNvdL0dlHqQ72nzQYXWbW1LHMPXgCJYl0pLqL1XxxLtxtInYbtVCGVAcwhGxdkw==} diff --git a/shared/template/package.json b/shared/template/package.json index fc14f4db..e39bca2a 100644 --- a/shared/template/package.json +++ b/shared/template/package.json @@ -27,6 +27,6 @@ "tslib": "^2.4.1" }, "dependencies": { - "@tauri-apps/api": "^1.2.0" + "@tauri-apps/api": "2.0.0-alpha.4" } }