From ea63b40224fa63b6827f09984ff69943fcacf92b Mon Sep 17 00:00:00 2001 From: Alexandre Dang <124160233+vdang-crabnebula@users.noreply.github.com> Date: Wed, 7 Jun 2023 13:09:43 +0200 Subject: [PATCH 01/17] fix(stronghold): change wrong argument name for `remove` (#422) --- .changes/stronghold-arg-name.md | 5 +++++ plugins/stronghold/guest-js/index.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changes/stronghold-arg-name.md diff --git a/.changes/stronghold-arg-name.md b/.changes/stronghold-arg-name.md new file mode 100644 index 00000000..61efc0ed --- /dev/null +++ b/.changes/stronghold-arg-name.md @@ -0,0 +1,5 @@ +--- +"stronghold-js": patch +--- + +Change the argument name of the `Stronghold.remove` from `location` to `recordPath` to match the Stronghold command argument diff --git a/plugins/stronghold/guest-js/index.ts b/plugins/stronghold/guest-js/index.ts index 071eabf1..9272f9a9 100644 --- a/plugins/stronghold/guest-js/index.ts +++ b/plugins/stronghold/guest-js/index.ts @@ -378,7 +378,7 @@ export class Vault extends ProcedureExecutor { snapshotPath: this.path, client: this.client, vault: this.name, - location, + recordPath: location.payload.record, }); } } From 523bcdc5288dd990ee7905a8c762c165d44d612c Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Wed, 7 Jun 2023 14:19:29 +0200 Subject: [PATCH 02/17] fix(window-state): correctly set decoration state if no saved state exists, fixes #421 (#424) --- plugins/window-state/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/window-state/src/lib.rs b/plugins/window-state/src/lib.rs index 2a23f35d..676baf5e 100644 --- a/plugins/window-state/src/lib.rs +++ b/plugins/window-state/src/lib.rs @@ -175,7 +175,7 @@ impl WindowExt for Window { } if flags.contains(StateFlags::DECORATIONS) { - metadata.visible = self.is_visible()?; + metadata.decorated = self.is_decorated()?; } if flags.contains(StateFlags::FULLSCREEN) { From 0984fc8374c7d623ddc5f56cab1b235020337af2 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Mon, 12 Jun 2023 11:20:59 +0200 Subject: [PATCH 03/17] chore: Add branch to install instructions that use git (#433) --- plugins/authenticator/README.md | 6 +++--- plugins/autostart/README.md | 6 +++--- plugins/fs-extra/README.md | 6 +++--- plugins/fs-watch/README.md | 6 +++--- plugins/log/README.md | 6 +++--- plugins/positioner/README.md | 6 +++--- plugins/sql/README.md | 6 +++--- plugins/store/README.md | 6 +++--- plugins/stronghold/README.md | 6 +++--- plugins/upload/README.md | 6 +++--- plugins/websocket/README.md | 6 +++--- plugins/window-state/README.md | 6 +++--- shared/template/README.md | 2 ++ 13 files changed, 38 insertions(+), 36 deletions(-) diff --git a/plugins/authenticator/README.md b/plugins/authenticator/README.md index 89fa6e29..41a38510 100644 --- a/plugins/authenticator/README.md +++ b/plugins/authenticator/README.md @@ -28,11 +28,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-authenticator +pnpm add https://github.com/tauri-apps/tauri-plugin-authenticator#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-authenticator +npm add https://github.com/tauri-apps/tauri-plugin-authenticator#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-authenticator +yarn add https://github.com/tauri-apps/tauri-plugin-authenticator#v1 ``` ## Usage diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md index 7c9f8ddb..eaf79ec9 100644 --- a/plugins/autostart/README.md +++ b/plugins/autostart/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-autostart +pnpm add https://github.com/tauri-apps/tauri-plugin-autostart#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-autostart +npm add https://github.com/tauri-apps/tauri-plugin-autostart#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-autostart +yarn add https://github.com/tauri-apps/tauri-plugin-autostart#v1 ``` ## Usage diff --git a/plugins/fs-extra/README.md b/plugins/fs-extra/README.md index 3eeaf003..52f65e13 100644 --- a/plugins/fs-extra/README.md +++ b/plugins/fs-extra/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-fs-extra +pnpm add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-fs-extra +npm add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-fs-extra +yarn add https://github.com/tauri-apps/tauri-plugin-fs-extra#v1 ``` ## Usage diff --git a/plugins/fs-watch/README.md b/plugins/fs-watch/README.md index 29f6cc11..84b65109 100644 --- a/plugins/fs-watch/README.md +++ b/plugins/fs-watch/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-fs-watch +pnpm add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-fs-watch +npm add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-fs-watch +yarn add https://github.com/tauri-apps/tauri-plugin-fs-watch#v1 ``` ## Usage diff --git a/plugins/log/README.md b/plugins/log/README.md index e4326f38..f50a7eec 100644 --- a/plugins/log/README.md +++ b/plugins/log/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-log +pnpm add https://github.com/tauri-apps/tauri-plugin-log#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-log +npm add https://github.com/tauri-apps/tauri-plugin-log#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-log +yarn add https://github.com/tauri-apps/tauri-plugin-log#v1 ``` ## Usage diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 464e3cfb..924598e5 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -40,11 +40,11 @@ yarn add tauri-plugin-positioner-api Or through git: ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-positioner +pnpm add https://github.com/tauri-apps/tauri-plugin-positioner#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-positioner +npm add https://github.com/tauri-apps/tauri-plugin-positioner#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-positioner +yarn add https://github.com/tauri-apps/tauri-plugin-positioner#v1 ``` ## Usage diff --git a/plugins/sql/README.md b/plugins/sql/README.md index 2522848d..9f263742 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -28,11 +28,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-sql +pnpm add https://github.com/tauri-apps/tauri-plugin-sql#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-sql +npm add https://github.com/tauri-apps/tauri-plugin-sql#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-sql +yarn add https://github.com/tauri-apps/tauri-plugin-sql#v1 ``` ## Usage diff --git a/plugins/store/README.md b/plugins/store/README.md index 4aef4a96..6ab5809f 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-store +pnpm add https://github.com/tauri-apps/tauri-plugin-store#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-store +npm add https://github.com/tauri-apps/tauri-plugin-store#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-store +yarn add https://github.com/tauri-apps/tauri-plugin-store#v1 ``` ## Usage diff --git a/plugins/stronghold/README.md b/plugins/stronghold/README.md index 5c486b96..1a1724d8 100644 --- a/plugins/stronghold/README.md +++ b/plugins/stronghold/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-stronghold +pnpm add https://github.com/tauri-apps/tauri-plugin-stronghold#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-stronghold +npm add https://github.com/tauri-apps/tauri-plugin-stronghold#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-stronghold +yarn add https://github.com/tauri-apps/tauri-plugin-stronghold#v1 ``` ## Usage diff --git a/plugins/upload/README.md b/plugins/upload/README.md index 48fe0153..64e1a891 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -27,11 +27,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-upload +pnpm add https://github.com/tauri-apps/tauri-plugin-upload#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-upload +npm add https://github.com/tauri-apps/tauri-plugin-upload#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-upload +yarn add https://github.com/tauri-apps/tauri-plugin-upload#v1 ``` ## Usage diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index 7c34af4a..9ca516c5 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-websocket +pnpm add https://github.com/tauri-apps/tauri-plugin-websocket#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-websocket +npm add https://github.com/tauri-apps/tauri-plugin-websocket#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-websocket +yarn add https://github.com/tauri-apps/tauri-plugin-websocket#v1 ``` ## Usage diff --git a/plugins/window-state/README.md b/plugins/window-state/README.md index 02a1bdd1..c0c49de6 100644 --- a/plugins/window-state/README.md +++ b/plugins/window-state/README.md @@ -26,11 +26,11 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. ```sh -pnpm add https://github.com/tauri-apps/tauri-plugin-window-state +pnpm add https://github.com/tauri-apps/tauri-plugin-window-state#v1 # or -npm add https://github.com/tauri-apps/tauri-plugin-window-state +npm add https://github.com/tauri-apps/tauri-plugin-window-state#v1 # or -yarn add https://github.com/tauri-apps/tauri-plugin-window-state +yarn add https://github.com/tauri-apps/tauri-plugin-window-state#v1 ``` ## Usage diff --git a/shared/template/README.md b/shared/template/README.md index 413618b9..56a9c27d 100644 --- a/shared/template/README.md +++ b/shared/template/README.md @@ -25,6 +25,8 @@ You can install the JavaScript Guest bindings using your preferred JavaScript pa > Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use. + + ```sh pnpm add # or From 6ad221ed36a0e4cd2268495f599cb02db91f5cbf Mon Sep 17 00:00:00 2001 From: Ludea Date: Mon, 12 Jun 2023 19:26:08 +0200 Subject: [PATCH 04/17] fix(stronghold): return null if there is no record (#129) * [stronghold] return null if there is no record * Return value * return statement * prettier * fix function signature * fix if condition * simplify condition --------- Co-authored-by: Fabian-Lars --- plugins/stronghold/guest-js/index.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/stronghold/guest-js/index.ts b/plugins/stronghold/guest-js/index.ts index 9272f9a9..26c03958 100644 --- a/plugins/stronghold/guest-js/index.ts +++ b/plugins/stronghold/guest-js/index.ts @@ -293,12 +293,18 @@ export class Store { this.client = client; } - async get(key: StoreKey): Promise { + async get(key: StoreKey): Promise { return await invoke("plugin:stronghold|get_store_record", { snapshotPath: this.path, client: this.client, key: toBytesDto(key), - }).then((v) => Uint8Array.from(v)); + }).then((v) => { + if (v) { + return Uint8Array.from(v); + } else { + return null; + } + }); } async insert( From 617cf380695fe957798aee5c7f3a96e19f46712a Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 13 Jun 2023 15:47:55 +0300 Subject: [PATCH 05/17] fix(window-state): propagate promise (#435) closes #432 --- .changes/window-state-promise.md | 5 +++++ plugins/window-state/guest-js/index.ts | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 .changes/window-state-promise.md diff --git a/.changes/window-state-promise.md b/.changes/window-state-promise.md new file mode 100644 index 00000000..f97c43df --- /dev/null +++ b/.changes/window-state-promise.md @@ -0,0 +1,5 @@ +--- +"window-state-js": "patch" +--- + +Correctly propagate the promise inside `saveWindowState`, `restoreState` and `restoreStateCurrent` so callers can choose to `await` them. diff --git a/plugins/window-state/guest-js/index.ts b/plugins/window-state/guest-js/index.ts index 11ead0f4..0cc32649 100644 --- a/plugins/window-state/guest-js/index.ts +++ b/plugins/window-state/guest-js/index.ts @@ -14,22 +14,25 @@ export enum StateFlags { /** * Save the state of all open windows to disk. */ -async function saveWindowState(flags: StateFlags) { - invoke("plugin:window-state|save_window_state", { flags }); +async function saveWindowState(flags: StateFlags): Promise { + return invoke("plugin:window-state|save_window_state", { flags }); } /** * Restore the state for the specified window from disk. */ -async function restoreState(label: WindowLabel, flags: StateFlags) { - invoke("plugin:window-state|restore_state", { label, flags }); +async function restoreState( + label: WindowLabel, + flags: StateFlags +): Promise { + return invoke("plugin:window-state|restore_state", { label, flags }); } /** * Restore the state for the current window from disk. */ -async function restoreStateCurrent(flags: StateFlags) { - restoreState(getCurrent().label, flags); +async function restoreStateCurrent(flags: StateFlags): Promise { + return restoreState(getCurrent().label, flags); } export { restoreState, restoreStateCurrent, saveWindowState }; From 417c85a2dd42dfacc075a7fbeaa00ab351a18d6f Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 13 Jun 2023 15:48:10 +0300 Subject: [PATCH 06/17] fix(window-state): manual default implentation (#425) * fix(window-state): manual default implentation, closes #421 * Update lib.rs --- plugins/window-state/src/lib.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/window-state/src/lib.rs b/plugins/window-state/src/lib.rs index 676baf5e..f17201ca 100644 --- a/plugins/window-state/src/lib.rs +++ b/plugins/window-state/src/lib.rs @@ -53,7 +53,7 @@ impl Default for StateFlags { } } -#[derive(Debug, Default, Deserialize, Serialize, PartialEq)] +#[derive(Debug, Deserialize, Serialize, PartialEq)] struct WindowState { width: f64, height: f64, @@ -65,6 +65,21 @@ struct WindowState { fullscreen: bool, } +impl Default for WindowState { + fn default() -> Self { + Self { + width: Default::default(), + height: Default::default(), + x: Default::default(), + y: Default::default(), + maximized: Default::default(), + visible: true, + decorated: true, + fullscreen: Default::default(), + } + } +} + struct WindowStateCache(Arc>>); pub trait AppHandleExt { /// Saves all open windows state to disk From be2a90b7e24a2355c52f781f8468004145aeec28 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Tue, 13 Jun 2023 15:56:09 +0300 Subject: [PATCH 07/17] chore: remove unneeded change file --- .changes/window-state-promise.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changes/window-state-promise.md diff --git a/.changes/window-state-promise.md b/.changes/window-state-promise.md deleted file mode 100644 index f97c43df..00000000 --- a/.changes/window-state-promise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"window-state-js": "patch" ---- - -Correctly propagate the promise inside `saveWindowState`, `restoreState` and `restoreStateCurrent` so callers can choose to `await` them. From c4d2c8c693a8e0da627f4c845486dbe1b1e32c64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 14:52:07 +0200 Subject: [PATCH 08/17] fix(deps): update rust crate iota-crypto to 0.21 (#438) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- plugins/stronghold/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b180e48..500fcca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2009,9 +2009,9 @@ dependencies = [ [[package]] name = "iota-crypto" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0180a2a7939b4b0ae68e651bbec130b27fd5882ef552df5bb55e0320e78bacbc" +checksum = "51a639b688f37dcb85e741c5defcf0e341527f39288931cc22ad8e6fbc396ca7" dependencies = [ "autocfg", ] @@ -4459,7 +4459,7 @@ name = "tauri-plugin-stronghold" version = "0.0.0" dependencies = [ "hex", - "iota-crypto 0.20.0", + "iota-crypto 0.21.0", "iota_stronghold", "log", "rand 0.8.5", diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml index 0ef6436a..57a8a2c9 100644 --- a/plugins/stronghold/Cargo.toml +++ b/plugins/stronghold/Cargo.toml @@ -16,7 +16,7 @@ tauri.workspace = true log.workspace = true thiserror.workspace = true iota_stronghold = "1" -iota-crypto = "0.20" +iota-crypto = "0.21" hex = "0.4" zeroize = { version = "1", features = ["zeroize_derive"] } From 7b9d7a1d8896c213998949a423d5835e8e2734c6 Mon Sep 17 00:00:00 2001 From: Duke Jones <104690+dukejones@users.noreply.github.com> Date: Mon, 19 Jun 2023 23:57:13 -0700 Subject: [PATCH 09/17] docs(websocket): fix readme example (#447) --- plugins/websocket/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index 9ca516c5..0d098c1a 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -51,7 +51,7 @@ fn main() { Afterwards all the plugin's APIs are available through the JavaScript guest bindings: ```javascript -import { WebSocket } from "tauri-plugin-websocket-api"; +import WebSocket from "tauri-plugin-websocket-api"; const ws = await WebSocket.connect("wss://example.com"); From a305ad3ddbdf4b7c009394ac3dc4794cfc222f0f Mon Sep 17 00:00:00 2001 From: NaokiM03 <37442712+NaokiM03@users.noreply.github.com> Date: Thu, 22 Jun 2023 18:29:08 +0900 Subject: [PATCH 10/17] chore(fs-watch) Update Usage (#451) --- plugins/fs-watch/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/fs-watch/README.md b/plugins/fs-watch/README.md index 84b65109..34659a9b 100644 --- a/plugins/fs-watch/README.md +++ b/plugins/fs-watch/README.md @@ -57,7 +57,7 @@ import { watch, watchImmediate } from "tauri-plugin-fs-watch-api"; const stopWatching = await watch( "/path/to/something", (event) => { - const { type, payload } = event; + const { kind, path } = event; }, { recursive: true } ); @@ -65,7 +65,7 @@ const stopWatching = await watch( const stopRawWatcher = await watchImmediate( ["/path/a", "/path/b"], (event) => { - const { path, operation, cookie } = event; + const { type, paths, attrs } = event; }, {} ); From 9174b808dc37154999c119fcc3f31258a9c5a3fb Mon Sep 17 00:00:00 2001 From: Thibault Date: Thu, 29 Jun 2023 23:23:08 +0200 Subject: [PATCH 11/17] [persisted scope] fix: handle recursive directory correctly (#455) * fix: use correct functions to allow/forbid Without changing the data structure * fix: wrong type passed when passing path by ref * fix: remove '**' before allowing pattern to no trash the scope * fmt: run fmt * fix: Remove trailling '*' for non-recursive directories * fix: remove superfluous asteriks recursively * info: add changefile * fix: remove unwated yarn.lock * fix: simplify directories' fix and apply it to forbid_path too. * fix: simplify path to str in fix_directory * don't convert path back to str * Update persisted-scope-fix-handle-glob-directories.md --------- Co-authored-by: FabianLars --- ...isted-scope-fix-handle-glob-directories.md | 7 ++ plugins/persisted-scope/src/lib.rs | 81 +++++++++++++++++-- 2 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 .changes/persisted-scope-fix-handle-glob-directories.md diff --git a/.changes/persisted-scope-fix-handle-glob-directories.md b/.changes/persisted-scope-fix-handle-glob-directories.md new file mode 100644 index 00000000..7badc185 --- /dev/null +++ b/.changes/persisted-scope-fix-handle-glob-directories.md @@ -0,0 +1,7 @@ +--- +"persisted-scope": patch +--- + +Fix usage of directory patterns by removing glob asterisks at the end before allowing/forbidding them. + +This was causing them to be escaped, and so undesirable paths were allowed/forbidden while polluting the `.persisted_scope` file. diff --git a/plugins/persisted-scope/src/lib.rs b/plugins/persisted-scope/src/lib.rs index fe2cddf1..af489186 100644 --- a/plugins/persisted-scope/src/lib.rs +++ b/plugins/persisted-scope/src/lib.rs @@ -6,7 +6,7 @@ use aho_corasick::AhoCorasick; use serde::{Deserialize, Serialize}; use tauri::{ plugin::{Builder, TauriPlugin}, - AppHandle, FsScopeEvent, Manager, Runtime, + AppHandle, FsScope, FsScopeEvent, Manager, Runtime, }; use std::{ @@ -42,6 +42,14 @@ enum Error { Bincode(#[from] Box), } +#[derive(Debug, Default, Deserialize, Serialize, Eq, PartialEq, Hash)] +enum TargetType { + #[default] + File, + Directory, + RecursiveDirectory, +} + #[derive(Debug, Default, Deserialize, Serialize)] struct Scope { allowed_paths: Vec, @@ -58,6 +66,66 @@ fn fix_pattern(ac: &AhoCorasick, s: &str) -> String { s } +const RESURSIVE_DIRECTORY_SUFFIX: &str = "**"; +const DIRECTORY_SUFFIX: &str = "*"; + +fn detect_scope_type(scope_state_path: &str) -> TargetType { + if scope_state_path.ends_with(RESURSIVE_DIRECTORY_SUFFIX) { + TargetType::RecursiveDirectory + } else if scope_state_path.ends_with(DIRECTORY_SUFFIX) { + TargetType::Directory + } else { + TargetType::File + } +} + +fn fix_directory(path_str: &str) -> &Path { + let mut path = Path::new(path_str); + + if path.ends_with(DIRECTORY_SUFFIX) || path.ends_with(RESURSIVE_DIRECTORY_SUFFIX) { + path = match path.parent() { + Some(value) => value, + None => return path, + }; + } + + path +} + +fn allow_path(scope: &FsScope, path: &str) { + let target_type = detect_scope_type(path); + + match target_type { + TargetType::File => { + let _ = scope.allow_file(path); + } + TargetType::Directory => { + // We remove the '*' at the end of it, else it will be escaped by the pattern. + let _ = scope.allow_directory(fix_directory(path), false); + } + TargetType::RecursiveDirectory => { + // We remove the '**' at the end of it, else it will be escaped by the pattern. + let _ = scope.allow_directory(fix_directory(path), true); + } + } +} + +fn forbid_path(scope: &FsScope, path: &str) { + let target_type = detect_scope_type(path); + + match target_type { + TargetType::File => { + let _ = scope.forbid_file(path); + } + TargetType::Directory => { + let _ = scope.forbid_directory(fix_directory(path), false); + } + TargetType::RecursiveDirectory => { + let _ = scope.forbid_directory(fix_directory(path), true); + } + } +} + fn save_scopes(app: &AppHandle, app_dir: &Path, scope_state_path: &Path) { let fs_scope = app.fs_scope(); @@ -108,19 +176,18 @@ pub fn init() -> TauriPlugin { .map_err(Error::from) .and_then(|scope| bincode::deserialize(&scope).map_err(Into::into)) .unwrap_or_default(); + for allowed in &scope.allowed_paths { let allowed = fix_pattern(&ac, allowed); - - let _ = fs_scope.allow_file(&allowed); + allow_path(&fs_scope, &allowed); #[cfg(feature = "protocol-asset")] - let _ = asset_protocol_scope.allow_file(&allowed); + allow_path(&asset_protocol_scope, &allowed); } for forbidden in &scope.forbidden_patterns { let forbidden = fix_pattern(&ac, forbidden); - - let _ = fs_scope.forbid_file(&forbidden); + forbid_path(&fs_scope, &forbidden); #[cfg(feature = "protocol-asset")] - let _ = asset_protocol_scope.forbid_file(&forbidden); + forbid_path(&asset_protocol_scope, &forbidden); } // Manually save the fixed scopes to disk once. From 3d4697b34acd056d19112ffd3ec3b3f6a4156c1e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 00:15:29 +0200 Subject: [PATCH 12/17] publish new versions (#417) Co-authored-by: FabianLars --- .changes/persisted-scope-fix-handle-glob-directories.md | 7 ------- plugins/persisted-scope/CHANGELOG.md | 5 +++++ plugins/persisted-scope/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 .changes/persisted-scope-fix-handle-glob-directories.md diff --git a/.changes/persisted-scope-fix-handle-glob-directories.md b/.changes/persisted-scope-fix-handle-glob-directories.md deleted file mode 100644 index 7badc185..00000000 --- a/.changes/persisted-scope-fix-handle-glob-directories.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"persisted-scope": patch ---- - -Fix usage of directory patterns by removing glob asterisks at the end before allowing/forbidding them. - -This was causing them to be escaped, and so undesirable paths were allowed/forbidden while polluting the `.persisted_scope` file. diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md index d1991b01..91e6b20e 100644 --- a/plugins/persisted-scope/CHANGELOG.md +++ b/plugins/persisted-scope/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## \[0.1.2] + +- Fix usage of directory patterns by removing glob asterisks at the end before allowing/forbidding them. This was causing them to be escaped, and so undesirable paths were allowed/forbidden while polluting the `.persisted_scope` file. + - [9174b80](https://github.com/tauri-apps/plugins-workspace/commit/9174b808dc37154999c119fcc3f31258a9c5a3fb) \[persisted scope] fix: handle recursive directory correctly ([#455](https://github.com/tauri-apps/plugins-workspace/pull/455)) on 2023-06-29 + ## \[0.1.1] - The MSRV was raised to 1.64! diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index 5e25f178..eafad0bd 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-persisted-scope" -version = "0.1.1" +version = "0.1.2" description = "Save filesystem and asset scopes and restore them when the app is reopened." authors.workspace = true license.workspace = true From 8916544034ed367b3a4091f7714350b672cc846e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 00:26:02 +0200 Subject: [PATCH 13/17] remove changefiles to publish release (#456) Co-authored-by: FabianLars --- .changes/stronghold-arg-name.md | 5 ----- .changes/stronghold-constructor.md | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 .changes/stronghold-arg-name.md delete mode 100644 .changes/stronghold-constructor.md diff --git a/.changes/stronghold-arg-name.md b/.changes/stronghold-arg-name.md deleted file mode 100644 index 61efc0ed..00000000 --- a/.changes/stronghold-arg-name.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"stronghold-js": patch ---- - -Change the argument name of the `Stronghold.remove` from `location` to `recordPath` to match the Stronghold command argument diff --git a/.changes/stronghold-constructor.md b/.changes/stronghold-constructor.md deleted file mode 100644 index 99966095..00000000 --- a/.changes/stronghold-constructor.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"stronghold-js": minor ---- - -Added `Stronghold.load` and removed its constructor. From d9b2331237dc3764e8b9b023110f2cd7cf69dbc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 10:50:38 +0200 Subject: [PATCH 14/17] chore(deps): update dependency eslint-config-standard-with-typescript to v36 (#458) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8872a988..a9d6f11f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@typescript-eslint/parser": "^5.58.0", "eslint": "^8.38.0", "eslint-config-prettier": "^8.8.0", - "eslint-config-standard-with-typescript": "^35.0.0", + "eslint-config-standard-with-typescript": "^36.0.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^16.0.0", "eslint-plugin-promise": "^6.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5ee8389..da5be54f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.1' +lockfileVersion: '6.0' settings: autoInstallPeers: true @@ -30,8 +30,8 @@ importers: specifier: ^8.8.0 version: 8.8.0(eslint@8.38.0) eslint-config-standard-with-typescript: - specifier: ^35.0.0 - version: 35.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4) + specifier: ^36.0.0 + version: 36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4) eslint-plugin-import: specifier: ^2.27.5 version: 2.27.5(@typescript-eslint/parser@5.58.0)(eslint@8.38.0) @@ -1311,8 +1311,8 @@ packages: eslint: 8.38.0 dev: true - /eslint-config-standard-with-typescript@35.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4): - resolution: {integrity: sha512-Xa7DY9GgduZyp0qmXxBF0/dB+Vm4/DgWu1lGpNLJV2d46aCaUxTKDEnkzjUWX/1O9S0a+Dhnw7A4oI0JpYzwtw==} + /eslint-config-standard-with-typescript@36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4): + resolution: {integrity: sha512-8ZSEskfrDAkUF2lTQLMT0CBzgRNlx1uIM7l2I7L683dKAXUdHuEL2x+GxuGAsdsoWbx7W7Zv0xF67VCEZXIk0Q==} peerDependencies: '@typescript-eslint/eslint-plugin': ^5.50.0 eslint: ^8.0.1 From 36b7296746bf8d41f0790d8ecd9b097430750a47 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 10:52:33 +0200 Subject: [PATCH 15/17] chore(deps): update dependency svelte to v4 (#453) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../examples/svelte-app/package.json | 2 +- pnpm-lock.yaml | 127 +++++++++++++++--- 2 files changed, 107 insertions(+), 22 deletions(-) diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index fdf793cc..c0b588b6 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -14,7 +14,7 @@ "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/kit": "^1.15.5", "@tauri-apps/cli": "^1.2.3", - "svelte": "^3.58.0", + "svelte": "^4.0.0", "svelte-check": "^3.2.0", "tslib": "^2.5.0", "typescript": "^5.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da5be54f..8b4c3f2f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -181,16 +181,16 @@ importers: version: 2.0.0(@sveltejs/kit@1.15.5) '@sveltejs/kit': specifier: ^1.15.5 - version: 1.15.5(svelte@3.58.0)(vite@4.2.1) + version: 1.15.5(svelte@4.0.0)(vite@4.2.1) '@tauri-apps/cli': specifier: ^1.2.3 version: 1.2.3 svelte: - specifier: ^3.58.0 - version: 3.58.0 + specifier: ^4.0.0 + version: 4.0.0 svelte-check: specifier: ^3.2.0 - version: 3.2.0(svelte@3.58.0) + version: 3.2.0(svelte@4.0.0) tslib: specifier: ^2.5.0 version: 2.5.0 @@ -213,6 +213,14 @@ importers: packages: + /@ampproject/remapping@2.2.1: + resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.18 + dev: true + /@esbuild/android-arm64@0.17.17: resolution: {integrity: sha512-jaJ5IlmaDLFPNttv0ofcwy/cfeY4bh/n705Tgh+eLObbGtQBK3EPAu+CzL95JVE4nFAliyrnEu0d32Q5foavqg==} engines: {node: '>=12'} @@ -606,11 +614,11 @@ packages: peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.15.5(svelte@3.58.0)(vite@4.2.1) + '@sveltejs/kit': 1.15.5(svelte@4.0.0)(vite@4.2.1) import-meta-resolve: 2.2.2 dev: true - /@sveltejs/kit@1.15.5(svelte@3.58.0)(vite@4.2.1): + /@sveltejs/kit@1.15.5(svelte@4.0.0)(vite@4.2.1): resolution: {integrity: sha512-NyNtgIJBNo3AXMkl0iN10VrKgQS6VM6E+rcqZnZMn12dOo7SwFflj1du0ZgXNCZ1tx6VuEpSz9+FpPjswr4gEg==} engines: {node: ^16.14 || >=18} hasBin: true @@ -619,7 +627,7 @@ packages: svelte: ^3.54.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.0.4(svelte@3.58.0)(vite@4.2.1) + '@sveltejs/vite-plugin-svelte': 2.0.4(svelte@4.0.0)(vite@4.2.1) '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.3.0 @@ -630,7 +638,7 @@ packages: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.2 - svelte: 3.58.0 + svelte: 4.0.0 tiny-glob: 0.2.9 undici: 5.20.0 vite: 4.2.1 @@ -638,7 +646,7 @@ packages: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@2.0.4(svelte@3.58.0)(vite@4.2.1): + /@sveltejs/vite-plugin-svelte@2.0.4(svelte@4.0.0)(vite@4.2.1): resolution: {integrity: sha512-pjqhW00KwK2uzDGEr+yJBwut+D+4XfJO/+bHHdHzPRXn9+1Jeq5JcFHyrUiYaXgHtyhX0RsllCTm4ssAx4ZY7Q==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -649,8 +657,8 @@ packages: deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 - svelte: 3.58.0 - svelte-hmr: 0.15.1(svelte@3.58.0) + svelte: 4.0.0 + svelte-hmr: 0.15.1(svelte@4.0.0) vite: 4.2.1 vitefu: 0.2.4(vite@4.2.1) transitivePeerDependencies: @@ -964,6 +972,12 @@ packages: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true + /aria-query@5.3.0: + resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==} + dependencies: + dequal: 2.0.3 + dev: true + /array-buffer-byte-length@1.0.0: resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} dependencies: @@ -1012,6 +1026,12 @@ packages: engines: {node: '>= 0.4'} dev: true + /axobject-query@3.2.1: + resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} + dependencies: + dequal: 2.0.3 + dev: true + /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: true @@ -1096,6 +1116,16 @@ packages: fsevents: 2.3.2 dev: true + /code-red@1.0.3: + resolution: {integrity: sha512-kVwJELqiILQyG5aeuyKFbdsI1fmQy1Cmf7dQ8eGmVuJoaRVdwey7WaMknr2ZFeVSYSKT0rExsa8EGw0aoI/1QQ==} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + '@types/estree': 1.0.0 + acorn: 8.8.2 + estree-walker: 3.0.3 + periscopic: 3.1.0 + dev: true + /color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -1129,6 +1159,14 @@ packages: which: 2.0.2 dev: true + /css-tree@2.3.1: + resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + dependencies: + mdn-data: 2.0.30 + source-map-js: 1.0.2 + dev: true + /debug@3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: @@ -1169,6 +1207,11 @@ packages: object-keys: 1.1.1 dev: true + /dequal@2.0.3: + resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} + engines: {node: '>=6'} + dev: true + /detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -1573,6 +1616,12 @@ packages: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} dev: true + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.0 + dev: true + /esutils@2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} @@ -1939,6 +1988,12 @@ packages: engines: {node: '>=8'} dev: true + /is-reference@3.0.1: + resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} + dependencies: + '@types/estree': 1.0.0 + dev: true + /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -2027,6 +2082,10 @@ packages: type-check: 0.4.0 dev: true + /locate-character@3.0.0: + resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==} + dev: true + /locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} @@ -2059,6 +2118,10 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true + /mdn-data@2.0.30: + resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} + dev: true + /merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -2228,6 +2291,14 @@ packages: engines: {node: '>=8'} dev: true + /periscopic@3.1.0: + resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==} + dependencies: + '@types/estree': 1.0.0 + estree-walker: 3.0.3 + is-reference: 3.0.1 + dev: true + /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true @@ -2536,7 +2607,7 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check@3.2.0(svelte@3.58.0): + /svelte-check@3.2.0(svelte@4.0.0): resolution: {integrity: sha512-6ZnscN8dHEN5Eq5LgIzjj07W9nc9myyBH+diXsUAuiY/3rt0l65/LCIQYlIuoFEjp2F1NhXqZiJwV9omPj9tMw==} hasBin: true peerDependencies: @@ -2548,8 +2619,8 @@ packages: import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 3.58.0 - svelte-preprocess: 5.0.3(svelte@3.58.0)(typescript@5.0.4) + svelte: 4.0.0 + svelte-preprocess: 5.0.3(svelte@4.0.0)(typescript@5.0.4) typescript: 5.0.4 transitivePeerDependencies: - '@babel/core' @@ -2563,16 +2634,16 @@ packages: - sugarss dev: true - /svelte-hmr@0.15.1(svelte@3.58.0): + /svelte-hmr@0.15.1(svelte@4.0.0): resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.58.0 + svelte: 4.0.0 dev: true - /svelte-preprocess@5.0.3(svelte@3.58.0)(typescript@5.0.4): + /svelte-preprocess@5.0.3(svelte@4.0.0)(typescript@5.0.4): resolution: {integrity: sha512-GrHF1rusdJVbOZOwgPWtpqmaexkydznKzy5qIC2FabgpFyKN57bjMUUUqPRfbBXK5igiEWn1uO/DXsa2vJ5VHA==} engines: {node: '>= 14.10.0'} requiresBuild: true @@ -2615,13 +2686,27 @@ packages: magic-string: 0.27.0 sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 3.58.0 + svelte: 4.0.0 typescript: 5.0.4 dev: true - /svelte@3.58.0: - resolution: {integrity: sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==} - engines: {node: '>= 8'} + /svelte@4.0.0: + resolution: {integrity: sha512-+yCYu3AEUu9n91dnQNGIbnVp8EmNQtuF/YImW4+FTXRHard7NMo+yTsWzggPAbj3fUEJ1FBJLkql/jkp6YB5pg==} + engines: {node: '>=16'} + dependencies: + '@ampproject/remapping': 2.2.1 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.18 + acorn: 8.8.2 + aria-query: 5.3.0 + axobject-query: 3.2.1 + code-red: 1.0.3 + css-tree: 2.3.1 + estree-walker: 3.0.3 + is-reference: 3.0.1 + locate-character: 3.0.0 + magic-string: 0.30.0 + periscopic: 3.1.0 dev: true /terser@5.16.9: From 92233ea64abbbaeaa7b4d8be5dcddaee3f6a70a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:46:51 +0200 Subject: [PATCH 16/17] fix(deps): update rust crate sqlx to 0.7. plugin-sql msrv is now 1.65 (#464) * fix(deps): update rust crate sqlx to 0.7 * Update sql's msrv in workflow to 1.65 * Update README.md * Update Cargo.toml * Update Cargo.toml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Fabian-Lars --- .github/workflows/msrv-check.yml | 2 + Cargo.lock | 409 ++++++++++++++++++++----------- plugins/sql/Cargo.toml | 7 +- plugins/sql/README.md | 2 +- 4 files changed, 267 insertions(+), 153 deletions(-) diff --git a/.github/workflows/msrv-check.yml b/.github/workflows/msrv-check.yml index 807bbcad..4bc11ff0 100644 --- a/.github/workflows/msrv-check.yml +++ b/.github/workflows/msrv-check.yml @@ -45,6 +45,8 @@ jobs: - name: build run: cargo build --workspace --exclude 'tauri-plugin-sql' --all-targets --all-features + - uses: dtolnay/rust-toolchain@1.65.0 + - name: build sql:sqlite run: cargo build --package 'tauri-plugin-sql' --all-targets --features sqlite diff --git a/Cargo.lock b/Cargo.lock index 500fcca3..b7661514 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,6 +54,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.8", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -128,7 +140,7 @@ checksum = "1b19760fa2b7301cf235360ffd6d3558b1ed4249edd16d6cca8d690cee265b95" dependencies = [ "event-listener", "futures-core", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] @@ -229,9 +241,9 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -325,6 +337,9 @@ name = "bitflags" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f6e5df9abedba5099a01a6567c6086a6fbcff57af07c360d356737f9e0c644" +dependencies = [ + "serde", +] [[package]] name = "blake2" @@ -649,9 +664,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" [[package]] name = "constant_time_eq" @@ -768,16 +783,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -940,13 +945,13 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "der" -version = "0.5.1" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" dependencies = [ "const-oid", - "crypto-bigint", "pem-rfc7468", + "zeroize", ] [[package]] @@ -999,6 +1004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid", "crypto-common", "subtle", ] @@ -1084,7 +1090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek", - "hashbrown", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "sha2 0.9.9", @@ -1096,6 +1102,9 @@ name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +dependencies = [ + "serde", +] [[package]] name = "embed_plist" @@ -1133,6 +1142,23 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1295,13 +1321,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -1676,7 +1702,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -1689,16 +1715,22 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "hashlink" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -1761,6 +1793,15 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "html5ever" version = "0.25.2" @@ -1940,7 +1981,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -2234,9 +2285,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -2560,17 +2611,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint-dig" version = "0.8.2" @@ -2802,17 +2842,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2820,21 +2849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2867,9 +2882,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.3.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -3022,24 +3037,23 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.3.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ "der", "pkcs8", - "zeroize", + "spki", ] [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", - "zeroize", ] [[package]] @@ -3055,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" dependencies = [ "base64 0.13.1", - "indexmap", + "indexmap 1.9.2", "line-wrap", "quick-xml", "serde", @@ -3408,11 +3422,12 @@ dependencies = [ [[package]] name = "rsa" -version = "0.6.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" dependencies = [ "byteorder", + "const-oid", "digest 0.10.6", "num-bigint-dig", "num-integer", @@ -3421,7 +3436,8 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core 0.6.4", - "smallvec", + "signature", + "spki", "subtle", "zeroize", ] @@ -3464,14 +3480,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" dependencies = [ - "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -3483,6 +3498,16 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.11" @@ -3781,6 +3806,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] + [[package]] name = "siphasher" version = "0.3.10" @@ -3857,9 +3892,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.5.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", "der", @@ -3878,104 +3913,204 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" +checksum = "91ef53c86d2066e04f0ac6b1364f16d13d82388e2d07f11a5c71782345555761" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" +checksum = "8a22fd81e9c1ad53c562edb869ff042b215d4eadefefc4784bacfbfd19835945" dependencies = [ - "ahash", + "ahash 0.8.3", "atoi", - "base64 0.13.1", - "bitflags 1.3.2", "byteorder", "bytes 1.4.0", "crc", "crossbeam-queue", - "digest 0.10.6", - "dirs", "dotenvy", "either", "event-listener", - "flume", "futures-channel", "futures-core", - "futures-executor", "futures-intrusive", + "futures-io", "futures-util", - "generic-array", "hashlink", "hex", - "hkdf", - "hmac", - "indexmap", - "itoa 1.0.5", - "libc", - "libsqlite3-sys", + "indexmap 2.0.0", "log", - "md-5", "memchr", - "num-bigint", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", - "rsa", "rustls", "rustls-pemfile", "serde", "serde_json", - "sha1", "sha2 0.10.6", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", "time 0.3.20", + "tokio", "tokio-stream", + "tracing", "url", "webpki-roots", - "whoami", ] [[package]] name = "sqlx-macros" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" +checksum = "00bb7c096a202b8164c175614cbfb79fe0e1e0a3d50e0374526183ef2974e4a2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.107", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d644623ab9699014e5b3cb61a040d16caa50fd477008f63f1399ae35498a58" dependencies = [ "dotenvy", "either", "heck 0.4.0", + "hex", "once_cell", "proc-macro2", "quote", + "serde", "serde_json", "sha2 0.10.6", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.107", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.2" +name = "sqlx-mysql" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" +checksum = "8264c59b28b6858796acfcedc660aa4c9075cc6e4ec8eb03cdca2a3e725726db" dependencies = [ + "atoi", + "base64 0.21.0", + "bitflags 2.0.0", + "byteorder", + "bytes 1.4.0", + "crc", + "digest 0.10.6", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa 1.0.5", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2 0.10.6", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.20", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cab6147b81ca9213a7578f1b4c9d24c449a53953cd2222a7b5d7cd29a5c3139" +dependencies = [ + "atoi", + "base64 0.21.0", + "bitflags 2.0.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa 1.0.5", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2 0.10.6", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.20", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fba60afa64718104b71eec6984f8779d4caffff3b30cde91a75843c7efc126" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time 0.3.20", + "tracing", + "url", ] [[package]] @@ -4007,7 +4142,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -4200,7 +4335,7 @@ dependencies = [ "ndk-sys", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "paste", "png", "raw-window-handle", @@ -4392,7 +4527,7 @@ dependencies = [ [[package]] name = "tauri-plugin-persisted-scope" -version = "0.1.1" +version = "0.1.2" dependencies = [ "aho-corasick 1.0.1", "bincode", @@ -4746,17 +4881,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - [[package]] name = "tokio-stream" version = "0.1.11" @@ -4817,7 +4941,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap", + "indexmap 1.9.2", "nom8", "toml_datetime", ] @@ -4835,6 +4959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5294,23 +5419,13 @@ dependencies = [ "system-deps 6.0.3", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki", ] [[package]] @@ -5365,10 +5480,6 @@ name = "whoami" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" -dependencies = [ - "wasm-bindgen", - "web-sys", -] [[package]] name = "winapi" diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index 91a839ac..7e25aeac 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -5,7 +5,8 @@ description = "Interface with SQL databases." authors.workspace = true license.workspace = true edition.workspace = true -rust-version.workspace = true +#rust-version.workspace = true +rust-version = "1.65" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,11 +17,11 @@ tauri.workspace = true log.workspace = true thiserror.workspace = true futures-core = "0.3" -sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "json", "time"] } +sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "json", "time"] } time = "0.3" tokio = { version = "1", features = ["sync"] } [features] sqlite = ["sqlx/sqlite"] mysql = ["sqlx/mysql"] -postgres = ["sqlx/postgres"] \ No newline at end of file +postgres = ["sqlx/postgres"] diff --git a/plugins/sql/README.md b/plugins/sql/README.md index 9f263742..7b781151 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -4,7 +4,7 @@ Interface with SQL databases through [sqlx](https://github.com/launchbadge/sqlx) ## Install -_This plugin requires a Rust version of at least **1.64**_ +_This plugin requires a Rust version of at least **1.65**_ There are three general methods of installation that we can recommend. From 0d0ed7b9075ee21f37d787217fba3ef0784b2449 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 11:47:41 +0200 Subject: [PATCH 17/17] chore(deps): update dependency prettier to v3 (#467) * chore(deps): update dependency prettier to v3 * fmt * semver override * update example deps --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars --- .scripts/covector/package-latest-version.cjs | 2 +- package.json | 5 +- plugins/authenticator/README.md | 4 +- plugins/authenticator/guest-js/index.ts | 6 +- plugins/authenticator/rollup.config.mjs | 2 +- plugins/autostart/rollup.config.mjs | 2 +- plugins/fs-extra/rollup.config.mjs | 2 +- plugins/fs-watch/README.md | 4 +- plugins/fs-watch/guest-js/index.ts | 8 +- plugins/fs-watch/rollup.config.mjs | 2 +- plugins/log/guest-js/index.ts | 14 +- plugins/log/rollup.config.mjs | 2 +- plugins/positioner/rollup.config.mjs | 2 +- plugins/sql/guest-js/index.ts | 2 +- plugins/sql/rollup.config.mjs | 2 +- plugins/store/guest-js/index.ts | 4 +- plugins/store/rollup.config.mjs | 2 +- plugins/stronghold/guest-js/index.ts | 16 +- plugins/stronghold/rollup.config.mjs | 2 +- plugins/upload/README.md | 4 +- plugins/upload/guest-js/index.ts | 4 +- plugins/upload/rollup.config.mjs | 2 +- .../examples/svelte-app/package.json | 16 +- .../examples/svelte-app/src/app.html | 2 +- plugins/websocket/guest-js/index.ts | 2 +- plugins/websocket/rollup.config.mjs | 2 +- plugins/window-state/guest-js/index.ts | 2 +- plugins/window-state/rollup.config.mjs | 2 +- pnpm-lock.yaml | 516 +++++++++++------- shared/template/rollup.config.mjs | 2 +- 30 files changed, 385 insertions(+), 252 deletions(-) diff --git a/.scripts/covector/package-latest-version.cjs b/.scripts/covector/package-latest-version.cjs index 9ff107c3..06f3ff24 100644 --- a/.scripts/covector/package-latest-version.cjs +++ b/.scripts/covector/package-latest-version.cjs @@ -48,7 +48,7 @@ https.get(url, options, (response) => { console.log(versions.length ? versions[0].num : "0.0.0"); } else if (kind === "npm") { const versions = Object.keys(data.versions).filter((v) => - v.startsWith(target) + v.startsWith(target), ); console.log(versions[versions.length - 1] || "0.0.0"); } diff --git a/package.json b/package.json index a9d6f11f..725d5802 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,13 @@ "eslint-plugin-n": "^16.0.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-security": "^1.7.1", - "prettier": "^2.8.7", + "prettier": "^3.0.0", "rollup": "^3.20.4", "typescript": "^5.0.4" }, + "resolutions": { + "semver": ">=7.5.2" + }, "engines": { "pnpm": ">=7.33.0" } diff --git a/plugins/authenticator/README.md b/plugins/authenticator/README.md index 41a38510..936ca8c5 100644 --- a/plugins/authenticator/README.md +++ b/plugins/authenticator/README.md @@ -76,7 +76,7 @@ const r2 = await auth.verifyRegistration( challenge, app, registerResult.registerData, - registerResult.clientData + registerResult.clientData, ); const j2 = JSON.parse(r2); @@ -91,7 +91,7 @@ const counter = await auth.verifySignature( signData.signData, clientData, keyHandle, - pubkey + pubkey, ); if (counter && counter > 0) { diff --git a/plugins/authenticator/guest-js/index.ts b/plugins/authenticator/guest-js/index.ts index 8b4a533c..ab3be8b9 100644 --- a/plugins/authenticator/guest-js/index.ts +++ b/plugins/authenticator/guest-js/index.ts @@ -17,7 +17,7 @@ export class Authenticator { challenge: string, application: string, registerData: string, - clientData: string + clientData: string, ): Promise { return await invoke("plugin:authenticator|verify_registration", { challenge, @@ -30,7 +30,7 @@ export class Authenticator { async sign( challenge: string, application: string, - keyHandle: string + keyHandle: string, ): Promise { return await invoke("plugin:authenticator|sign", { timeout: 10000, @@ -46,7 +46,7 @@ export class Authenticator { signData: string, clientData: string, keyHandle: string, - pubkey: string + pubkey: string, ): Promise { return await invoke("plugin:authenticator|verify_signature", { challenge, diff --git a/plugins/authenticator/rollup.config.mjs b/plugins/authenticator/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/authenticator/rollup.config.mjs +++ b/plugins/authenticator/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/autostart/rollup.config.mjs b/plugins/autostart/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/autostart/rollup.config.mjs +++ b/plugins/autostart/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/fs-extra/rollup.config.mjs b/plugins/fs-extra/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/fs-extra/rollup.config.mjs +++ b/plugins/fs-extra/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/fs-watch/README.md b/plugins/fs-watch/README.md index 34659a9b..be752fb7 100644 --- a/plugins/fs-watch/README.md +++ b/plugins/fs-watch/README.md @@ -59,7 +59,7 @@ const stopWatching = await watch( (event) => { const { kind, path } = event; }, - { recursive: true } + { recursive: true }, ); const stopRawWatcher = await watchImmediate( @@ -67,7 +67,7 @@ const stopRawWatcher = await watchImmediate( (event) => { const { type, paths, attrs } = event; }, - {} + {}, ); ``` diff --git a/plugins/fs-watch/guest-js/index.ts b/plugins/fs-watch/guest-js/index.ts index 05ed07e5..d5370dec 100644 --- a/plugins/fs-watch/guest-js/index.ts +++ b/plugins/fs-watch/guest-js/index.ts @@ -45,7 +45,7 @@ async function unwatch(id: number): Promise { export async function watch( paths: string | string[], cb: (event: DebouncedEvent) => void, - options: DebouncedWatchOptions = {} + options: DebouncedWatchOptions = {}, ): Promise { const opts = { recursive: false, @@ -71,7 +71,7 @@ export async function watch( `watcher://debounced-event/${id}`, (event) => { cb(event.payload); - } + }, ); return () => { @@ -83,7 +83,7 @@ export async function watch( export async function watchImmediate( paths: string | string[], cb: (event: RawEvent) => void, - options: WatchOptions = {} + options: WatchOptions = {}, ): Promise { const opts = { recursive: false, @@ -109,7 +109,7 @@ export async function watchImmediate( `watcher://raw-event/${id}`, (event) => { cb(event.payload); - } + }, ); return () => { diff --git a/plugins/fs-watch/rollup.config.mjs b/plugins/fs-watch/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/fs-watch/rollup.config.mjs +++ b/plugins/fs-watch/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/log/guest-js/index.ts b/plugins/log/guest-js/index.ts index 77ab7009..5f1c1d92 100644 --- a/plugins/log/guest-js/index.ts +++ b/plugins/log/guest-js/index.ts @@ -43,7 +43,7 @@ enum LogLevel { async function log( level: LogLevel, message: string, - options?: LogOptions + options?: LogOptions, ): Promise { const traces = new Error().stack?.split("\n").map((line) => line.split("@")); @@ -86,7 +86,7 @@ async function log( */ export async function error( message: string, - options?: LogOptions + options?: LogOptions, ): Promise { await log(LogLevel.Error, message, options); } @@ -108,7 +108,7 @@ export async function error( */ export async function warn( message: string, - options?: LogOptions + options?: LogOptions, ): Promise { await log(LogLevel.Warn, message, options); } @@ -130,7 +130,7 @@ export async function warn( */ export async function info( message: string, - options?: LogOptions + options?: LogOptions, ): Promise { await log(LogLevel.Info, message, options); } @@ -152,7 +152,7 @@ export async function info( */ export async function debug( message: string, - options?: LogOptions + options?: LogOptions, ): Promise { await log(LogLevel.Debug, message, options); } @@ -174,7 +174,7 @@ export async function debug( */ export async function trace( message: string, - options?: LogOptions + options?: LogOptions, ): Promise { await log(LogLevel.Trace, message, options); } @@ -193,7 +193,7 @@ export async function attachConsole(): Promise { // TODO: Investigate security/detect-unsafe-regex // eslint-disable-next-line no-control-regex, security/detect-unsafe-regex /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, - "" + "", ); switch (payload.level) { diff --git a/plugins/log/rollup.config.mjs b/plugins/log/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/log/rollup.config.mjs +++ b/plugins/log/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/positioner/rollup.config.mjs b/plugins/positioner/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/positioner/rollup.config.mjs +++ b/plugins/positioner/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/sql/guest-js/index.ts b/plugins/sql/guest-js/index.ts index a574e72e..c9824f7c 100644 --- a/plugins/sql/guest-js/index.ts +++ b/plugins/sql/guest-js/index.ts @@ -89,7 +89,7 @@ export default class Database { db: this.path, query, values: bindValues ?? [], - } + }, ); return { diff --git a/plugins/sql/rollup.config.mjs b/plugins/sql/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/sql/rollup.config.mjs +++ b/plugins/sql/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/store/guest-js/index.ts b/plugins/store/guest-js/index.ts index cc6058d8..93cde484 100644 --- a/plugins/store/guest-js/index.ts +++ b/plugins/store/guest-js/index.ts @@ -177,7 +177,7 @@ export class Store { */ async onKeyChange( key: string, - cb: (value: T | null) => void + cb: (value: T | null) => void, ): Promise { return await listen>("store://change", (event) => { if (event.payload.path === this.path && event.payload.key === key) { @@ -192,7 +192,7 @@ export class Store { * @returns A promise resolving to a function to unlisten to the event. */ async onChange( - cb: (key: string, value: T | null) => void + cb: (key: string, value: T | null) => void, ): Promise { return await listen>("store://change", (event) => { if (event.payload.path === this.path) { diff --git a/plugins/store/rollup.config.mjs b/plugins/store/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/store/rollup.config.mjs +++ b/plugins/store/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/stronghold/guest-js/index.ts b/plugins/stronghold/guest-js/index.ts index 26c03958..154f7f2a 100644 --- a/plugins/stronghold/guest-js/index.ts +++ b/plugins/stronghold/guest-js/index.ts @@ -23,7 +23,7 @@ export type StoreKey = | ArrayBuffer; function toBytesDto( - v: ClientPath | VaultPath | RecordPath | StoreKey + v: ClientPath | VaultPath | RecordPath | StoreKey, ): string | number[] { if (typeof v === "string") { return v; @@ -125,7 +125,7 @@ class ProcedureExecutor { */ async generateSLIP10Seed( outputLocation: Location, - sizeBytes?: number + sizeBytes?: number, ): Promise { return await invoke("plugin:stronghold|execute_procedure", { ...this.procedureArgs, @@ -152,7 +152,7 @@ class ProcedureExecutor { chain: number[], source: "Seed" | "Key", sourceLocation: Location, - outputLocation: Location + outputLocation: Location, ): Promise { return await invoke("plugin:stronghold|execute_procedure", { ...this.procedureArgs, @@ -181,7 +181,7 @@ class ProcedureExecutor { async recoverBIP39( mnemonic: string, outputLocation: Location, - passphrase?: string + passphrase?: string, ): Promise { return await invoke("plugin:stronghold|execute_procedure", { ...this.procedureArgs, @@ -205,7 +205,7 @@ class ProcedureExecutor { */ async generateBIP39( outputLocation: Location, - passphrase?: string + passphrase?: string, ): Promise { return await invoke("plugin:stronghold|execute_procedure", { ...this.procedureArgs, @@ -245,7 +245,7 @@ class ProcedureExecutor { */ async signEd25519( privateKeyLocation: Location, - msg: string + msg: string, ): Promise { return await invoke("plugin:stronghold|execute_procedure", { ...this.procedureArgs, @@ -310,7 +310,7 @@ export class Store { async insert( key: StoreKey, value: number[], - lifetime?: Duration + lifetime?: Duration, ): Promise { return await invoke("plugin:stronghold|save_store_record", { snapshotPath: this.path, @@ -328,7 +328,7 @@ export class Store { snapshotPath: this.path, client: this.client, key: toBytesDto(key), - } + }, ).then((v) => (v != null ? Uint8Array.from(v) : null)); } } diff --git a/plugins/stronghold/rollup.config.mjs b/plugins/stronghold/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/stronghold/rollup.config.mjs +++ b/plugins/stronghold/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/upload/README.md b/plugins/upload/README.md index 64e1a891..6bba0e94 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -58,7 +58,7 @@ upload( "https://example.com/file-upload", "./path/to/my/file.txt", (progress, total) => console.log(`Uploaded ${progress} of ${total} bytes`), // a callback that will be called with the upload progress - { "Content-Type": "text/plain" } // optional headers to send with the request + { "Content-Type": "text/plain" }, // optional headers to send with the request ); ``` @@ -69,7 +69,7 @@ download( "https://example.com/file-download-link", "./path/to/save/my/file.txt", (progress, total) => console.log(`Downloaded ${progress} of ${total} bytes`), // a callback that will be called with the download progress - { "Content-Type": "text/plain" } // optional headers to send with the request + { "Content-Type": "text/plain" }, // optional headers to send with the request ); ``` diff --git a/plugins/upload/guest-js/index.ts b/plugins/upload/guest-js/index.ts index 26bc93b4..f59ea0fe 100644 --- a/plugins/upload/guest-js/index.ts +++ b/plugins/upload/guest-js/index.ts @@ -31,7 +31,7 @@ async function upload( url: string, filePath: string, progressHandler?: ProgressHandler, - headers?: Map + headers?: Map, ): Promise { const ids = new Uint32Array(1); window.crypto.getRandomValues(ids); @@ -59,7 +59,7 @@ async function download( url: string, filePath: string, progressHandler?: ProgressHandler, - headers?: Map + headers?: Map, ): Promise { const ids = new Uint32Array(1); window.crypto.getRandomValues(ids); diff --git a/plugins/upload/rollup.config.mjs b/plugins/upload/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/upload/rollup.config.mjs +++ b/plugins/upload/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index c0b588b6..09d53285 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -11,14 +11,14 @@ "tauri": "tauri" }, "devDependencies": { - "@sveltejs/adapter-auto": "^2.0.0", - "@sveltejs/kit": "^1.15.5", - "@tauri-apps/cli": "^1.2.3", - "svelte": "^4.0.0", - "svelte-check": "^3.2.0", - "tslib": "^2.5.0", - "typescript": "^5.0.4", - "vite": "^4.2.1" + "@sveltejs/adapter-auto": "^2.1.0", + "@sveltejs/kit": "^1.22.0", + "@tauri-apps/cli": "^1.4.0", + "svelte": "^4.0.4", + "svelte-check": "^3.4.4", + "tslib": "^2.6.0", + "typescript": "^5.1.6", + "vite": "^4.4.0" }, "dependencies": { "tauri-plugin-websocket-api": "link:../../" diff --git a/plugins/websocket/examples/svelte-app/src/app.html b/plugins/websocket/examples/svelte-app/src/app.html index 46d06d3b..73cf3cd3 100644 --- a/plugins/websocket/examples/svelte-app/src/app.html +++ b/plugins/websocket/examples/svelte-app/src/app.html @@ -1,4 +1,4 @@ - + diff --git a/plugins/websocket/guest-js/index.ts b/plugins/websocket/guest-js/index.ts index 9dc5b4d8..27beee5f 100644 --- a/plugins/websocket/guest-js/index.ts +++ b/plugins/websocket/guest-js/index.ts @@ -53,7 +53,7 @@ export default class WebSocket { m = { type: "Binary", data: message }; } else { throw new Error( - "invalid `message` type, expected a `{ type: string, data: any }` object, a string or a numeric array" + "invalid `message` type, expected a `{ type: string, data: any }` object, a string or a numeric array", ); } return await invoke("plugin:websocket|send", { diff --git a/plugins/websocket/rollup.config.mjs b/plugins/websocket/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/websocket/rollup.config.mjs +++ b/plugins/websocket/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/plugins/window-state/guest-js/index.ts b/plugins/window-state/guest-js/index.ts index 0cc32649..680b5f35 100644 --- a/plugins/window-state/guest-js/index.ts +++ b/plugins/window-state/guest-js/index.ts @@ -23,7 +23,7 @@ async function saveWindowState(flags: StateFlags): Promise { */ async function restoreState( label: WindowLabel, - flags: StateFlags + flags: StateFlags, ): Promise { return invoke("plugin:window-state|restore_state", { label, flags }); } diff --git a/plugins/window-state/rollup.config.mjs b/plugins/window-state/rollup.config.mjs index 6555e98b..99a3dd31 100644 --- a/plugins/window-state/rollup.config.mjs +++ b/plugins/window-state/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b4c3f2f..ec68106e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,12 @@ -lockfileVersion: '6.0' +lockfileVersion: '6.1' settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + semver: '>=7.5.2' + importers: .: @@ -31,13 +34,13 @@ importers: version: 8.8.0(eslint@8.38.0) eslint-config-standard-with-typescript: specifier: ^36.0.0 - version: 36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4) + version: 36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4) eslint-plugin-import: specifier: ^2.27.5 version: 2.27.5(@typescript-eslint/parser@5.58.0)(eslint@8.38.0) eslint-plugin-n: specifier: ^16.0.0 - version: 16.0.0(eslint@8.38.0) + version: 16.0.1(eslint@8.38.0) eslint-plugin-promise: specifier: ^6.1.1 version: 6.1.1(eslint@8.38.0) @@ -45,8 +48,8 @@ importers: specifier: ^1.7.1 version: 1.7.1 prettier: - specifier: ^2.8.7 - version: 2.8.7 + specifier: ^3.0.0 + version: 3.0.0 rollup: specifier: ^3.20.4 version: 3.20.4 @@ -177,29 +180,29 @@ importers: version: link:../.. devDependencies: '@sveltejs/adapter-auto': - specifier: ^2.0.0 - version: 2.0.0(@sveltejs/kit@1.15.5) + specifier: ^2.1.0 + version: 2.1.0(@sveltejs/kit@1.22.0) '@sveltejs/kit': - specifier: ^1.15.5 - version: 1.15.5(svelte@4.0.0)(vite@4.2.1) + specifier: ^1.22.0 + version: 1.22.0(svelte@4.0.4)(vite@4.4.0) '@tauri-apps/cli': - specifier: ^1.2.3 - version: 1.2.3 + specifier: ^1.4.0 + version: 1.4.0 svelte: - specifier: ^4.0.0 - version: 4.0.0 + specifier: ^4.0.4 + version: 4.0.4 svelte-check: - specifier: ^3.2.0 - version: 3.2.0(svelte@4.0.0) + specifier: ^3.4.4 + version: 3.4.4(svelte@4.0.4) tslib: - specifier: ^2.5.0 - version: 2.5.0 + specifier: ^2.6.0 + version: 2.6.0 typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 vite: - specifier: ^4.2.1 - version: 4.2.1 + specifier: ^4.4.0 + version: 4.4.0 plugins/window-state: dependencies: @@ -221,8 +224,8 @@ packages: '@jridgewell/trace-mapping': 0.3.18 dev: true - /@esbuild/android-arm64@0.17.17: - resolution: {integrity: sha512-jaJ5IlmaDLFPNttv0ofcwy/cfeY4bh/n705Tgh+eLObbGtQBK3EPAu+CzL95JVE4nFAliyrnEu0d32Q5foavqg==} + /@esbuild/android-arm64@0.18.11: + resolution: {integrity: sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -230,8 +233,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.17.17: - resolution: {integrity: sha512-E6VAZwN7diCa3labs0GYvhEPL2M94WLF8A+czO8hfjREXxba8Ng7nM5VxV+9ihNXIY1iQO1XxUU4P7hbqbICxg==} + /@esbuild/android-arm@0.18.11: + resolution: {integrity: sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -239,8 +242,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.17.17: - resolution: {integrity: sha512-446zpfJ3nioMC7ASvJB1pszHVskkw4u/9Eu8s5yvvsSDTzYh4p4ZIRj0DznSl3FBF0Z/mZfrKXTtt0QCoFmoHA==} + /@esbuild/android-x64@0.18.11: + resolution: {integrity: sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -248,8 +251,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.17.17: - resolution: {integrity: sha512-m/gwyiBwH3jqfUabtq3GH31otL/0sE0l34XKpSIqR7NjQ/XHQ3lpmQHLHbG8AHTGCw8Ao059GvV08MS0bhFIJQ==} + /@esbuild/darwin-arm64@0.18.11: + resolution: {integrity: sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -257,8 +260,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.17.17: - resolution: {integrity: sha512-4utIrsX9IykrqYaXR8ob9Ha2hAY2qLc6ohJ8c0CN1DR8yWeMrTgYFjgdeQ9LIoTOfLetXjuCu5TRPHT9yKYJVg==} + /@esbuild/darwin-x64@0.18.11: + resolution: {integrity: sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -266,8 +269,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.17.17: - resolution: {integrity: sha512-4PxjQII/9ppOrpEwzQ1b0pXCsFLqy77i0GaHodrmzH9zq2/NEhHMAMJkJ635Ns4fyJPFOlHMz4AsklIyRqFZWA==} + /@esbuild/freebsd-arm64@0.18.11: + resolution: {integrity: sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -275,8 +278,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.17.17: - resolution: {integrity: sha512-lQRS+4sW5S3P1sv0z2Ym807qMDfkmdhUYX30GRBURtLTrJOPDpoU0kI6pVz1hz3U0+YQ0tXGS9YWveQjUewAJw==} + /@esbuild/freebsd-x64@0.18.11: + resolution: {integrity: sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -284,8 +287,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.17.17: - resolution: {integrity: sha512-2+pwLx0whKY1/Vqt8lyzStyda1v0qjJ5INWIe+d8+1onqQxHLLi3yr5bAa4gvbzhZqBztifYEu8hh1La5+7sUw==} + /@esbuild/linux-arm64@0.18.11: + resolution: {integrity: sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -293,8 +296,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.17.17: - resolution: {integrity: sha512-biDs7bjGdOdcmIk6xU426VgdRUpGg39Yz6sT9Xp23aq+IEHDb/u5cbmu/pAANpDB4rZpY/2USPhCA+w9t3roQg==} + /@esbuild/linux-arm@0.18.11: + resolution: {integrity: sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -302,8 +305,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.17.17: - resolution: {integrity: sha512-IBTTv8X60dYo6P2t23sSUYym8fGfMAiuv7PzJ+0LcdAndZRzvke+wTVxJeCq4WgjppkOpndL04gMZIFvwoU34Q==} + /@esbuild/linux-ia32@0.18.11: + resolution: {integrity: sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -311,8 +314,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.17.17: - resolution: {integrity: sha512-WVMBtcDpATjaGfWfp6u9dANIqmU9r37SY8wgAivuKmgKHE+bWSuv0qXEFt/p3qXQYxJIGXQQv6hHcm7iWhWjiw==} + /@esbuild/linux-loong64@0.18.11: + resolution: {integrity: sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -320,8 +323,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.17.17: - resolution: {integrity: sha512-2kYCGh8589ZYnY031FgMLy0kmE4VoGdvfJkxLdxP4HJvWNXpyLhjOvxVsYjYZ6awqY4bgLR9tpdYyStgZZhi2A==} + /@esbuild/linux-mips64el@0.18.11: + resolution: {integrity: sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -329,8 +332,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.17.17: - resolution: {integrity: sha512-KIdG5jdAEeAKogfyMTcszRxy3OPbZhq0PPsW4iKKcdlbk3YE4miKznxV2YOSmiK/hfOZ+lqHri3v8eecT2ATwQ==} + /@esbuild/linux-ppc64@0.18.11: + resolution: {integrity: sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -338,8 +341,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.17.17: - resolution: {integrity: sha512-Cj6uWLBR5LWhcD/2Lkfg2NrkVsNb2sFM5aVEfumKB2vYetkA/9Uyc1jVoxLZ0a38sUhFk4JOVKH0aVdPbjZQeA==} + /@esbuild/linux-riscv64@0.18.11: + resolution: {integrity: sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -347,8 +350,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.17.17: - resolution: {integrity: sha512-lK+SffWIr0XsFf7E0srBjhpkdFVJf3HEgXCwzkm69kNbRar8MhezFpkIwpk0qo2IOQL4JE4mJPJI8AbRPLbuOQ==} + /@esbuild/linux-s390x@0.18.11: + resolution: {integrity: sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -356,8 +359,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.17.17: - resolution: {integrity: sha512-XcSGTQcWFQS2jx3lZtQi7cQmDYLrpLRyz1Ns1DzZCtn898cWfm5Icx/DEWNcTU+T+tyPV89RQtDnI7qL2PObPg==} + /@esbuild/linux-x64@0.18.11: + resolution: {integrity: sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -365,8 +368,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.17.17: - resolution: {integrity: sha512-RNLCDmLP5kCWAJR+ItLM3cHxzXRTe4N00TQyQiimq+lyqVqZWGPAvcyfUBM0isE79eEZhIuGN09rAz8EL5KdLA==} + /@esbuild/netbsd-x64@0.18.11: + resolution: {integrity: sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -374,8 +377,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.17.17: - resolution: {integrity: sha512-PAXswI5+cQq3Pann7FNdcpSUrhrql3wKjj3gVkmuz6OHhqqYxKvi6GgRBoaHjaG22HV/ZZEgF9TlS+9ftHVigA==} + /@esbuild/openbsd-x64@0.18.11: + resolution: {integrity: sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -383,8 +386,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.17.17: - resolution: {integrity: sha512-V63egsWKnx/4V0FMYkr9NXWrKTB5qFftKGKuZKFIrAkO/7EWLFnbBZNM1CvJ6Sis+XBdPws2YQSHF1Gqf1oj/Q==} + /@esbuild/sunos-x64@0.18.11: + resolution: {integrity: sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -392,8 +395,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.17.17: - resolution: {integrity: sha512-YtUXLdVnd6YBSYlZODjWzH+KzbaubV0YVd6UxSfoFfa5PtNJNaW+1i+Hcmjpg2nEe0YXUCNF5bkKy1NnBv1y7Q==} + /@esbuild/win32-arm64@0.18.11: + resolution: {integrity: sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -401,8 +404,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.17.17: - resolution: {integrity: sha512-yczSLRbDdReCO74Yfc5tKG0izzm+lPMYyO1fFTcn0QNwnKmc3K+HdxZWLGKg4pZVte7XVgcFku7TIZNbWEJdeQ==} + /@esbuild/win32-ia32@0.18.11: + resolution: {integrity: sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -410,8 +413,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.17.17: - resolution: {integrity: sha512-FNZw7H3aqhF9OyRQbDDnzUApDXfC1N6fgBhkqEO2jvYCJ+DxMTfZVqg3AX0R1khg1wHTBRD5SdcibSJ+XF6bFg==} + /@esbuild/win32-x64@0.18.11: + resolution: {integrity: sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -609,28 +612,28 @@ packages: rollup: 3.20.4 dev: true - /@sveltejs/adapter-auto@2.0.0(@sveltejs/kit@1.15.5): - resolution: {integrity: sha512-b+gkHFZgD771kgV3aO4avHFd7y1zhmMYy9i6xOK7m/rwmwaRO8gnF5zBc0Rgca80B2PMU1bKNxyBTHA14OzUAQ==} + /@sveltejs/adapter-auto@2.1.0(@sveltejs/kit@1.22.0): + resolution: {integrity: sha512-o2pZCfATFtA/Gw/BB0Xm7k4EYaekXxaPGER3xGSY3FvzFJGTlJlZjBseaXwYSM94lZ0HniOjTokN3cWaLX6fow==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.15.5(svelte@4.0.0)(vite@4.2.1) - import-meta-resolve: 2.2.2 + '@sveltejs/kit': 1.22.0(svelte@4.0.4)(vite@4.4.0) + import-meta-resolve: 3.0.0 dev: true - /@sveltejs/kit@1.15.5(svelte@4.0.0)(vite@4.2.1): - resolution: {integrity: sha512-NyNtgIJBNo3AXMkl0iN10VrKgQS6VM6E+rcqZnZMn12dOo7SwFflj1du0ZgXNCZ1tx6VuEpSz9+FpPjswr4gEg==} + /@sveltejs/kit@1.22.0(svelte@4.0.4)(vite@4.4.0): + resolution: {integrity: sha512-LQhM7CvTaO7OopQffFMuJ2n1lBhfYJKVO2Rujc+/473Yb8jb1mpJm59q5Avbx29kcz8N9lvYUyRP3FXc63VIFA==} engines: {node: ^16.14 || >=18} hasBin: true requiresBuild: true peerDependencies: - svelte: ^3.54.0 + svelte: ^3.54.0 || ^4.0.0-next.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.0.4(svelte@4.0.0)(vite@4.2.1) + '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.0.4)(vite@4.4.0) '@types/cookie': 0.5.1 cookie: 0.5.0 - devalue: 4.3.0 + devalue: 4.3.2 esm-env: 1.0.0 kleur: 4.1.5 magic-string: 0.30.0 @@ -638,29 +641,45 @@ packages: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.2 - svelte: 4.0.0 - tiny-glob: 0.2.9 - undici: 5.20.0 - vite: 4.2.1 + svelte: 4.0.4 + undici: 5.22.1 + vite: 4.4.0 transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@2.0.4(svelte@4.0.0)(vite@4.2.1): - resolution: {integrity: sha512-pjqhW00KwK2uzDGEr+yJBwut+D+4XfJO/+bHHdHzPRXn9+1Jeq5JcFHyrUiYaXgHtyhX0RsllCTm4ssAx4ZY7Q==} + /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.0.4)(vite@4.4.0): + resolution: {integrity: sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==} engines: {node: ^14.18.0 || >= 16} peerDependencies: - svelte: ^3.54.0 + '@sveltejs/vite-plugin-svelte': ^2.2.0 + svelte: ^3.54.0 || ^4.0.0 vite: ^4.0.0 dependencies: + '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.0.4)(vite@4.4.0) + debug: 4.3.4 + svelte: 4.0.4 + vite: 4.4.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@sveltejs/vite-plugin-svelte@2.4.2(svelte@4.0.4)(vite@4.4.0): + resolution: {integrity: sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==} + engines: {node: ^14.18.0 || >= 16} + peerDependencies: + svelte: ^3.54.0 || ^4.0.0 + vite: ^4.0.0 + dependencies: + '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.0.4)(vite@4.4.0) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 - svelte: 4.0.0 - svelte-hmr: 0.15.1(svelte@4.0.0) - vite: 4.2.1 - vitefu: 0.2.4(vite@4.2.1) + svelte: 4.0.4 + svelte-hmr: 0.15.2(svelte@4.0.4) + vite: 4.4.0 + vitefu: 0.2.4(vite@4.4.0) transitivePeerDependencies: - supports-color dev: true @@ -679,6 +698,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-darwin-arm64@1.4.0: + resolution: {integrity: sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-darwin-x64@1.2.3: resolution: {integrity: sha512-jFZ/y6z8z6v4yliIbXKBXA7BJgtZVMsITmEXSuD6s5+eCOpDhQxbRkr6CA+FFfr+/r96rWSDSgDenDQuSvPAKw==} engines: {node: '>= 10'} @@ -688,6 +716,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-darwin-x64@1.4.0: + resolution: {integrity: sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-linux-arm-gnueabihf@1.2.3: resolution: {integrity: sha512-C7h5vqAwXzY0kRGSU00Fj8PudiDWFCiQqqUNI1N+fhCILrzWZB9TPBwdx33ZfXKt/U4+emdIoo/N34v3TiAOmQ==} engines: {node: '>= 10'} @@ -697,6 +734,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-linux-arm-gnueabihf@1.4.0: + resolution: {integrity: sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-linux-arm64-gnu@1.2.3: resolution: {integrity: sha512-buf1c8sdkuUzVDkGPQpyUdAIIdn5r0UgXU6+H5fGPq/Xzt5K69JzXaeo6fHsZEZghbV0hOK+taKV4J0m30UUMQ==} engines: {node: '>= 10'} @@ -706,6 +752,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-linux-arm64-gnu@1.4.0: + resolution: {integrity: sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-linux-arm64-musl@1.2.3: resolution: {integrity: sha512-x88wPS9W5xAyk392vc4uNHcKBBvCp0wf4H9JFMF9OBwB7vfd59LbQCFcPSu8f0BI7bPrOsyHqspWHuFL8ojQEA==} engines: {node: '>= 10'} @@ -715,6 +770,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-linux-arm64-musl@1.4.0: + resolution: {integrity: sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-linux-x64-gnu@1.2.3: resolution: {integrity: sha512-ZMz1jxEVe0B4/7NJnlPHmwmSIuwiD6ViXKs8F+OWWz2Y4jn5TGxWKFg7DLx5OwQTRvEIZxxT7lXHi5CuTNAxKg==} engines: {node: '>= 10'} @@ -724,6 +788,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-linux-x64-gnu@1.4.0: + resolution: {integrity: sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-linux-x64-musl@1.2.3: resolution: {integrity: sha512-B/az59EjJhdbZDzawEVox0LQu2ZHCZlk8rJf85AMIktIUoAZPFbwyiUv7/zjzA/sY6Nb58OSJgaPL2/IBy7E0A==} engines: {node: '>= 10'} @@ -733,6 +806,24 @@ packages: dev: true optional: true + /@tauri-apps/cli-linux-x64-musl@1.4.0: + resolution: {integrity: sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-win32-arm64-msvc@1.4.0: + resolution: {integrity: sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-win32-ia32-msvc@1.2.3: resolution: {integrity: sha512-ypdO1OdC5ugNJAKO2m3sb1nsd+0TSvMS9Tr5qN/ZSMvtSduaNwrcZ3D7G/iOIanrqu/Nl8t3LYlgPZGBKlw7Ng==} engines: {node: '>= 10'} @@ -742,6 +833,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-win32-ia32-msvc@1.4.0: + resolution: {integrity: sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli-win32-x64-msvc@1.2.3: resolution: {integrity: sha512-CsbHQ+XhnV/2csOBBDVfH16cdK00gNyNYUW68isedmqcn8j+s0e9cQ1xXIqi+Hue3awp8g3ImYN5KPepf3UExw==} engines: {node: '>= 10'} @@ -751,6 +851,15 @@ packages: dev: true optional: true + /@tauri-apps/cli-win32-x64-msvc@1.4.0: + resolution: {integrity: sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@tauri-apps/cli@1.2.3: resolution: {integrity: sha512-erxtXuPhMEGJPBtnhPILD4AjuT81GZsraqpFvXAmEJZ2p8P6t7MVBifCL8LznRknznM3jn90D3M8RNBP3wcXTw==} engines: {node: '>= 10'} @@ -767,6 +876,23 @@ packages: '@tauri-apps/cli-win32-x64-msvc': 1.2.3 dev: true + /@tauri-apps/cli@1.4.0: + resolution: {integrity: sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==} + engines: {node: '>= 10'} + hasBin: true + 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 + dev: true + /@types/cookie@0.5.1: resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==} dev: true @@ -816,7 +942,7 @@ packages: grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 - semver: 7.4.0 + semver: 7.5.3 tsutils: 3.21.0(typescript@5.0.4) typescript: 5.0.4 transitivePeerDependencies: @@ -890,7 +1016,7 @@ packages: debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.4.0 + semver: 7.5.3 tsutils: 3.21.0(typescript@5.0.4) typescript: 5.0.4 transitivePeerDependencies: @@ -911,7 +1037,7 @@ packages: '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.4) eslint: 8.38.0 eslint-scope: 5.1.1 - semver: 7.5.1 + semver: 7.5.3 transitivePeerDependencies: - supports-color - typescript @@ -933,6 +1059,12 @@ packages: acorn: 8.8.2 dev: true + /acorn@8.10.0: + resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + /acorn@8.8.2: resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} engines: {node: '>=0.4.0'} @@ -1071,7 +1203,7 @@ packages: /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} dependencies: - semver: 7.5.1 + semver: 7.5.3 dev: true /busboy@1.6.0: @@ -1121,7 +1253,7 @@ packages: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 '@types/estree': 1.0.0 - acorn: 8.8.2 + acorn: 8.10.0 estree-walker: 3.0.3 periscopic: 3.1.0 dev: true @@ -1217,8 +1349,8 @@ packages: engines: {node: '>=8'} dev: true - /devalue@4.3.0: - resolution: {integrity: sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==} + /devalue@4.3.2: + resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==} dev: true /dir-glob@3.0.1: @@ -1310,34 +1442,34 @@ packages: resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==} dev: true - /esbuild@0.17.17: - resolution: {integrity: sha512-/jUywtAymR8jR4qsa2RujlAF7Krpt5VWi72Q2yuLD4e/hvtNcFQ0I1j8m/bxq238pf3/0KO5yuXNpuLx8BE1KA==} + /esbuild@0.18.11: + resolution: {integrity: sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.17.17 - '@esbuild/android-arm64': 0.17.17 - '@esbuild/android-x64': 0.17.17 - '@esbuild/darwin-arm64': 0.17.17 - '@esbuild/darwin-x64': 0.17.17 - '@esbuild/freebsd-arm64': 0.17.17 - '@esbuild/freebsd-x64': 0.17.17 - '@esbuild/linux-arm': 0.17.17 - '@esbuild/linux-arm64': 0.17.17 - '@esbuild/linux-ia32': 0.17.17 - '@esbuild/linux-loong64': 0.17.17 - '@esbuild/linux-mips64el': 0.17.17 - '@esbuild/linux-ppc64': 0.17.17 - '@esbuild/linux-riscv64': 0.17.17 - '@esbuild/linux-s390x': 0.17.17 - '@esbuild/linux-x64': 0.17.17 - '@esbuild/netbsd-x64': 0.17.17 - '@esbuild/openbsd-x64': 0.17.17 - '@esbuild/sunos-x64': 0.17.17 - '@esbuild/win32-arm64': 0.17.17 - '@esbuild/win32-ia32': 0.17.17 - '@esbuild/win32-x64': 0.17.17 + '@esbuild/android-arm': 0.18.11 + '@esbuild/android-arm64': 0.18.11 + '@esbuild/android-x64': 0.18.11 + '@esbuild/darwin-arm64': 0.18.11 + '@esbuild/darwin-x64': 0.18.11 + '@esbuild/freebsd-arm64': 0.18.11 + '@esbuild/freebsd-x64': 0.18.11 + '@esbuild/linux-arm': 0.18.11 + '@esbuild/linux-arm64': 0.18.11 + '@esbuild/linux-ia32': 0.18.11 + '@esbuild/linux-loong64': 0.18.11 + '@esbuild/linux-mips64el': 0.18.11 + '@esbuild/linux-ppc64': 0.18.11 + '@esbuild/linux-riscv64': 0.18.11 + '@esbuild/linux-s390x': 0.18.11 + '@esbuild/linux-x64': 0.18.11 + '@esbuild/netbsd-x64': 0.18.11 + '@esbuild/openbsd-x64': 0.18.11 + '@esbuild/sunos-x64': 0.18.11 + '@esbuild/win32-arm64': 0.18.11 + '@esbuild/win32-ia32': 0.18.11 + '@esbuild/win32-x64': 0.18.11 dev: true /escape-string-regexp@4.0.0: @@ -1354,7 +1486,7 @@ packages: eslint: 8.38.0 dev: true - /eslint-config-standard-with-typescript@36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4): + /eslint-config-standard-with-typescript@36.0.0(@typescript-eslint/eslint-plugin@5.58.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-promise@6.1.1)(eslint@8.38.0)(typescript@5.0.4): resolution: {integrity: sha512-8ZSEskfrDAkUF2lTQLMT0CBzgRNlx1uIM7l2I7L683dKAXUdHuEL2x+GxuGAsdsoWbx7W7Zv0xF67VCEZXIk0Q==} peerDependencies: '@typescript-eslint/eslint-plugin': ^5.50.0 @@ -1367,16 +1499,16 @@ packages: '@typescript-eslint/eslint-plugin': 5.58.0(@typescript-eslint/parser@5.58.0)(eslint@8.38.0)(typescript@5.0.4) '@typescript-eslint/parser': 5.58.0(eslint@8.38.0)(typescript@5.0.4) eslint: 8.38.0 - eslint-config-standard: 17.0.0(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0) + eslint-config-standard: 17.0.0(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-promise@6.1.1)(eslint@8.38.0) eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.58.0)(eslint@8.38.0) - eslint-plugin-n: 16.0.0(eslint@8.38.0) + eslint-plugin-n: 16.0.1(eslint@8.38.0) eslint-plugin-promise: 6.1.1(eslint@8.38.0) typescript: 5.0.4 transitivePeerDependencies: - supports-color dev: true - /eslint-config-standard@17.0.0(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.0)(eslint-plugin-promise@6.1.1)(eslint@8.38.0): + /eslint-config-standard@17.0.0(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-promise@6.1.1)(eslint@8.38.0): resolution: {integrity: sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==} peerDependencies: eslint: ^8.0.1 @@ -1386,7 +1518,7 @@ packages: dependencies: eslint: 8.38.0 eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.58.0)(eslint@8.38.0) - eslint-plugin-n: 16.0.0(eslint@8.38.0) + eslint-plugin-n: 16.0.1(eslint@8.38.0) eslint-plugin-promise: 6.1.1(eslint@8.38.0) dev: true @@ -1429,8 +1561,8 @@ packages: - supports-color dev: true - /eslint-plugin-es-x@6.1.0(eslint@8.38.0): - resolution: {integrity: sha512-f6dHOuVDDYHOCu3w+EledZnUkDdCa71GGHxZ0DMNfalM/2Upl0t/ks0+d5W5YDQJEQmvthE3WYv7RI/9Fl+csQ==} + /eslint-plugin-es-x@7.1.0(eslint@8.38.0): + resolution: {integrity: sha512-AhiaF31syh4CCQ+C5ccJA0VG6+kJK8+5mXKKE7Qs1xcPRg02CDPOj3mWlQxuWS/AYtg7kxrDNgW9YW3vc0Q+Mw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: eslint: '>=8' @@ -1465,7 +1597,7 @@ packages: minimatch: 3.1.2 object.values: 1.1.6 resolve: 1.22.2 - semver: 6.3.0 + semver: 7.5.3 tsconfig-paths: 3.14.2 transitivePeerDependencies: - eslint-import-resolver-typescript @@ -1473,8 +1605,8 @@ packages: - supports-color dev: true - /eslint-plugin-n@16.0.0(eslint@8.38.0): - resolution: {integrity: sha512-akkZTE3hsHBrq6CwmGuYCzQREbVUrA855kzcHqe6i0FLBkeY7Y/6tThCVkjUnjhvRBAlc+8lILcSe5QvvDpeZQ==} + /eslint-plugin-n@16.0.1(eslint@8.38.0): + resolution: {integrity: sha512-CDmHegJN0OF3L5cz5tATH84RPQm9kG+Yx39wIqIwPR2C0uhBGMWfbbOtetR83PQjjidA5aXMu+LEFw1jaSwvTA==} engines: {node: '>=16.0.0'} peerDependencies: eslint: '>=7.0.0' @@ -1482,12 +1614,12 @@ packages: '@eslint-community/eslint-utils': 4.4.0(eslint@8.38.0) builtins: 5.0.1 eslint: 8.38.0 - eslint-plugin-es-x: 6.1.0(eslint@8.38.0) + eslint-plugin-es-x: 7.1.0(eslint@8.38.0) ignore: 5.2.4 - is-core-module: 2.12.0 + is-core-module: 2.12.1 minimatch: 3.1.2 resolve: 1.22.2 - semver: 7.5.1 + semver: 7.5.3 dev: true /eslint-plugin-promise@6.1.1(eslint@8.38.0): @@ -1781,10 +1913,6 @@ packages: define-properties: 1.2.0 dev: true - /globalyzer@0.1.0: - resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==} - dev: true - /globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} @@ -1797,10 +1925,6 @@ packages: slash: 3.0.0 dev: true - /globrex@0.1.2: - resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} - dev: true - /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -1867,8 +1991,8 @@ packages: resolve-from: 4.0.0 dev: true - /import-meta-resolve@2.2.2: - resolution: {integrity: sha512-f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA==} + /import-meta-resolve@3.0.0: + resolution: {integrity: sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==} dev: true /imurmurhash@0.1.4: @@ -1943,6 +2067,12 @@ packages: has: 1.0.3 dev: true + /is-core-module@2.12.1: + resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==} + dependencies: + has: 1.0.3 + dev: true + /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} @@ -2308,8 +2438,8 @@ packages: engines: {node: '>=8.6'} dev: true - /postcss@8.4.22: - resolution: {integrity: sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA==} + /postcss@8.4.24: + resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.6 @@ -2322,9 +2452,9 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier@2.8.7: - resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==} - engines: {node: '>=10.13.0'} + /prettier@3.0.0: + resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==} + engines: {node: '>=14'} hasBin: true dev: true @@ -2405,6 +2535,14 @@ packages: fsevents: 2.3.2 dev: true + /rollup@3.26.1: + resolution: {integrity: sha512-I5gJCSpSMr3U9wv4D5YA8g7w7cj3eaSDeo7t+JcaFQOmoOUBgu4K9iMp8k3EZnwbJrjQxUMSKxMyB8qEQzzaSg==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: @@ -2445,21 +2583,8 @@ packages: rimraf: 2.7.1 dev: true - /semver@6.3.0: - resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} - hasBin: true - dev: true - - /semver@7.4.0: - resolution: {integrity: sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==} - engines: {node: '>=10'} - hasBin: true - dependencies: - lru-cache: 6.0.0 - dev: true - - /semver@7.5.1: - resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==} + /semver@7.5.3: + resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==} engines: {node: '>=10'} hasBin: true dependencies: @@ -2607,11 +2732,11 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check@3.2.0(svelte@4.0.0): - resolution: {integrity: sha512-6ZnscN8dHEN5Eq5LgIzjj07W9nc9myyBH+diXsUAuiY/3rt0l65/LCIQYlIuoFEjp2F1NhXqZiJwV9omPj9tMw==} + /svelte-check@3.4.4(svelte@4.0.4): + resolution: {integrity: sha512-Uys9+R65cj8TmP8f5UpS7B2xKpNLYNxEWJsA5ZoKcWq/uwvABFF7xS6iPQGLoa7hxz0DS6xU60YFpmq06E4JxA==} hasBin: true peerDependencies: - svelte: ^3.55.0 + svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 dependencies: '@jridgewell/trace-mapping': 0.3.18 chokidar: 3.5.3 @@ -2619,9 +2744,9 @@ packages: import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 4.0.0 - svelte-preprocess: 5.0.3(svelte@4.0.0)(typescript@5.0.4) - typescript: 5.0.4 + svelte: 4.0.4 + svelte-preprocess: 5.0.3(svelte@4.0.4)(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - '@babel/core' - coffeescript @@ -2634,16 +2759,16 @@ packages: - sugarss dev: true - /svelte-hmr@0.15.1(svelte@4.0.0): - resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} + /svelte-hmr@0.15.2(svelte@4.0.4): + resolution: {integrity: sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: - svelte: '>=3.19.0' + svelte: ^3.19.0 || ^4.0.0-next.0 dependencies: - svelte: 4.0.0 + svelte: 4.0.4 dev: true - /svelte-preprocess@5.0.3(svelte@4.0.0)(typescript@5.0.4): + /svelte-preprocess@5.0.3(svelte@4.0.4)(typescript@5.1.6): resolution: {integrity: sha512-GrHF1rusdJVbOZOwgPWtpqmaexkydznKzy5qIC2FabgpFyKN57bjMUUUqPRfbBXK5igiEWn1uO/DXsa2vJ5VHA==} engines: {node: '>= 14.10.0'} requiresBuild: true @@ -2686,18 +2811,18 @@ packages: magic-string: 0.27.0 sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 4.0.0 - typescript: 5.0.4 + svelte: 4.0.4 + typescript: 5.1.6 dev: true - /svelte@4.0.0: - resolution: {integrity: sha512-+yCYu3AEUu9n91dnQNGIbnVp8EmNQtuF/YImW4+FTXRHard7NMo+yTsWzggPAbj3fUEJ1FBJLkql/jkp6YB5pg==} + /svelte@4.0.4: + resolution: {integrity: sha512-DDJavyX1mpNFLZ7jU9FwBKouemh6CJHZXwePBa5GXSaW5GuHZ361L2/1uznBqOCxu2UsUoWu8wRsB2iB8QG5sQ==} engines: {node: '>=16'} dependencies: '@ampproject/remapping': 2.2.1 '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.18 - acorn: 8.8.2 + acorn: 8.10.0 aria-query: 5.3.0 axobject-query: 3.2.1 code-red: 1.0.3 @@ -2724,13 +2849,6 @@ packages: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} dev: true - /tiny-glob@0.2.9: - resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} - dependencies: - globalyzer: 0.1.0 - globrex: 0.1.2 - dev: true - /to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -2760,6 +2878,10 @@ packages: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} dev: true + /tslib@2.6.0: + resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} + dev: true + /tsutils@3.21.0(typescript@5.0.4): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} @@ -2796,6 +2918,12 @@ packages: hasBin: true dev: true + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: @@ -2805,9 +2933,9 @@ packages: which-boxed-primitive: 1.0.2 dev: true - /undici@5.20.0: - resolution: {integrity: sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==} - engines: {node: '>=12.18'} + /undici@5.22.1: + resolution: {integrity: sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==} + engines: {node: '>=14.0'} dependencies: busboy: 1.6.0 dev: true @@ -2818,13 +2946,14 @@ packages: punycode: 2.3.0 dev: true - /vite@4.2.1: - resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} + /vite@4.4.0: + resolution: {integrity: sha512-Wf+DCEjuM8aGavEYiF77hnbxEZ+0+/jC9nABR46sh5Xi+GYeSvkeEFRiVuI3x+tPjxgZeS91h1jTAQTPFgePpA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: '@types/node': '>= 14' less: '*' + lightningcss: ^1.21.0 sass: '*' stylus: '*' sugarss: '*' @@ -2834,6 +2963,8 @@ packages: optional: true less: optional: true + lightningcss: + optional: true sass: optional: true stylus: @@ -2843,15 +2974,14 @@ packages: terser: optional: true dependencies: - esbuild: 0.17.17 - postcss: 8.4.22 - resolve: 1.22.2 - rollup: 3.20.4 + esbuild: 0.18.11 + postcss: 8.4.24 + rollup: 3.26.1 optionalDependencies: fsevents: 2.3.2 dev: true - /vitefu@0.2.4(vite@4.2.1): + /vitefu@0.2.4(vite@4.4.0): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: vite: ^3.0.0 || ^4.0.0 @@ -2859,7 +2989,7 @@ packages: vite: optional: true dependencies: - vite: 4.2.1 + vite: 4.4.0 dev: true /which-boxed-primitive@1.0.2: diff --git a/shared/template/rollup.config.mjs b/shared/template/rollup.config.mjs index 96840adc..a71590d2 100644 --- a/shared/template/rollup.config.mjs +++ b/shared/template/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], });