From ad2290dc7a3634d946b384b3e716a0cdf33f2d1f Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 17 Sep 2024 17:10:45 +0200 Subject: [PATCH 1/2] fix: bump tauri@1.8.0 in preparation for v2 upgrade --- Cargo.lock | 6 ++++-- crates/gitbutler-tauri/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 913552ba9..31c133c0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7345,9 +7345,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e33e3ba00a3b05eb6c57ef135781717d33728b48acf914bb05629e74d897d29" +checksum = "570a20223602ad990a30a048f2fdb957ae3e38de3ca9582e04cc09d01e8ccfad" dependencies = [ "anyhow", "bytes", @@ -7366,10 +7366,12 @@ dependencies = [ "http 0.2.12", "ignore", "indexmap 1.9.3", + "log", "objc", "once_cell", "os_info", "percent-encoding", + "plist", "rand 0.8.5", "raw-window-handle", "reqwest 0.11.27", diff --git a/crates/gitbutler-tauri/Cargo.toml b/crates/gitbutler-tauri/Cargo.toml index db3ee9178..7f79734e9 100644 --- a/crates/gitbutler-tauri/Cargo.toml +++ b/crates/gitbutler-tauri/Cargo.toml @@ -70,7 +70,7 @@ open = "5" url = "2.5.2" [dependencies.tauri] -version = "1.7.0" +version = "1.8.0" features = [ "http-all", "os-all", From 05109246f19b2dcc2c18fd602876724790ff2040 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 17 Sep 2024 21:49:32 +0200 Subject: [PATCH 2/2] fix: bump tauri-cli --- package.json | 2 +- pnpm-lock.yaml | 142 ++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index 553b595fa..b0f27ec84 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@eslint/js": "^9.5.0", - "@tauri-apps/cli": "^1.6.0", + "@tauri-apps/cli": "^1.6.2", "@types/eslint__js": "^8.42.3", "@types/node": "^22.3.0", "@typescript-eslint/parser": "^7.13.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a26d72f3..e428d4e05 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,28 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + vite: + specifier: 5.2.13 + version: 5.2.13 + svelte: + '@sveltejs/adapter-static': + specifier: 3.0.4 + version: 3.0.4 + '@sveltejs/kit': + specifier: 2.5.25 + version: 2.5.25 + '@sveltejs/vite-plugin-svelte': + specifier: 4.0.0-next.6 + version: 4.0.0-next.6 + svelte: + specifier: 5.0.0-next.243 + version: 5.0.0-next.243 + svelte-check: + specifier: 4.0.1 + version: 4.0.1 + importers: .: @@ -12,8 +34,8 @@ importers: specifier: ^9.5.0 version: 9.5.0 '@tauri-apps/cli': - specifier: ^1.6.0 - version: 1.6.0 + specifier: ^1.6.2 + version: 1.6.2 '@types/eslint__js': specifier: ^8.42.3 version: 8.42.3 @@ -254,7 +276,7 @@ importers: version: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/cc86b2d9878d6ec02c9f25bd48292621a4bc2a6f tauri-plugin-store-api: specifier: https://github.com/tauri-apps/tauri-plugin-store#v1 - version: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/2352f0bda53b4725ef1d2f51cd5774e4396a20d1 + version: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/395efb8380ff51a587faab5e9b52cacdb4d23a6c tinykeys: specifier: ^2.1.0 version: 2.1.0 @@ -2120,68 +2142,68 @@ packages: resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - '@tauri-apps/cli-darwin-arm64@1.6.0': - resolution: {integrity: sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==} + '@tauri-apps/cli-darwin-arm64@1.6.2': + resolution: {integrity: sha512-6mdRyf9DaLqlZvj8kZB09U3rwY+dOHSGzTZ7+GDg665GJb17f4cb30e8dExj6/aghcsOie9EGpgiURcDUvLNSQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@1.6.0': - resolution: {integrity: sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==} + '@tauri-apps/cli-darwin-x64@1.6.2': + resolution: {integrity: sha512-PLxZY5dn38H3R9VRmBN/l0ZDB5JFanCwlK4rmpzDQPPg3tQmbu5vjSCP6TVj5U6aLKsj79kFyULblPr5Dn9+vw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0': - resolution: {integrity: sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==} + '@tauri-apps/cli-linux-arm-gnueabihf@1.6.2': + resolution: {integrity: sha512-xnpj4BLeeGOh5I/ewCQlYJZwHH0CBNBN+4q8BNWNQ9MKkjN9ST366RmHRzl2ANNgWwijOPxyce7GiUmvuH8Atw==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@1.6.0': - resolution: {integrity: sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==} + '@tauri-apps/cli-linux-arm64-gnu@1.6.2': + resolution: {integrity: sha512-uaiRE0vE2P+tdsCngfKt+7yKr3VZXIq/t3w01DzSdnBgHSp0zmRsRR4AhZt7ibvoEgA8GzBP+eSHJdFNZsTU9w==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@1.6.0': - resolution: {integrity: sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==} + '@tauri-apps/cli-linux-arm64-musl@1.6.2': + resolution: {integrity: sha512-o9JunVrMrhqTBLrdvEbS64W0bo1dPm0lxX51Mx+6x9SmbDjlEWGgaAHC3iKLK9khd5Yu1uO1e+8TJltAcScvmw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@1.6.0': - resolution: {integrity: sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==} + '@tauri-apps/cli-linux-x64-gnu@1.6.2': + resolution: {integrity: sha512-jL9f+o61DdQmNYKIt2Q3BA8YJ+hyC5+GdNxqDf7j5SoQ85j//YfUWbmp9ZgsPHVBxgSGZVvgGMNvf64Ykp0buQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@1.6.0': - resolution: {integrity: sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==} + '@tauri-apps/cli-linux-x64-musl@1.6.2': + resolution: {integrity: sha512-xsa4Pu9YMHKAX0J8pIoXfN/uhvAAAoECZDixDhWw8zi57VZ4QX28ycqolS+NscdD9NAGSgHk45MpBZWdvRtvjQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@1.6.0': - resolution: {integrity: sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==} + '@tauri-apps/cli-win32-arm64-msvc@1.6.2': + resolution: {integrity: sha512-eJtUOx2UFhJpCCkm5M5+4Co9JbjvgIHTdyS/hTSZfOEdT58CNEGVJXMA39FsSZXYoxYPE+9K7Km6haMozSmlxw==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@1.6.0': - resolution: {integrity: sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==} + '@tauri-apps/cli-win32-ia32-msvc@1.6.2': + resolution: {integrity: sha512-9Jwx3PrhNw3VKOgPISRRXPkvoEAZP+7rFRHXIo49dvlHy2E/o9qpWi1IntE33HWeazP6KhvsCjvXB2Ai4eGooA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@1.6.0': - resolution: {integrity: sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==} + '@tauri-apps/cli-win32-x64-msvc@1.6.2': + resolution: {integrity: sha512-5Z+ZjRFJE8MXghJe1UXvGephY5ZcgVhiTI9yuMi9xgX3CEaAXASatyXllzsvGJ9EDaWMEpa0PHjAzi7LBAWROw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@1.6.0': - resolution: {integrity: sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==} + '@tauri-apps/cli@1.6.2': + resolution: {integrity: sha512-zpfZdxhm20s7d/Uejpg/T3a9sqLVe3Ih2ztINfy8v6iLw9Ohowkb9g+agZffYKlEWfOSpmCy69NFyBLj7OZL0A==} engines: {node: '>= 10'} hasBin: true @@ -5994,8 +6016,8 @@ packages: resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/cc86b2d9878d6ec02c9f25bd48292621a4bc2a6f} version: 0.0.0 - tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/2352f0bda53b4725ef1d2f51cd5774e4396a20d1: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/2352f0bda53b4725ef1d2f51cd5774e4396a20d1} + tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/395efb8380ff51a587faab5e9b52cacdb4d23a6c: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/395efb8380ff51a587faab5e9b52cacdb4d23a6c} version: 0.0.0 telejson@7.2.0: @@ -6640,28 +6662,6 @@ packages: resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} engines: {node: '>= 14'} -catalogs: - default: - vite: - specifier: 5.2.13 - version: 5.2.13 - svelte: - '@sveltejs/adapter-static': - specifier: 3.0.4 - version: 3.0.4 - '@sveltejs/kit': - specifier: 2.5.25 - version: 2.5.25 - '@sveltejs/vite-plugin-svelte': - specifier: 4.0.0-next.6 - version: 4.0.0-next.6 - svelte: - specifier: 5.0.0-next.243 - version: 5.0.0-next.243 - svelte-check: - specifier: 4.0.1 - version: 4.0.1 - snapshots: '@aashutoshrathi/word-wrap@1.2.6': {} @@ -8883,48 +8883,48 @@ snapshots: '@tauri-apps/api@1.6.0': {} - '@tauri-apps/cli-darwin-arm64@1.6.0': + '@tauri-apps/cli-darwin-arm64@1.6.2': optional: true - '@tauri-apps/cli-darwin-x64@1.6.0': + '@tauri-apps/cli-darwin-x64@1.6.2': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0': + '@tauri-apps/cli-linux-arm-gnueabihf@1.6.2': optional: true - '@tauri-apps/cli-linux-arm64-gnu@1.6.0': + '@tauri-apps/cli-linux-arm64-gnu@1.6.2': optional: true - '@tauri-apps/cli-linux-arm64-musl@1.6.0': + '@tauri-apps/cli-linux-arm64-musl@1.6.2': optional: true - '@tauri-apps/cli-linux-x64-gnu@1.6.0': + '@tauri-apps/cli-linux-x64-gnu@1.6.2': optional: true - '@tauri-apps/cli-linux-x64-musl@1.6.0': + '@tauri-apps/cli-linux-x64-musl@1.6.2': optional: true - '@tauri-apps/cli-win32-arm64-msvc@1.6.0': + '@tauri-apps/cli-win32-arm64-msvc@1.6.2': optional: true - '@tauri-apps/cli-win32-ia32-msvc@1.6.0': + '@tauri-apps/cli-win32-ia32-msvc@1.6.2': optional: true - '@tauri-apps/cli-win32-x64-msvc@1.6.0': + '@tauri-apps/cli-win32-x64-msvc@1.6.2': optional: true - '@tauri-apps/cli@1.6.0': + '@tauri-apps/cli@1.6.2': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.6.0 - '@tauri-apps/cli-darwin-x64': 1.6.0 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.6.0 - '@tauri-apps/cli-linux-arm64-gnu': 1.6.0 - '@tauri-apps/cli-linux-arm64-musl': 1.6.0 - '@tauri-apps/cli-linux-x64-gnu': 1.6.0 - '@tauri-apps/cli-linux-x64-musl': 1.6.0 - '@tauri-apps/cli-win32-arm64-msvc': 1.6.0 - '@tauri-apps/cli-win32-ia32-msvc': 1.6.0 - '@tauri-apps/cli-win32-x64-msvc': 1.6.0 + '@tauri-apps/cli-darwin-arm64': 1.6.2 + '@tauri-apps/cli-darwin-x64': 1.6.2 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.6.2 + '@tauri-apps/cli-linux-arm64-gnu': 1.6.2 + '@tauri-apps/cli-linux-arm64-musl': 1.6.2 + '@tauri-apps/cli-linux-x64-gnu': 1.6.2 + '@tauri-apps/cli-linux-x64-musl': 1.6.2 + '@tauri-apps/cli-win32-arm64-msvc': 1.6.2 + '@tauri-apps/cli-win32-ia32-msvc': 1.6.2 + '@tauri-apps/cli-win32-x64-msvc': 1.6.2 '@terrazzo/cli@0.0.11': dependencies: @@ -13366,7 +13366,7 @@ snapshots: dependencies: '@tauri-apps/api': 1.6.0 - tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/2352f0bda53b4725ef1d2f51cd5774e4396a20d1: + tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/395efb8380ff51a587faab5e9b52cacdb4d23a6c: dependencies: '@tauri-apps/api': 1.6.0