From 3dfdef0678d77a5673573bd0512586b5f28aeb33 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Mon, 17 Apr 2023 17:05:42 +0200 Subject: [PATCH 1/4] chore: Make renovate update dependencies of examples (#311) config:base uses a somewhat extensive ignore list: https://docs.renovatebot.com/presets-default/#ignoremodulesandtests so we have to overwrite it with the paths we actually want to ignore (not the examples dirs). I left the rest of the default list in there even though most of the entries don't and won't apply to this repo. --- renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/renovate.json b/renovate.json index a7360f17..e5bc528f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,15 @@ { "extends": ["config:base"], "enabledManagers": ["cargo", "npm"], + "ignorePaths": [ + "**/node_modules/**", + "**/bower_components/**", + "**/vendor/**", + "**/__tests__/**", + "**/test/**", + "**/tests/**", + "**/__fixtures__/**" + ], "packageRules": [ { "description": "Disable node/pnpm version updates", From 64cba15cd910f37fb2f579e0378da673d8dcac9c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 17:09:03 +0200 Subject: [PATCH 2/4] chore(deps): update dependency @sveltejs/adapter-auto to v2 (#313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- plugins/websocket/examples/svelte-app/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index 4b29817e..2f64fddf 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -11,7 +11,7 @@ "tauri": "tauri" }, "devDependencies": { - "@sveltejs/adapter-auto": "^1.0.0", + "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/kit": "^1.0.0", "svelte": "^3.54.0", "svelte-check": "^2.9.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30d0b319..af1d284c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -141,7 +141,7 @@ importers: plugins/websocket/examples/svelte-app: specifiers: - '@sveltejs/adapter-auto': ^1.0.0 + '@sveltejs/adapter-auto': ^2.0.0 '@sveltejs/kit': ^1.0.0 '@tauri-apps/cli': ^1.0.0 svelte: ^3.54.0 @@ -154,7 +154,7 @@ importers: '@tauri-apps/cli': 1.2.2 tauri-plugin-websocket-api: link:../.. devDependencies: - '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.11 + '@sveltejs/adapter-auto': 2.0.0_@sveltejs+kit@1.0.11 '@sveltejs/kit': 1.0.11_svelte@3.55.1+vite@4.0.4 svelte: 3.55.1 svelte-check: 2.10.3_svelte@3.55.1 @@ -528,8 +528,8 @@ packages: rollup: 3.7.4 dev: true - /@sveltejs/adapter-auto/1.0.0_@sveltejs+kit@1.0.11: - resolution: {integrity: sha512-yKyPvlLVua1bJ/42FrR3X041mFGdB4GzTZOAEoHUcNBRE5Mhx94+eqHpC3hNvAOiLEDcKfVO0ObyKSu7qldU+w==} + /@sveltejs/adapter-auto/2.0.0_@sveltejs+kit@1.0.11: + resolution: {integrity: sha512-b+gkHFZgD771kgV3aO4avHFd7y1zhmMYy9i6xOK7m/rwmwaRO8gnF5zBc0Rgca80B2PMU1bKNxyBTHA14OzUAQ==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: From 48bb71eaa327c035a794db3f2f9b4550ef21f487 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 17:10:36 +0200 Subject: [PATCH 3/4] chore(deps): Use less specific tokio version in ws example (#312) * fix(deps): update rust crate tokio to 1.27 * Update Cargo.toml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Fabian-Lars --- .../examples/svelte-app/src-tauri/Cargo.lock | 83 ++++++++++++------- .../examples/svelte-app/src-tauri/Cargo.toml | 2 +- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.lock b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.lock index bf7085ff..f9c5b7fc 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.lock +++ b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -1411,7 +1411,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -1658,7 +1658,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2345,9 +2345,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2808,19 +2808,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.19.2" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ + "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", "pin-project-lite", "socket2", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -3238,12 +3237,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -3260,9 +3283,9 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" @@ -3278,9 +3301,9 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" @@ -3296,9 +3319,9 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" @@ -3314,9 +3337,9 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" @@ -3332,15 +3355,15 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" @@ -3356,9 +3379,9 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winres" diff --git a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml index 48960dc1..4234de4d 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" serde = { version = "1", features = ["derive"] } serde_json = "1" tauri = { version = "1", features = [] } -tokio = { version = "1.11", features = ["net"] } +tokio = { version = "1", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } tokio-tungstenite = "0.15" From 61daa088eaf0f19fe938448cebb54a8f0451c6f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 17:14:43 +0200 Subject: [PATCH 4/4] chore(deps): update dependency typescript to v5 (#315) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../websocket/examples/svelte-app/package.json | 2 +- pnpm-lock.yaml | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index 2f64fddf..78954136 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -16,7 +16,7 @@ "svelte": "^3.54.0", "svelte-check": "^2.9.2", "tslib": "^2.4.1", - "typescript": "^4.9.3", + "typescript": "^5.0.0", "vite": "^4.0.0" }, "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af1d284c..9d465e9a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,7 +148,7 @@ importers: svelte-check: ^2.9.2 tauri-plugin-websocket-api: link:../../ tslib: ^2.4.1 - typescript: ^4.9.3 + typescript: ^5.0.0 vite: ^4.0.0 dependencies: '@tauri-apps/cli': 1.2.2 @@ -159,7 +159,7 @@ importers: svelte: 3.55.1 svelte-check: 2.10.3_svelte@3.55.1 tslib: 2.4.1 - typescript: 4.9.4 + typescript: 5.0.2 vite: 4.0.4 packages: @@ -2416,8 +2416,8 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 3.55.1 - svelte-preprocess: 4.10.7_atrrhq7vg4ekua4nnyrpuardle - typescript: 4.9.4 + svelte-preprocess: 4.10.7_l6gh7invo235md22ird7wlz7xq + typescript: 5.0.2 transitivePeerDependencies: - '@babel/core' - coffeescript @@ -2440,7 +2440,7 @@ packages: svelte: 3.55.1 dev: true - /svelte-preprocess/4.10.7_atrrhq7vg4ekua4nnyrpuardle: + /svelte-preprocess/4.10.7_l6gh7invo235md22ird7wlz7xq: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -2488,7 +2488,7 @@ packages: sorcery: 0.10.0 strip-indent: 3.0.0 svelte: 3.55.1 - typescript: 4.9.4 + typescript: 5.0.2 dev: true /svelte/3.55.1: @@ -2569,12 +2569,6 @@ packages: engines: {node: '>=10'} dev: true - /typescript/4.9.4: - resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} - engines: {node: '>=4.2.0'} - hasBin: true - dev: true - /typescript/5.0.2: resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} engines: {node: '>=12.20'}