From 139ba6e1a46969209cd2643d7d4c87e02e333e9c Mon Sep 17 00:00:00 2001 From: Arnab Chakraborty <11457760+Rocky43007@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:22:46 +0300 Subject: [PATCH] [ENG-1854] Migrate to Tauri v2 Release Candidate (#2654) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Migrate to Tauri v2 Release Canidate * Formatting * Update pnpm * Update all tauri deps (js and rust) to Release Candidate 2 - A lot of misc fixes due to changes in the new versions of tauri, rspc and specta * Recreate pnpm-lock * Fix pnpm-lock * Formatting * Use 10 chars SHA for git deps - Update a couple of rust dependencies - Add taplo for toml auto formatting - Adjust some formatting configurations - Updated prettier and its plugins * Fix formatter settings * Minor improvements to Cargo.toml format --------- Co-authored-by: VĂ­tor Vasconcellos --- .editorconfig | 56 +- .npmrc | 1 + .prettierrc.js | 2 +- .rustfmt.toml | 22 +- .taplo.toml | 11 + .vscode/settings.json | 8 +- Cargo.lock | 921 ++++++++++-------- Cargo.toml | 201 ++-- apps/deps-generator/Cargo.toml | 21 +- apps/desktop/crates/linux/Cargo.toml | 15 +- apps/desktop/crates/macos/Cargo.toml | 9 +- apps/desktop/crates/windows/Cargo.toml | 17 +- apps/desktop/package.json | 10 +- apps/desktop/src-tauri/Cargo.toml | 86 +- .../src-tauri/capabilities/default.json | 33 +- apps/desktop/src-tauri/rustfmt.toml | 22 +- apps/desktop/src-tauri/src/main.rs | 69 +- apps/desktop/src-tauri/src/menu.rs | 2 +- apps/desktop/src-tauri/src/updater.rs | 2 +- apps/desktop/src-tauri/tauri.conf.json | 10 +- apps/desktop/src/commands.ts | 9 +- .../modules/sd-core/android/crate/Cargo.toml | 11 +- apps/mobile/modules/sd-core/core/Cargo.toml | 27 +- .../modules/sd-core/ios/crate/Cargo.toml | 11 +- apps/p2p-relay/Cargo.toml | 17 +- apps/server/Cargo.toml | 29 +- core/Cargo.toml | 98 +- core/crates/file-path-helper/Cargo.toml | 31 +- core/crates/heavy-lifting/Cargo.toml | 83 +- core/crates/indexer-rules/Cargo.toml | 42 +- core/crates/prisma-helpers/Cargo.toml | 19 +- core/crates/sync/Cargo.toml | 37 +- core/prisma/migrations/migration_lock.toml | 2 +- core/src/util/unsafe_streamed_query.rs | 6 +- crates/actors/Cargo.toml | 15 +- crates/ai/Cargo.toml | 75 +- crates/cloud-api/Cargo.toml | 25 +- crates/crypto/Cargo.toml | 97 +- crates/fda/Cargo.toml | 11 +- crates/ffmpeg/Cargo.toml | 34 +- crates/file-ext/Cargo.toml | 26 +- crates/images/Cargo.toml | 41 +- crates/media-metadata/Cargo.toml | 23 +- crates/p2p/Cargo.toml | 71 +- crates/p2p/crates/block/Cargo.toml | 17 +- crates/p2p/crates/proto/Cargo.toml | 15 +- crates/p2p/crates/tunnel/Cargo.toml | 15 +- crates/prisma-cli/Cargo.toml | 9 +- crates/prisma/Cargo.toml | 13 +- crates/sync-generator/Cargo.toml | 13 +- crates/sync/Cargo.toml | 25 +- crates/sync/example/Cargo.toml | 29 +- crates/task-system/Cargo.toml | 52 +- crates/utils/Cargo.toml | 9 +- .../app/$libraryId/TopBar/TopBarOptions.tsx | 4 +- package.json | 9 +- packages/client/src/core.ts | 4 +- pnpm-lock.yaml | 479 ++++----- scripts/autoformat.sh | 3 + turbo.json | 11 +- 60 files changed, 1567 insertions(+), 1498 deletions(-) create mode 100644 .taplo.toml diff --git a/.editorconfig b/.editorconfig index e80002aa842b..34150bb03fc7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,13 +14,6 @@ indent_style = tab insert_final_newline = true trim_trailing_whitespace = true -# BATS: https://github.com/bats-core/bats-core -# https://github.com/bats-core/bats-core/master/.editorconfig -[*.bats] -insert_final_newline = true -max_line_length = 80 -trim_trailing_whitespace = true - # CSS # https://google.github.io/styleguide/htmlcssguide.xml#General_Formatting_Rules # http://cssguidelin.es/#syntax-and-formatting @@ -32,6 +25,12 @@ trim_trailing_whitespace = true [*.{htm,html}] trim_trailing_whitespace = true +# Just +# https://github.com/casey/just/master/justfile +[{justfile,Justfile}] +insert_final_newline = true +indent_style = space + # JavaScript, JSON, JSX, JavaScript Modules, TypeScript # https://github.com/feross/standard # https://prettier.io @@ -39,47 +38,36 @@ trim_trailing_whitespace = true indent_size = 4 # Kotlin -# https://android.github.io/kotlin-guides/style.html#indentation +# https://kotlinlang.org/docs/coding-conventions.html#indentation [*.{kt,kts}] indent_size = 4 -# Python -# https://www.python.org/dev/peps/pep-0008/#code-lay-out -[*.py] -indent_size = 4 - -# Rust -# https://github.com/rust-lang/rust/blob/master/src/doc/style/style/whitespace.md -[*.rs] -indent_size = 4 -insert_final_newline = false -trim_trailing_whitespace = true - -# SQL -# https://www.sqlstyle.guide/ -[*.sql] +# PowerShell +# https://poshcode.gitbook.io/powershell-practice-and-style/style-guide/code-layout-and-formatting +[*.{ps1,psd1,psm1}] indent_size = 4 indent_style = space # Prisma # https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-schema/data-model#formatting [*.prisma] -indent_size = 2 indent_style = space -# YAML -# http://yaml.org/spec/1.2/2009-07-21/spec.html#id2576668 -[*.{yaml,yml}] -indent_style = space +# Rust +# https://github.com/rust-lang/rust/blob/master/src/doc/style/style/whitespace.md +[*.rs] +indent_size = 4 +insert_final_newline = false +trim_trailing_whitespace = true # Shell # https://google.github.io/styleguide/shell.xml#Indentation [*.{bash,sh,zsh}] indent_style = space -# PowerShell -# https://poshcode.gitbook.io/powershell-practice-and-style/style-guide/code-layout-and-formatting -[*.{ps1,psd1,psm1}] +# SQL +# https://www.sqlstyle.guide/ +[*.sql] indent_size = 4 indent_style = space @@ -88,3 +76,9 @@ indent_style = space [*.swift] indent_size = 4 indent_style = space + +# YAML +# http://yaml.org/spec/1.2/2009-07-21/spec.html#id2576668 +[*.{yaml,yml}] +indent_style = space + diff --git a/.npmrc b/.npmrc index b40bf051fcae..ee8b1dcaec93 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,6 @@ ; make all engine requirements (e.g. node version) strictly kept engine-strict=true +dedupe-peer-dependents=true ; necessary for metro + mobile strict-peer-dependencies=false node-linker=hoisted diff --git a/.prettierrc.js b/.prettierrc.js index dc5d108add8c..209a288f7439 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -22,7 +22,7 @@ module.exports = { '^[../]', '^[./]' ], - importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'], + importOrderParserPlugins: ['typescript', 'jsx', 'decorators'], importOrderTypeScriptVersion: '4.4.0', tailwindConfig: './packages/ui/tailwind.config.js', plugins: ['@ianvs/prettier-plugin-sort-imports', 'prettier-plugin-tailwindcss'] diff --git a/.rustfmt.toml b/.rustfmt.toml index 9c4c7300b428..cd5cd84cc7b6 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,12 +1,12 @@ -max_width = 100 -hard_tabs = true -newline_style = "Unix" -use_small_heuristics = "Default" -reorder_imports = true -reorder_modules = true -remove_nested_parens = true -edition = "2021" -merge_derives = true -use_try_shorthand = false +edition = "2021" +force_explicit_abi = true +hard_tabs = true +max_width = 100 +merge_derives = true +newline_style = "Unix" +remove_nested_parens = true +reorder_imports = true +reorder_modules = true use_field_init_shorthand = false -force_explicit_abi = true \ No newline at end of file +use_small_heuristics = "Default" +use_try_shorthand = false diff --git a/.taplo.toml b/.taplo.toml new file mode 100644 index 000000000000..59a0f5b660e6 --- /dev/null +++ b/.taplo.toml @@ -0,0 +1,11 @@ +[formatting] +align_comments = true +align_entries = true +array_auto_collapse = true +array_trailing_comma = false +column_width = 100 +crlf = false +indent_string = ' ' +reorder_arrays = true +reorder_keys = true +trailing_newline = true diff --git a/.vscode/settings.json b/.vscode/settings.json index de45015ec4e7..625b44315cf2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,6 +36,9 @@ "[rust]": { "editor.defaultFormatter": "rust-lang.rust-analyzer" }, + "[toml]": { + "editor.defaultFormatter": "tamasfe.even-better-toml" + }, "rust-analyzer.procMacro.enable": true, "rust-analyzer.diagnostics.experimental.enable": false, "tailwindCSS.experimental.classRegex": [ @@ -102,5 +105,8 @@ "i18n-ally.enabledFrameworks": ["react"], "i18n-ally.keystyle": "flat", // You need to add this to your locale settings file "i18n-ally.translate.google.apiKey": "xxx" - "i18n-ally.translate.engines": ["google"] + "i18n-ally.translate.engines": ["google"], + "prettier.configPath": ".prettierrc.js", + "prettier.prettierPath": "./node_modules/prettier", + "evenBetterToml.taplo.configFile.path": ".taplo.toml" } diff --git a/Cargo.lock b/Cargo.lock index d4088ccad36d..89f652b3be1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,6 +196,15 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -216,11 +225,11 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.3", ] [[package]] @@ -361,7 +370,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -401,7 +410,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -418,7 +427,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1027,9 +1036,9 @@ dependencies = [ [[package]] name = "bigdecimal" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ "autocfg", "libm", @@ -1064,7 +1073,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -1077,24 +1086,24 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.72", "which", ] [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -1110,9 +1119,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -1141,13 +1150,13 @@ dependencies = [ [[package]] name = "blake3" version = "1.5.0" -source = "git+https://github.com/spacedriveapp/blake3.git?rev=d3aab416c12a75c2bfabce33bcd594e428a79069#d3aab416c12a75c2bfabce33bcd594e428a79069" +source = "git+https://github.com/spacedriveapp/blake3.git?rev=d3aab416c1#d3aab416c12a75c2bfabce33bcd594e428a79069" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", "generic-array 1.0.0", "hybrid-array", "typenum", @@ -1304,6 +1313,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.6.0" @@ -1323,34 +1338,13 @@ dependencies = [ "either", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cairo-rs" version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -1534,7 +1528,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1590,7 +1584,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1769,12 +1763,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1862,6 +1850,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -1986,7 +1983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -1996,7 +1993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2066,7 +2063,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2090,7 +2087,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2101,7 +2098,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2226,6 +2223,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -2288,13 +2296,12 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys 0.4.1", ] [[package]] @@ -2320,17 +2327,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dispatch" version = "0.2.0" @@ -2345,7 +2341,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2377,7 +2373,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2408,9 +2404,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -2576,7 +2572,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2597,7 +2593,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2608,7 +2604,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2617,6 +2613,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.9" @@ -2840,9 +2846,9 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -2879,7 +2885,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -2952,7 +2958,7 @@ dependencies = [ [[package]] name = "futures-bounded" version = "0.2.3" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures-timer", "futures-util", @@ -3065,7 +3071,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3374,7 +3380,7 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bstr", "gix-features", "gix-path", @@ -3441,7 +3447,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -3469,7 +3475,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3516,9 +3522,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -3540,7 +3546,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -3550,14 +3556,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -3572,7 +3578,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown 0.14.5", ] @@ -3583,7 +3589,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3656,7 +3662,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -3738,7 +3744,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", "libloading 0.8.3", @@ -3996,7 +4002,7 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpz" version = "0.0.6" -source = "git+https://github.com/spacedriveapp/rspc.git?rev=ab12964b140991e0730c3423693533fba71efb03#ab12964b140991e0730c3423693533fba71efb03" +source = "git+https://github.com/spacedriveapp/rspc.git?rev=0018e80231#0018e80231b886cd8d5db090fd32e078a4caa72b" dependencies = [ "async-tungstenite", "axum", @@ -4293,7 +4299,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -4337,7 +4343,7 @@ dependencies = [ [[package]] name = "if-watch" version = "3.2.0" -source = "git+https://github.com/spacedriveapp/if-watch.git?rev=a92c17d3f85c1c6fb0afeeaf6c2b24d0b147e8c3#a92c17d3f85c1c6fb0afeeaf6c2b24d0b147e8c3" +source = "git+https://github.com/spacedriveapp/if-watch.git?rev=a92c17d3f8#a92c17d3f85c1c6fb0afeeaf6c2b24d0b147e8c3" dependencies = [ "async-io", "core-foundation", @@ -4389,11 +4395,21 @@ dependencies = [ "tiff", ] +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error 2.0.1", +] + [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "include_dir" @@ -4725,7 +4741,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "unicode-segmentation", ] @@ -4898,7 +4914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4910,7 +4926,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libp2p" version = "0.53.2" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "bytes", "either", @@ -4945,7 +4961,7 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" version = "0.3.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4956,7 +4972,7 @@ dependencies = [ [[package]] name = "libp2p-autonat" version = "0.12.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "async-trait", "asynchronous-codec", @@ -4976,7 +4992,7 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" version = "0.3.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4987,7 +5003,7 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.41.2" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "either", "fnv", @@ -5015,7 +5031,7 @@ dependencies = [ [[package]] name = "libp2p-dcutr" version = "0.11.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "asynchronous-codec", "either", @@ -5037,7 +5053,7 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.41.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "async-trait", "futures", @@ -5052,7 +5068,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.46.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "asynchronous-codec", "base64 0.21.7", @@ -5102,7 +5118,7 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.45.4" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "arrayvec", "asynchronous-codec", @@ -5131,7 +5147,7 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.45.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "data-encoding", "futures", @@ -5151,7 +5167,7 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.14.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "instant", @@ -5167,7 +5183,7 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.44.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "asynchronous-codec", "bytes", @@ -5192,7 +5208,7 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.10.2" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "bytes", "futures", @@ -5215,7 +5231,7 @@ dependencies = [ [[package]] name = "libp2p-relay" version = "0.17.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "asynchronous-codec", "bytes", @@ -5239,7 +5255,7 @@ dependencies = [ [[package]] name = "libp2p-request-response" version = "0.26.2" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "async-trait", "futures", @@ -5258,7 +5274,7 @@ dependencies = [ [[package]] name = "libp2p-stream" version = "0.1.0-alpha" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "libp2p-core", @@ -5272,7 +5288,7 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.44.2" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "either", "fnv", @@ -5295,18 +5311,18 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.34.3" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "libp2p-tcp" version = "0.41.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "futures-timer", @@ -5322,7 +5338,7 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.3.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "futures-rustls", @@ -5340,7 +5356,7 @@ dependencies = [ [[package]] name = "libp2p-upnp" version = "0.2.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "futures-timer", @@ -5355,7 +5371,7 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.45.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "either", "futures", @@ -5372,7 +5388,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -5458,9 +5474,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loom" @@ -5663,11 +5679,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -5921,7 +5937,7 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.13.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "bytes", "futures", @@ -5939,17 +5955,17 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "indexmap 2.2.6", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -6140,7 +6156,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", "memoffset", @@ -6186,9 +6202,9 @@ dependencies = [ [[package]] name = "notify" version = "6.1.1" -source = "git+https://github.com/notify-rs/notify.git?rev=c3929ed114fbb0bc7457a9a498260461596b00ca#c3929ed114fbb0bc7457a9a498260461596b00ca" +source = "git+https://github.com/notify-rs/notify.git?rev=c3929ed114#c3929ed114fbb0bc7457a9a498260461596b00ca" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "filetime", "fsevent-sys", "inotify", @@ -6394,7 +6410,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "libc", "objc2", @@ -6410,7 +6426,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2", "objc2-foundation", @@ -6440,7 +6456,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "libc", "objc2", @@ -6452,7 +6468,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2", "objc2-foundation", @@ -6464,7 +6480,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block2 0.5.1", "objc2", "objc2-foundation", @@ -6545,11 +6561,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -6566,7 +6582,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -6586,9 +6602,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -6797,7 +6813,7 @@ dependencies = [ "libc", "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6813,17 +6829,6 @@ dependencies = [ "schema-ast", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.15" @@ -6836,18 +6841,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac", - "password-hash", - "sha2 0.10.8", -] - [[package]] name = "pdfium-render" version = "0.8.22" @@ -6855,7 +6848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d2f2669618a1ae68a86fe975fdda1c6a0b6dc9d5358ea8d2cdcd8da3307e5a" dependencies = [ "bindgen", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "bytes", "chrono", @@ -6922,7 +6915,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -7066,7 +7059,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -7119,7 +7112,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -7301,7 +7294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -7315,11 +7308,11 @@ dependencies = [ [[package]] name = "prisma-client-rust" version = "0.6.8" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "base64 0.13.1", "bigdecimal 0.3.1", - "bigdecimal 0.4.3", + "bigdecimal 0.4.5", "chrono", "diagnostics", "dotenvy", @@ -7349,7 +7342,7 @@ dependencies = [ [[package]] name = "prisma-client-rust-cli" version = "0.6.8" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "directories 4.0.1", "flate2", @@ -7369,7 +7362,7 @@ dependencies = [ [[package]] name = "prisma-client-rust-generator" version = "0.6.8" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "directories 4.0.1", "flate2", @@ -7390,7 +7383,7 @@ dependencies = [ [[package]] name = "prisma-client-rust-generator-macros" version = "0.6.8" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "convert_case 0.6.0", "prisma-client-rust-generator-shared", @@ -7402,7 +7395,7 @@ dependencies = [ [[package]] name = "prisma-client-rust-generator-shared" version = "0.1.0" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "convert_case 0.6.0", "prisma-client-rust-sdk", @@ -7414,7 +7407,7 @@ dependencies = [ [[package]] name = "prisma-client-rust-sdk" version = "0.6.8" -source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38ca732162accff72b2eb684d2f120bab#4f9ef9d38ca732162accff72b2eb684d2f120bab" +source = "git+https://github.com/brendonovich/prisma-client-rust?rev=4f9ef9d38c#4f9ef9d38ca732162accff72b2eb684d2f120bab" dependencies = [ "convert_case 0.5.0", "dmmf", @@ -7514,9 +7507,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -7547,7 +7540,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -7587,7 +7580,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] @@ -7723,6 +7716,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-protobuf" version = "0.8.1" @@ -7735,7 +7734,7 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" version = "0.3.1" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "asynchronous-codec", "bytes", @@ -7990,7 +7989,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -8177,23 +8176,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname 0.3.1", - "quick-error", + "quick-error 1.2.3", ] [[package]] name = "resvg" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ "gif", - "jpeg-decoder", + "image-webp", "log", "pico-args", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] @@ -8319,7 +8319,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rspc" version = "0.1.4" -source = "git+https://github.com/spacedriveapp/rspc.git?rev=ab12964b140991e0730c3423693533fba71efb03#ab12964b140991e0730c3423693533fba71efb03" +source = "git+https://github.com/spacedriveapp/rspc.git?rev=0018e80231#0018e80231b886cd8d5db090fd32e078a4caa72b" dependencies = [ "futures", "futures-channel", @@ -8330,6 +8330,9 @@ dependencies = [ "serde", "serde_json", "specta", + "specta-datatype-from", + "specta-serde", + "specta-typescript", "tauri", "thiserror", "tokio", @@ -8357,7 +8360,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "fallible-iterator", "fallible-streaming-iterator", @@ -8402,7 +8405,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -8501,12 +8504,14 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.14.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7730060ad401b0d1807c904ea56735288af101430aa0d2ab8358b789f5f37002" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", "ttf-parser", "unicode-bidi-mirroring", @@ -8518,7 +8523,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.4.0" -source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7e82059a0eb2e333ebada4731d23f8c#a005656df7e82059a0eb2e333ebada4731d23f8c" +source = "git+https://github.com/spacedriveapp/rust-libp2p.git?rev=a005656df7#a005656df7e82059a0eb2e333ebada4731d23f8c" dependencies = [ "futures", "pin-project", @@ -8633,7 +8638,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -8976,6 +8981,7 @@ dependencies = [ "serde", "serde_json", "specta", + "specta-typescript", "strum", "tauri", "tauri-build", @@ -9017,7 +9023,7 @@ dependencies = [ "libc", "normpath", "thiserror", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] @@ -9309,7 +9315,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -9357,9 +9363,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -9373,6 +9379,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + [[package]] name = "serde-value" version = "0.7.0" @@ -9394,13 +9411,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -9411,17 +9428,18 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", + "memchr", "ryu", "serde", ] @@ -9444,7 +9462,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -9495,7 +9513,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -9792,34 +9810,64 @@ dependencies = [ [[package]] name = "specta" -version = "2.0.0-rc.11" +version = "2.0.0-rc.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed13baa3131e5b627ca78dca1097aa84dd83509b18ac9f876a0db5e70413636" +checksum = "4ccbb212565d2dc177bc15ecb7b039d66c4490da892436a4eee5b394d620c9bc" dependencies = [ - "bigdecimal 0.4.3", + "bigdecimal 0.4.5", "chrono", "indexmap 2.2.6", - "once_cell", "paste", "serde", "serde_json", "specta-macros", "thiserror", - "tokio", "uhlc", "uuid", ] +[[package]] +name = "specta-datatype-from" +version = "0.0.1" +source = "git+https://github.com/spacedriveapp/specta?rev=dcdc9e5#dcdc9e59f1f6709af4209da80567ce7d1347a54d" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "specta-macros" -version = "2.0.0-rc.10" +version = "2.0.0-rc.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33e9678ae36993fcbfc46aa29568ef10d32fd54428808759c6a450998c43ec" +checksum = "68999d29816965eb9e5201f60aec02a76512139811661a7e8e653abc810b8f72" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", +] + +[[package]] +name = "specta-serde" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12260cbb21abb2e83a0375b1521867910e3aed8a7afa782206150ce552cd2e5a" +dependencies = [ + "specta", + "thiserror", +] + +[[package]] +name = "specta-typescript" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4472229365ceb6395487e3a60d921ad8e21f9ad06eaecc396f098902c9adc" +dependencies = [ + "specta", + "specta-serde", + "thiserror", ] [[package]] @@ -9843,7 +9891,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -10078,7 +10126,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -10121,9 +10169,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -10162,7 +10210,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -10231,11 +10279,11 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tao" -version = "0.27.1" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bcf8885e147b56d6e26751263b45876284f32ca404703f6d3b8f80d16ff4dd" +checksum = "ea538df05fbc2dcbbd740ba0cfe8607688535f4798d213cbbfa13ce494f3451f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cocoa", "core-foundation", "core-graphics", @@ -10262,8 +10310,8 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.56.0", - "windows-core 0.56.0", + "windows 0.57.0", + "windows-core 0.57.0", "windows-version", "x11-dl", ] @@ -10304,14 +10352,14 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-beta.17" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266" +checksum = "19ee93e545e49458813d4ed16179c67ee6141dba140ec3d4f078dda3b8d4e0d1" dependencies = [ "anyhow", "bytes", "cocoa", - "dirs-next", + "dirs", "dunce", "embed_plist", "futures-util", @@ -10349,18 +10397,18 @@ dependencies = [ "webkit2gtk", "webview2-com", "window-vibrancy", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "tauri-build" -version = "2.0.0-beta.16" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6829341dde141cd48caabd4f57463444fb1127e7e20e758088be12e866bd77" +checksum = "96a58b3a716b51d7f671f729bb8c0a53cd2551eec8450c64e828ef4e6c9f948e" dependencies = [ "anyhow", "cargo_toml", - "dirs-next", + "dirs", "glob", "heck 0.5.0", "json-patch", @@ -10376,9 +10424,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.16" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de94afa2ee0cc6a7ba99c1300b80a9ede416c54a6a68a0ad38c3ebe1d6fe547c" +checksum = "90a9e63ecd827d57228864764e0234935c9aac230099cf145197c8c08e754ced" dependencies = [ "base64 0.22.1", "brotli", @@ -10392,7 +10440,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "syn 2.0.66", + "syn 2.0.72", "tauri-utils", "thiserror", "time", @@ -10403,23 +10451,23 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.16" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305a13d6164bd76f9b407cd1b95031deb1c1a0804c686f5e332a99ee62710ac2" +checksum = "a54f5d5b289aa6215ffcfed7d4ff9960a04b7a854436d04519a9fcf911050cba" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-plugin" -version = "2.0.0-beta.16" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f511a86bb648b8d6ea5841719d12966491f472734915b0d510e6eeb299f4371" +checksum = "03ce2ac5e182251ff932750d69c9b240a78e44901a7a6234814d63c595b43660" dependencies = [ "anyhow", "glob", @@ -10434,9 +10482,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-beta.7" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4563f62939a475273e7b75eb4a862f0108969a54db813ef250092d470eff84dc" +checksum = "6c538457a755a75b8bb1594ed40d1512f8f6386251d3fcde492f8f46768ec85b" dependencies = [ "dunce", "log", @@ -10452,9 +10500,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-beta.7" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35377195c6923beda5f29482a16b492d431de964389fca9aaf81a0f7e908023f" +checksum = "5df6b25b1f2b7b61565e66c4dbee9eb39e5635d2a763206e380e07cc3f601a67" dependencies = [ "anyhow", "glob", @@ -10471,9 +10519,9 @@ dependencies = [ [[package]] name = "tauri-plugin-os" -version = "2.0.0-beta.4" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653c0dbf5f954c7614a5e93f5b548bbe4417b3e1aa553b31ed0b6a2656949459" +checksum = "6b54cfeb26356822d3be3db4282041b03552f573a694b6b28aded7d95c62a039" dependencies = [ "gethostname", "log", @@ -10489,9 +10537,9 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-beta.5" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4973141725f74983f6e89b9ce9c69a18bc0ec0fba23cc4d022986e0325b92b" +checksum = "9209f6c32caec61e156a5616f7d80ba7683ca4a0a5641cbe5d3086ab371aaab2" dependencies = [ "encoding_rs", "log", @@ -10510,12 +10558,12 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-beta.5" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1a632f5b0cc00911c3f379b0b69a4ccf5fd22eb10d022010dfb02717d5b6bc" +checksum = "5b5f10ba18d2fc65e16bdf053b7beccb621dcf880c52d2ab08bdeb2d685e3e14" dependencies = [ "base64 0.22.1", - "dirs-next", + "dirs", "flate2", "futures-util", "http 1.1.0", @@ -10539,9 +10587,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.15" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9316d393ecb73f9390c57637c169c6b7d06f287924fa275f59cdbcf484eb4580" +checksum = "8f01b129b1ebdf09563c354760dbe7c0e96a166b4e33362d9c8d207f527c7ea5" dependencies = [ "dpi", "gtk", @@ -10553,14 +10601,14 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.15" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df23173f0df85d05184f397ba7129c3e5f2efd2f213cf8db43694143b3a2f29" +checksum = "fcda27639094ace2bf25f00bc10e35ea4e3af2f92753b1bdd2a174d1fa5a6292" dependencies = [ "cocoa", "gtk", @@ -10576,21 +10624,20 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows 0.56.0", + "windows 0.57.0", "wry", ] [[package]] name = "tauri-specta" -version = "2.0.0-rc.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fd66a6cdf8ca36aa44f9044510b449678e043056d84b551b4ff6ecb957364b" +version = "2.0.0-rc.15" +source = "git+https://github.com/spacedriveapp/tauri-specta?rev=6069a05029#6069a05029a271eedbb49e402df9a65859e8416d" dependencies = [ "heck 0.5.0", - "indoc", "serde", "serde_json", "specta", + "specta-typescript", "tauri", "tauri-specta-macros", "thiserror", @@ -10598,28 +10645,26 @@ dependencies = [ [[package]] name = "tauri-specta-macros" -version = "2.0.0-rc.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f9e90bf2012877e2c4029a1bf756277183e9c7c77b850ef965711553998012" +version = "2.0.0-rc.6" +source = "git+https://github.com/spacedriveapp/tauri-specta?rev=6069a05029#6069a05029a271eedbb49e402df9a65859e8416d" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "tauri-utils" -version = "2.0.0-beta.16" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199edb0e8969f53decfb683971faa50eb8b421f9034bfa95121286e1e93beaef" +checksum = "28bb83cffa26e9cb7a2b3d0c31ab87bf277f44aaaa90f17159aef4d37aabd051" dependencies = [ "brotli", "cargo_metadata 0.18.1", "ctor", "dunce", "glob", - "heck 0.5.0", "html5ever", "infer", "json-patch", @@ -10633,6 +10678,7 @@ dependencies = [ "schemars", "semver", "serde", + "serde-untagged", "serde_json", "serde_with", "swift-rs", @@ -10693,22 +10739,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -10842,7 +10888,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -11053,7 +11099,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -11158,7 +11204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -11179,14 +11225,14 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c" +checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60" dependencies = [ "cocoa", "core-graphics", "crossbeam-channel", - "dirs-next", + "dirs", "libappindicator", "muda", "objc", @@ -11211,9 +11257,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "tungstenite" @@ -11234,6 +11283,12 @@ dependencies = [ "utf-8", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -11259,9 +11314,9 @@ dependencies = [ [[package]] name = "uhlc" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1eadef1fa26cbbae1276c46781e8f4d888bdda434779c18ae6c2a0e69991885" +checksum = "79ac3c37bd9506595768f0387bd39d644525728b4a1d783218acabfb56356db7" dependencies = [ "humantime", "lazy_static", @@ -11341,9 +11396,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-bom" @@ -11353,9 +11408,9 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ccc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[package]] name = "unicode-ident" @@ -11531,9 +11586,9 @@ dependencies = [ [[package]] name = "usvg" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ "base64 0.22.1", "data-url", @@ -11591,9 +11646,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", "serde", @@ -11734,7 +11789,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -11768,7 +11823,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11888,16 +11943,16 @@ dependencies = [ [[package]] name = "webview2-com" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c914dd492a52f0377bef56fd1b6e74a79090f9ee631d625d5b505a00e4538b6" +checksum = "6516cfa64c6b3212686080eeec378e662c2af54bb2a5b2a22749673f5cb2226f" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.56.0", - "windows-core 0.56.0", - "windows-implement 0.56.0", - "windows-interface 0.56.0", + "windows 0.57.0", + "windows-core 0.57.0", + "windows-implement 0.57.0", + "windows-interface 0.57.0", ] [[package]] @@ -11908,18 +11963,18 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "webview2-com-sys" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a46bcf03482ec28eeb764ca788f67998cde4213adfbbfa90462622058530f5e" +checksum = "c76d5b77320ff155660be1df3e6588bc85c75f1a9feef938cc4dc4dd60d1d7cf" dependencies = [ "thiserror", - "windows 0.56.0", - "windows-core 0.56.0", + "windows 0.57.0", + "windows-core 0.57.0", ] [[package]] @@ -11930,12 +11985,11 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ff1bfee408e1028e2e3acbf6d32d98b08a5a059ccbf5f33305534453ba5d3e" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", "document-features", "js-sys", @@ -11955,15 +12009,14 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6a86eaa5e763e59c73cf9e97d55fffd4dfda69fd8bda19589fcf851ddfef1f" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", "document-features", "indexmap 2.2.6", "log", @@ -11975,21 +12028,20 @@ dependencies = [ "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d71c8ae05170583049b65ee562fd839fdc0b3e9ddb84f4e40c9d5f8ea0d4c8c" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", "core-graphics-types", "glow", @@ -12023,11 +12075,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -12120,7 +12172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -12130,7 +12182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -12140,7 +12192,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core 0.57.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -12158,7 +12220,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -12169,8 +12231,8 @@ checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ "windows-implement 0.56.0", "windows-interface 0.56.0", - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", ] [[package]] @@ -12181,8 +12243,21 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement 0.57.0", "windows-interface 0.57.0", - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] @@ -12193,7 +12268,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -12204,7 +12279,18 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -12215,7 +12301,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -12226,7 +12312,18 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -12235,7 +12332,26 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -12262,7 +12378,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -12297,18 +12413,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -12317,7 +12433,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -12334,9 +12450,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -12352,9 +12468,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -12370,15 +12486,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -12394,9 +12510,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -12412,9 +12528,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -12430,9 +12546,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -12448,9 +12564,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -12495,9 +12611,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.39.5" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7172fc76376d55d089c627a31a5b604b4ac372793fb5378d1c7ddf008703008" +checksum = "68b00c945786b02d7805d09a969fa36d0eee4e0bd4fb3ec2a79d2bf45a1b44cd" dependencies = [ "base64 0.22.1", "block", @@ -12529,8 +12645,8 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.56.0", - "windows-core 0.56.0", + "windows 0.57.0", + "windows-core 0.57.0", "windows-version", "x11-dl", ] @@ -12702,7 +12818,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "synstructure 0.13.1", ] @@ -12782,7 +12898,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -12802,7 +12918,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", "synstructure 0.13.1", ] @@ -12823,7 +12939,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] @@ -12845,65 +12961,46 @@ checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.72", ] [[package]] name = "zip" -version = "0.6.6" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", + "arbitrary", "crc32fast", "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", + "displaydoc", + "indexmap 2.2.6", + "memchr", + "thiserror", ] [[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +name = "zune-core" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] -name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +name = "zune-inflate" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ - "cc", - "pkg-config", + "simd-adler32", ] [[package]] -name = "zune-inflate" -version = "0.2.54" +name = "zune-jpeg" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ - "simd-adler32", + "zune-core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1cc1388c784a..a39b268bc5fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,127 +1,140 @@ [workspace] -resolver = "2" +exclude = ["crates/crypto"] members = [ - "core", - "core/crates/*", - "crates/*", "apps/deps-generator", - "apps/desktop/src-tauri", "apps/desktop/crates/*", - "apps/mobile/modules/sd-core/core", + "apps/desktop/src-tauri", "apps/mobile/modules/sd-core/android/crate", + "apps/mobile/modules/sd-core/core", "apps/mobile/modules/sd-core/ios/crate", "apps/server", + "core", + "core/crates/*", + "crates/*" ] -exclude = ["crates/crypto"] +resolver = "2" [workspace.package] -license = "AGPL-3.0-only" -edition = "2021" +edition = "2021" +license = "AGPL-3.0-only" repository = "https://github.com/spacedriveapp/spacedrive" [workspace.dependencies] # Third party dependencies used by one or more of our crates -async-channel = "2.3" -async-trait = "0.1.80" -axum = "0.6.20" # Update blocked by hyper -base64 = "0.22.1" -base91 = "0.1.0" -blake3 = "1.5.0" # Update blocked by custom patch below -chrono = "0.4.38" -directories = "5.0" -ed25519-dalek = "2.1.1" -futures = "0.3.30" +async-channel = "2.3" +async-trait = "0.1.80" +axum = "0.6.20" # Update blocked by hyper +base64 = "0.22.1" +base91 = "0.1.0" +blake3 = "1.5.0" # Update blocked by custom patch below +chrono = "0.4.38" +directories = "5.0" +ed25519-dalek = "2.1.1" +futures = "0.3.30" futures-concurrency = "7.6" -gix-ignore = "0.11.2" -globset = "0.4.14" -http = "0.2" # Update blocked by axum -hyper = "0.14" # Update blocked due to API breaking changes -image = "0.24.9" # Update blocked due to https://github.com/image-rs/image/issues/2230 -itertools = "0.13.0" -lending-stream = "1.0" -libc = "0.2" -normpath = "1.2" -once_cell = "1.19" -pin-project-lite = "0.2.14" -rand = "0.8.5" -regex = "1.10" -reqwest = "0.11" # Update blocked by hyper -rmp = "0.8.14" -rmp-serde = "1.3.0" -rmpv = { version = "1.3", features = ["with-serde"] } -rspc = "0.1.4" -serde = "1.0" -serde_json = "1.0" -specta = "=2.0.0-rc.11" -static_assertions = "1.1" -strum = "0.26" -strum_macros = "0.26" -tempfile = "3.10" -thiserror = "1.0" -tokio = "1.38" -tokio-stream = "0.1.15" -tokio-util = "0.7.11" -tracing = "0.1.40" -tracing-subscriber = "0.3.18" -tracing-test = "0.2.5" -uhlc = "0.6.0" # Must follow version used by specta -uuid = "1.8" -webp = "0.2.6" # Update blocked by image +gix-ignore = "0.11.2" +globset = "0.4.14" +http = "0.2" # Update blocked by axum +hyper = "0.14" # Update blocked due to API breaking changes +image = "0.24.9" # Update blocked due to https://github.com/image-rs/image/issues/2230 +itertools = "0.13.0" +lending-stream = "1.0" +libc = "0.2" +normpath = "1.2" +once_cell = "1.19" +pin-project-lite = "0.2.14" +rand = "0.8.5" +regex = "1.10" +reqwest = "0.11" # Update blocked by hyper +rmp = "0.8.14" +rmp-serde = "1.3.0" +rmpv = { version = "1.3", features = ["with-serde"] } +rspc = "0.1.4" # Update blocked by custom patch below +serde = "1.0" +serde_json = "1.0" +specta = "=2.0.0-rc.20" +specta-typescript = "=0.0.7" +static_assertions = "1.1" +strum = "0.26" +strum_macros = "0.26" +tempfile = "3.10" +thiserror = "1.0" +tokio = "1.38" +tokio-stream = "0.1.15" +tokio-util = "0.7.11" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" +tracing-test = "0.2.5" +uhlc = "0.8.0" # Must follow version used by specta +uuid = "1.10" # Must follow version used by specta +webp = "0.2.6" # Update blocked by image [workspace.dependencies.prisma-client-rust] -git = "https://github.com/brendonovich/prisma-client-rust" -rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" -features = ["migrations", "specta", "sqlite", "sqlite-create-many"] default-features = false +features = ["migrations", "specta", "sqlite", "sqlite-create-many"] +git = "https://github.com/brendonovich/prisma-client-rust" +rev = "4f9ef9d38c" [workspace.dependencies.prisma-client-rust-cli] -git = "https://github.com/brendonovich/prisma-client-rust" -rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" -features = ["migrations", "specta", "sqlite", "sqlite-create-many"] default-features = false +features = ["migrations", "specta", "sqlite", "sqlite-create-many"] +git = "https://github.com/brendonovich/prisma-client-rust" +rev = "4f9ef9d38c" [workspace.dependencies.prisma-client-rust-sdk] -git = "https://github.com/brendonovich/prisma-client-rust" -rev = "4f9ef9d38ca732162accff72b2eb684d2f120bab" -features = ["sqlite"] default-features = false +features = ["sqlite"] +git = "https://github.com/brendonovich/prisma-client-rust" +rev = "4f9ef9d38c" -[patch.crates-io] # Proper IOS Support -if-watch = { git = "https://github.com/spacedriveapp/if-watch.git", rev = "a92c17d3f85c1c6fb0afeeaf6c2b24d0b147e8c3" } +[patch.crates-io.if-watch] +git = "https://github.com/spacedriveapp/if-watch.git" +rev = "a92c17d3f8" # We hack it to the high heavens -rspc = { git = "https://github.com/spacedriveapp/rspc.git", rev = "ab12964b140991e0730c3423693533fba71efb03" } +[patch.crates-io.rspc] +git = "https://github.com/spacedriveapp/rspc.git" +rev = "0018e80231" # Add `Control::open_stream_with_addrs` -libp2p = { git = "https://github.com/spacedriveapp/rust-libp2p.git", rev = "a005656df7e82059a0eb2e333ebada4731d23f8c" } -libp2p-core = { git = "https://github.com/spacedriveapp/rust-libp2p.git", rev = "a005656df7e82059a0eb2e333ebada4731d23f8c" } -libp2p-swarm = { git = "https://github.com/spacedriveapp/rust-libp2p.git", rev = "a005656df7e82059a0eb2e333ebada4731d23f8c" } -libp2p-stream = { git = "https://github.com/spacedriveapp/rust-libp2p.git", rev = "a005656df7e82059a0eb2e333ebada4731d23f8c" } - -blake3 = { git = "https://github.com/spacedriveapp/blake3.git", rev = "d3aab416c12a75c2bfabce33bcd594e428a79069" } - +[patch.crates-io.libp2p] +git = "https://github.com/spacedriveapp/rust-libp2p.git" +rev = "a005656df7" +[patch.crates-io.libp2p-core] +git = "https://github.com/spacedriveapp/rust-libp2p.git" +rev = "a005656df7" +[patch.crates-io.libp2p-swarm] +git = "https://github.com/spacedriveapp/rust-libp2p.git" +rev = "a005656df7" +[patch.crates-io.libp2p-stream] +git = "https://github.com/spacedriveapp/rust-libp2p.git" +rev = "a005656df7" + +[patch.crates-io.blake3] +git = "https://github.com/spacedriveapp/blake3.git" +rev = "d3aab416c1" [profile.dev] # Make compilation faster on macOS +codegen-units = 256 +debug = 0 +incremental = true +lto = false +opt-level = 0 split-debuginfo = "unpacked" -opt-level = 0 -debug = 0 -strip = "none" -lto = false -codegen-units = 256 -incremental = true +strip = "none" [profile.dev-debug] inherits = "dev" # Enables debugger +codegen-units = 256 +debug = "full" +incremental = true +lto = "off" +opt-level = 0 split-debuginfo = "none" -opt-level = 0 -debug = "full" -strip = "none" -lto = "off" -codegen-units = 256 -incremental = true +strip = "none" # Set the settings for build scripts and proc-macros. [profile.dev.build-override] @@ -129,20 +142,20 @@ opt-level = 3 # Set the default for dependencies, except workspace members. [profile.dev.package."*"] -opt-level = 3 incremental = false +opt-level = 3 # Set the default for dependencies, except workspace members. [profile.dev-debug.package."*"] -inherits = "dev" -opt-level = 3 -debug = "full" +debug = "full" incremental = false +inherits = "dev" +opt-level = 3 # Optimize release builds [profile.release] -panic = "unwind" # Sadly we need unwind to avoid unexpected crashes on third party crates -codegen-units = 1 # Compile crates one after another so the compiler can optimize better -lto = true # Enables link to optimizations -opt-level = "s" # Optimize for binary size -strip = true # Remove debug symbols +codegen-units = 1 # Compile crates one after another so the compiler can optimize better +lto = true # Enables link to optimizations +opt-level = "s" # Optimize for binary size +panic = "unwind" # Sadly we need unwind to avoid unexpected crashes on third party crates +strip = true # Remove debug symbols diff --git a/apps/deps-generator/Cargo.toml b/apps/deps-generator/Cargo.toml index 03d4b093862d..e775b7913cd2 100644 --- a/apps/deps-generator/Cargo.toml +++ b/apps/deps-generator/Cargo.toml @@ -1,19 +1,20 @@ [package] -name = "sd-deps-generator" +name = "sd-deps-generator" version = "0.0.0" -authors = ["Jake Robinson "] -description = "A tool to compile all Spacedrive dependencies and their respective licenses" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Jake Robinson "] +description = "A tool to compile all Spacedrive dependencies and their respective licenses" +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] # Workspace dependencies -reqwest = { workspace = true, features = ["blocking", "native-tls-vendored"] } -serde = { workspace = true, features = ["derive"] } +reqwest = { workspace = true, features = ["blocking", "native-tls-vendored"] } +serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } # Specific Deps Generator dependencies -anyhow = "1.0" -clap = { version = "4.5", features = ["derive"] } +anyhow = "1.0" cargo_metadata = "0.18.1" +clap = { version = "4.5", features = ["derive"] } diff --git a/apps/desktop/crates/linux/Cargo.toml b/apps/desktop/crates/linux/Cargo.toml index c7761d633432..9c4755b73914 100644 --- a/apps/desktop/crates/linux/Cargo.toml +++ b/apps/desktop/crates/linux/Cargo.toml @@ -1,16 +1,17 @@ [package] -name = "sd-desktop-linux" +name = "sd-desktop-linux" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] -libc = { workspace = true } +libc = { workspace = true } tokio = { workspace = true, features = ["fs"] } [target.'cfg(target_os = "linux")'.dependencies] -wgpu = { version = "0.20.0", default-features = false } +wgpu = { version = "22.1", default-features = false } # WARNING: gtk should follow the same version used by tauri -# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-beta.17/core/tauri/Cargo.toml#L85C1-L85C51 +# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-rc.2/core/tauri/Cargo.toml gtk = { version = "0.18", features = ["v3_24"] } diff --git a/apps/desktop/crates/macos/Cargo.toml b/apps/desktop/crates/macos/Cargo.toml index 72faca5e4423..cc5b156fe32b 100644 --- a/apps/desktop/crates/macos/Cargo.toml +++ b/apps/desktop/crates/macos/Cargo.toml @@ -1,9 +1,10 @@ [package] -name = "sd-desktop-macos" +name = "sd-desktop-macos" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [target.'cfg(target_os = "macos")'.dependencies] swift-rs = { version = "1.0.6", features = ["serde"] } diff --git a/apps/desktop/crates/windows/Cargo.toml b/apps/desktop/crates/windows/Cargo.toml index a41ca4bffeff..7f3fe0bdfaa5 100644 --- a/apps/desktop/crates/windows/Cargo.toml +++ b/apps/desktop/crates/windows/Cargo.toml @@ -1,15 +1,16 @@ [package] -name = "sd-desktop-windows" +name = "sd-desktop-windows" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] -libc = { workspace = true } -normpath = { workspace = true } +libc = { workspace = true } +normpath = { workspace = true } thiserror = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies.windows] -version = "0.57" -features = ["Win32_UI_Shell", "Win32_Foundation", "Win32_System_Com"] +features = ["Win32_Foundation", "Win32_System_Com", "Win32_UI_Shell"] +version = "0.58" diff --git a/apps/desktop/package.json b/apps/desktop/package.json index d18a4b1a5a5f..1ec124294786 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -20,10 +20,10 @@ "@sd/ui": "workspace:*", "@t3-oss/env-core": "^0.7.1", "@tanstack/react-query": "^4.36.1", - "@tauri-apps/api": "next", - "@tauri-apps/plugin-dialog": "2.0.0-beta.3", - "@tauri-apps/plugin-os": "2.0.0-beta.3", - "@tauri-apps/plugin-shell": "2.0.0-beta.3", + "@tauri-apps/api": "=2.0.0-rc.0", + "@tauri-apps/plugin-dialog": "=2.0.0-rc.0", + "@tauri-apps/plugin-os": "=2.0.0-rc.0", + "@tauri-apps/plugin-shell": "=2.0.0-rc.0", "consistent-hash": "^1.2.2", "immer": "^10.0.3", "react": "^18.2.0", @@ -34,7 +34,7 @@ "devDependencies": { "@sd/config": "workspace:*", "@sentry/vite-plugin": "^2.16.0", - "@tauri-apps/cli": "2.0.0-beta.20", + "@tauri-apps/cli": "=2.0.0-rc.3", "@types/react": "^18.2.67", "@types/react-dom": "^18.2.22", "sass": "^1.72.0", diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml index 1ab1056f6be5..993b1383294a 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/src-tauri/Cargo.toml @@ -1,52 +1,54 @@ [package] -name = "sd-desktop" +name = "sd-desktop" version = "0.4.1" -description = "The universal file manager." -authors = ["Spacedrive Technology Inc "] -default-run = "sd-desktop" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Spacedrive Technology Inc "] +default-run = "sd-desktop" +description = "The universal file manager." +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] # Spacedrive Sub-crates -sd-core = { path = "../../../core", features = ["ffmpeg", "heif"] } -sd-fda = { path = "../../../crates/fda" } +sd-core = { path = "../../../core", features = ["ffmpeg", "heif"] } +sd-fda = { path = "../../../crates/fda" } sd-prisma = { path = "../../../crates/prisma" } # Workspace dependencies -axum = { workspace = true, features = ["headers", "query"] } -directories = { workspace = true } -futures = { workspace = true } -hyper = { workspace = true } -http = { workspace = true } +axum = { workspace = true, features = ["headers", "query"] } +directories = { workspace = true } +futures = { workspace = true } +http = { workspace = true } +hyper = { workspace = true } prisma-client-rust = { workspace = true } -rand = { workspace = true } -rspc = { workspace = true, features = ["tauri", "tracing"] } -serde = { workspace = true } -serde_json = { workspace = true } -specta = { workspace = true } -strum = { workspace = true, features = ["derive"] } -tokio = { workspace = true, features = ["sync"] } -tracing = { workspace = true } -thiserror = { workspace = true } -uuid = { workspace = true, features = ["serde"] } +rand = { workspace = true } +rspc = { workspace = true, features = ["tauri", "tracing"] } +serde = { workspace = true } +serde_json = { workspace = true } +specta = { workspace = true } +specta-typescript = { workspace = true } +strum = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["sync"] } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde"] } # Specific Desktop dependencies # WARNING: Do NOT enable default features, as that vendors dbus (see below) -opener = { version = "0.7.1", features = ["reveal"], default-features = false } -tauri = { version = "=2.0.0-beta.17", features = [ - "macos-private-api", - "unstable", - "linux-libxdo", -] } # Update blocked by rspc -tauri-plugin-updater = "2.0.0-beta" -tauri-plugin-dialog = "2.0.0-beta" -tauri-plugin-os = "2.0.0-beta" -tauri-plugin-shell = "2.0.0-beta" -tauri-runtime = { version = "=2.0.0-beta.15" } # Update blocked by tauri -tauri-specta = { version = "=2.0.0-rc.8", features = ["typescript"] } -tauri-utils = { version = "=2.0.0-beta.16" } # Update blocked by tauri +opener = { version = "0.7.1", features = ["reveal"], default-features = false } +tauri = { version = "=2.0.0-rc.2", features = ["linux-libxdo", "macos-private-api", "unstable"] } +tauri-plugin-dialog = "=2.0.0-rc.0" +tauri-plugin-os = "=2.0.0-rc.0" +tauri-plugin-shell = "=2.0.0-rc.0" +tauri-plugin-updater = "=2.0.0-rc.0" +tauri-runtime = { version = "=2.0.0-rc.2" } +tauri-utils = { version = "=2.0.0-rc.2" } + +[dependencies.tauri-specta] +features = ["derive", "typescript"] +git = "https://github.com/spacedriveapp/tauri-specta" +rev = "6069a05029" [target.'cfg(target_os = "linux")'.dependencies] # Spacedrive Sub-crates @@ -55,7 +57,7 @@ sd-desktop-linux = { path = "../crates/linux" } # Specific Desktop dependencies # WARNING: dbus must NOT be vendored, as that breaks the app on Linux,X11,Nvidia dbus = { version = "0.9.7", features = ["stdfd"] } -# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-beta.17/core/tauri/Cargo.toml#L86 +# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-rc.2/core/tauri/Cargo.toml webkit2gtk = { version = "=2.0.1", features = ["v2_38"] } [target.'cfg(target_os = "macos")'.dependencies] @@ -68,10 +70,10 @@ sd-desktop-windows = { path = "../crates/windows" } [build-dependencies] # Specific Desktop dependencies -tauri-build = "2.0.0-beta" +tauri-build = "=2.0.0-rc.2" [features] -default = ["custom-protocol"] -devtools = ["tauri/devtools"] -ai-models = ["sd-core/ai"] +ai-models = ["sd-core/ai"] custom-protocol = ["tauri/custom-protocol"] +default = ["custom-protocol"] +devtools = ["tauri/devtools"] diff --git a/apps/desktop/src-tauri/capabilities/default.json b/apps/desktop/src-tauri/capabilities/default.json index 90cc19ebdc45..cc710d277dde 100644 --- a/apps/desktop/src-tauri/capabilities/default.json +++ b/apps/desktop/src-tauri/capabilities/default.json @@ -4,27 +4,26 @@ "description": "Capability for the main window", "windows": ["main"], "permissions": [ - "app:default", - "event:default", - "image:default", - "menu:default", - "path:default", - "resources:default", - "window:default", - "tray:default", - "webview:default", - "window:default", + "core:app:default", + "core:event:default", + "core:image:default", + "core:menu:default", + "core:path:default", + "core:resources:default", + "core:window:default", + "core:tray:default", + "core:webview:default", "shell:allow-open", "dialog:allow-open", "dialog:allow-save", "dialog:allow-confirm", "os:allow-os-type", - "window:allow-close", - "window:allow-create", - "window:allow-maximize", - "window:allow-minimize", - "window:allow-toggle-maximize", - "window:allow-start-dragging", - "webview:allow-internal-toggle-devtools" + "core:window:allow-close", + "core:window:allow-create", + "core:window:allow-maximize", + "core:window:allow-minimize", + "core:window:allow-toggle-maximize", + "core:window:allow-start-dragging", + "core:webview:allow-internal-toggle-devtools" ] } diff --git a/apps/desktop/src-tauri/rustfmt.toml b/apps/desktop/src-tauri/rustfmt.toml index 054510e1457b..385c9ea02464 100644 --- a/apps/desktop/src-tauri/rustfmt.toml +++ b/apps/desktop/src-tauri/rustfmt.toml @@ -1,12 +1,12 @@ -max_width = 100 -hard_tabs = true -newline_style = "Auto" -use_small_heuristics = "Default" -reorder_imports = true -reorder_modules = true -remove_nested_parens = true -edition = "2018" -merge_derives = true -use_try_shorthand = false +edition = "2018" +force_explicit_abi = true +hard_tabs = true +max_width = 100 +merge_derives = true +newline_style = "Auto" +remove_nested_parens = true +reorder_imports = true +reorder_modules = true use_field_init_shorthand = false -force_explicit_abi = true +use_small_heuristics = "Default" +use_try_shorthand = false diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs index 3b8d617aeb6b..7442bf8f616c 100644 --- a/apps/desktop/src-tauri/src/main.rs +++ b/apps/desktop/src-tauri/src/main.rs @@ -10,9 +10,11 @@ use sd_core::{Node, NodeError}; use sd_fda::DiskAccess; use serde::{Deserialize, Serialize}; +use specta_typescript::Typescript; +use tauri::Emitter; use tauri::{async_runtime::block_on, webview::PlatformWebview, AppHandle, Manager, WindowEvent}; use tauri_plugins::{sd_error_plugin, sd_server_plugin}; -use tauri_specta::{collect_events, ts}; +use tauri_specta::{collect_events, Builder}; use tokio::task::block_in_place; use tokio::time::sleep; use tracing::error; @@ -181,45 +183,46 @@ async fn main() -> tauri::Result<()> { #[cfg(target_os = "linux")] sd_desktop_linux::normalize_environment(); - let (invoke_handler, register_events) = { - let builder = ts::builder() - .events(collect_events![DragAndDropEvent]) - .commands(tauri_specta::collect_commands![ - app_ready, - reset_spacedrive, - open_logs_dir, - refresh_menu_bar, - reload_webview, - set_menu_bar_item_state, - request_fda_macos, - open_trash_in_os_explorer, - file::open_file_paths, - file::open_ephemeral_files, - file::get_file_path_open_with_apps, - file::get_ephemeral_files_open_with_apps, - file::open_file_path_with, - file::open_ephemeral_file_with, - file::reveal_items, - theme::lock_app_theme, - updater::check_for_update, - updater::install_update - ]) - .config(specta::ts::ExportConfig::default().formatter(specta::ts::formatter::prettier)); - - #[cfg(debug_assertions)] - let builder = builder.path("../src/commands.ts"); - - builder.build().unwrap() - }; + let builder = Builder::new() + .commands(tauri_specta::collect_commands![ + app_ready, + reset_spacedrive, + open_logs_dir, + refresh_menu_bar, + reload_webview, + set_menu_bar_item_state, + request_fda_macos, + open_trash_in_os_explorer, + file::open_file_paths, + file::open_ephemeral_files, + file::get_file_path_open_with_apps, + file::get_ephemeral_files_open_with_apps, + file::open_file_path_with, + file::open_ephemeral_file_with, + file::reveal_items, + theme::lock_app_theme, + updater::check_for_update, + updater::install_update + ]) + .events(collect_events![DragAndDropEvent]); + + builder + .export( + Typescript::default() + .formatter(specta_typescript::formatter::prettier) + .header("/* eslint-disable */"), + "../src/commands.ts", + ) + .expect("Failed to export typescript bindings"); tauri::Builder::default() - .invoke_handler(invoke_handler) + .invoke_handler(builder.invoke_handler()) .setup(move |app| { // We need a the app handle to determine the data directory now. // This means all the setup code has to be within `setup`, however it doesn't support async so we `block_on`. block_in_place(|| { block_on(async move { - register_events(app); + builder.mount_events(app); let data_dir = app .path() diff --git a/apps/desktop/src-tauri/src/menu.rs b/apps/desktop/src-tauri/src/menu.rs index 4a379534d6da..1073031f1111 100644 --- a/apps/desktop/src-tauri/src/menu.rs +++ b/apps/desktop/src-tauri/src/menu.rs @@ -4,7 +4,7 @@ use serde::Deserialize; use specta::Type; use tauri::{ menu::{Menu, MenuItemKind}, - AppHandle, Manager, Wry, + AppHandle, Emitter, Manager, Wry, }; use tracing::error; diff --git a/apps/desktop/src-tauri/src/updater.rs b/apps/desktop/src-tauri/src/updater.rs index c595b158ffe6..327cc0d0d85f 100644 --- a/apps/desktop/src-tauri/src/updater.rs +++ b/apps/desktop/src-tauri/src/updater.rs @@ -1,4 +1,4 @@ -use tauri::{plugin::TauriPlugin, Manager, Runtime}; +use tauri::{plugin::TauriPlugin, Emitter, Runtime}; use tauri_plugin_updater::{Update as TauriPluginUpdate, UpdaterExt}; use tokio::sync::Mutex; diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index f6334dc17ca3..c873befb11a9 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/tauri-apps/tauri/raw/tauri-v2.0.0-beta.17/core/tauri-config-schema/schema.json", + "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/tauri-v2.0.0-rc.2/core/tauri-config-schema/schema.json", "productName": "Spacedrive", "identifier": "com.spacedrive.desktop", "build": { @@ -41,7 +41,7 @@ }, "bundle": { "active": true, - "targets": ["deb", "msi", "dmg", "updater"], + "targets": ["deb", "msi", "dmg"], "publisher": "Spacedrive Technology Inc.", "copyright": "Spacedrive Technology Inc.", "category": "Productivity", @@ -62,7 +62,6 @@ "depends": ["libc6", "libxdo3", "dbus"] } }, - "macOS": { "minimumSystemVersion": "10.15", "exceptionDomain": null, @@ -71,7 +70,10 @@ }, "windows": { "certificateThumbprint": null, - "webviewInstallMode": { "type": "embedBootstrapper", "silent": true }, + "webviewInstallMode": { + "type": "embedBootstrapper", + "silent": true + }, "digestAlgorithm": "sha256", "timestampUrl": "", "wix": { diff --git a/apps/desktop/src/commands.ts b/apps/desktop/src/commands.ts index e091d5aa0d15..bde568c77439 100644 --- a/apps/desktop/src/commands.ts +++ b/apps/desktop/src/commands.ts @@ -1,11 +1,14 @@ /** tauri-specta globals **/ -import { invoke as TAURI_INVOKE } from '@tauri-apps/api/core'; +import { Channel as TAURI_CHANNEL, invoke as TAURI_INVOKE } from '@tauri-apps/api/core'; import * as TAURI_API_EVENT from '@tauri-apps/api/event'; import { type WebviewWindow as __WebviewWindow__ } from '@tauri-apps/api/webviewWindow'; +/* eslint-disable */ // This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually. +/** user-defined commands **/ + export const commands = { async appReady(): Promise { await TAURI_INVOKE('app_ready'); @@ -146,12 +149,16 @@ export const commands = { } }; +/** user-defined events **/ + export const events = __makeEvents__<{ dragAndDropEvent: DragAndDropEvent; }>({ dragAndDropEvent: 'drag-and-drop-event' }); +/** user-defined constants **/ + /** user-defined types **/ export type AppThemeType = 'Auto' | 'Light' | 'Dark'; diff --git a/apps/mobile/modules/sd-core/android/crate/Cargo.toml b/apps/mobile/modules/sd-core/android/crate/Cargo.toml index afdf90d3fec5..f727988d2bd5 100644 --- a/apps/mobile/modules/sd-core/android/crate/Cargo.toml +++ b/apps/mobile/modules/sd-core/android/crate/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "sd-mobile-android" +name = "sd-mobile-android" version = "0.1.0" -rust-version = "1.64" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true +rust-version = "1.64" [lib] # Android can use dynamic linking since all FFI is done via JNI diff --git a/apps/mobile/modules/sd-core/core/Cargo.toml b/apps/mobile/modules/sd-core/core/Cargo.toml index d4f011dee52c..de8c145030c0 100644 --- a/apps/mobile/modules/sd-core/core/Cargo.toml +++ b/apps/mobile/modules/sd-core/core/Cargo.toml @@ -1,25 +1,24 @@ [package] -name = "sd-mobile-core" +name = "sd-mobile-core" version = "0.1.0" -rust-version = "1.64" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true +rust-version = "1.64" [dependencies] # Spacedrive Sub-crates -sd-core = { path = "../../../../../core", features = [ - "mobile", -], default-features = false } +sd-core = { path = "../../../../../core", features = ["mobile"], default-features = false } # Workspace dependencies -futures = { workspace = true } -once_cell = { workspace = true } -rspc = { workspace = true } +futures = { workspace = true } +once_cell = { workspace = true } +rspc = { workspace = true } serde_json = { workspace = true } -tokio = { workspace = true } -tracing = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } # Specific Mobile Core dependencies futures-channel = "0.3.30" -futures-locks = "0.7.1" +futures-locks = "0.7.1" diff --git a/apps/mobile/modules/sd-core/ios/crate/Cargo.toml b/apps/mobile/modules/sd-core/ios/crate/Cargo.toml index 693263f3d476..db5a25fdb261 100644 --- a/apps/mobile/modules/sd-core/ios/crate/Cargo.toml +++ b/apps/mobile/modules/sd-core/ios/crate/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "sd-mobile-ios" +name = "sd-mobile-ios" version = "0.1.0" -rust-version = "1.64" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true +rust-version = "1.64" [lib] # iOS requires static linking diff --git a/apps/p2p-relay/Cargo.toml b/apps/p2p-relay/Cargo.toml index 9585b7bb7800..e85208e692e2 100644 --- a/apps/p2p-relay/Cargo.toml +++ b/apps/p2p-relay/Cargo.toml @@ -1,20 +1,21 @@ [package] -name = "sd-p2p-relay" +name = "sd-p2p-relay" version = "0.0.1" -publish = false -license.workspace = true -edition.workspace = true + +edition.workspace = true +license.workspace = true +publish = false repository.workspace = true [dependencies] # Workspace dependencies libp2p = { version = "0.53.2", features = [ - "tokio", - "quic", - "relay", "autonat", "macros", -] } + "quic", + "relay", + "tokio" +] } # Update blocked due to custom patch reqwest = { workspace = true, features = ["json", "native-tls-vendored"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } diff --git a/apps/server/Cargo.toml b/apps/server/Cargo.toml index 9c98729fea3d..8419281313f1 100644 --- a/apps/server/Cargo.toml +++ b/apps/server/Cargo.toml @@ -1,29 +1,30 @@ [package] -name = "sd-server" +name = "sd-server" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [features] -default = [] -assets = [] ai-models = ["sd-core/ai"] +assets = [] +default = [] [dependencies] # Spacedrive Sub-crates sd-core = { path = "../../core", features = ["ffmpeg", "heif"] } # Workspace dependencies -axum = { workspace = true, features = ["headers"] } -base64 = { workspace = true } -http = { workspace = true } -rspc = { workspace = true, features = ["axum"] } +axum = { workspace = true, features = ["headers"] } +base64 = { workspace = true } +http = { workspace = true } +rspc = { workspace = true, features = ["axum"] } tempfile = { workspace = true } -tokio = { workspace = true, features = ["sync", "rt-multi-thread", "signal"] } -tracing = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread", "signal", "sync"] } +tracing = { workspace = true } # Specific Desktop dependencies include_dir = "0.7.3" -mime_guess = "2.0" -secstr = "0.5.1" +mime_guess = "2.0" +secstr = "0.5.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 27cbeda9f876..4f6f4d9d013f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,54 +1,47 @@ [package] -name = "sd-core" +name = "sd-core" version = "0.4.1" -description = "Virtual distributed filesystem engine that powers Spacedrive." -authors = ["Spacedrive Technology Inc "] -rust-version = "1.78" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Spacedrive Technology Inc "] +description = "Virtual distributed filesystem engine that powers Spacedrive." +edition.workspace = true +license.workspace = true +repository.workspace = true +rust-version = "1.78" [features] default = [] # This feature allows features to be disabled when the Core is running on mobile. mobile = [] # This feature controls whether the Spacedrive Core contains functionality which requires FFmpeg. -ffmpeg = [ - "dep:sd-ffmpeg", - "sd-core-heavy-lifting/ffmpeg", - "sd-media-metadata/ffmpeg", -] -heif = ["sd-images/heif"] -ai = ["dep:sd-ai"] +ai = ["dep:sd-ai"] +ffmpeg = ["dep:sd-ffmpeg", "sd-core-heavy-lifting/ffmpeg", "sd-media-metadata/ffmpeg"] +heif = ["sd-images/heif"] [dependencies] # Inner Core Sub-crates sd-core-file-path-helper = { path = "./crates/file-path-helper" } -sd-core-heavy-lifting = { path = "./crates/heavy-lifting" } -sd-core-indexer-rules = { path = "./crates/indexer-rules" } -sd-core-prisma-helpers = { path = "./crates/prisma-helpers" } -sd-core-sync = { path = "./crates/sync" } +sd-core-heavy-lifting = { path = "./crates/heavy-lifting" } +sd-core-indexer-rules = { path = "./crates/indexer-rules" } +sd-core-prisma-helpers = { path = "./crates/prisma-helpers" } +sd-core-sync = { path = "./crates/sync" } # Spacedrive Sub-crates -sd-actors = { path = "../crates/actors" } -sd-ai = { path = "../crates/ai", optional = true } -sd-cloud-api = { path = "../crates/cloud-api" } -sd-ffmpeg = { path = "../crates/ffmpeg", optional = true } -sd-file-ext = { path = "../crates/file-ext" } -sd-images = { path = "../crates/images", features = [ - "rspc", - "serde", - "specta", -] } +sd-actors = { path = "../crates/actors" } +sd-ai = { path = "../crates/ai", optional = true } +sd-cloud-api = { path = "../crates/cloud-api" } +sd-ffmpeg = { path = "../crates/ffmpeg", optional = true } +sd-file-ext = { path = "../crates/file-ext" } +sd-images = { path = "../crates/images", features = ["rspc", "serde", "specta"] } sd-media-metadata = { path = "../crates/media-metadata" } -sd-p2p = { path = "../crates/p2p", features = ["specta"] } -sd-p2p-block = { path = "../crates/p2p/crates/block" } -sd-p2p-proto = { path = "../crates/p2p/crates/proto" } -sd-p2p-tunnel = { path = "../crates/p2p/crates/tunnel" } -sd-prisma = { path = "../crates/prisma" } -sd-sync = { path = "../crates/sync" } -sd-task-system = { path = "../crates/task-system" } -sd-utils = { path = "../crates/utils" } +sd-p2p = { path = "../crates/p2p", features = ["specta"] } +sd-p2p-block = { path = "../crates/p2p/crates/block" } +sd-p2p-proto = { path = "../crates/p2p/crates/proto" } +sd-p2p-tunnel = { path = "../crates/p2p/crates/tunnel" } +sd-prisma = { path = "../crates/prisma" } +sd-sync = { path = "../crates/sync" } +sd-task-system = { path = "../crates/task-system" } +sd-utils = { path = "../crates/utils" } # Workspace dependencies async-channel = { workspace = true } @@ -62,7 +55,7 @@ directories = { workspace = true } futures = { workspace = true } futures-concurrency = { workspace = true } gix-ignore = { workspace = true } -hyper = { workspace = true, features = ["http1", "server", "client"] } +hyper = { workspace = true, features = ["client", "http1", "server"] } image = { workspace = true } itertools = { workspace = true } libc = { workspace = true } @@ -75,14 +68,7 @@ reqwest = { workspace = true, features = ["json", "native-tls-vendored"] } rmp = { workspace = true } rmp-serde = { workspace = true } rmpv = { workspace = true } -rspc = { workspace = true, features = [ - "axum", - "uuid", - "chrono", - "tracing", - "alpha", - "unstable", -] } +rspc = { workspace = true, features = ["alpha", "axum", "chrono", "tracing", "unstable", "uuid"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } specta = { workspace = true } @@ -92,26 +78,26 @@ strum_macros = { workspace = true } tempfile = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = [ - "sync", - "rt-multi-thread", "io-util", "macros", - "time", "process", + "rt-multi-thread", + "sync", + "time" ] } tokio-stream = { workspace = true, features = ["fs"] } tokio-util = { workspace = true, features = ["io"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -uuid = { workspace = true, features = ["v4", "serde"] } +uuid = { workspace = true, features = ["serde", "v4"] } webp = { workspace = true } # Specific Core dependencies async-recursion = "1.1" async-stream = "0.3.5" -aws-sdk-s3 = { version = "1.34", features = ["behavior-version-latest"] } aws-config = "1.5" aws-credential-types = "1.2" +aws-sdk-s3 = { version = "1.34", features = ["behavior-version-latest"] } bytes = "1.6" ctor = "0.2.8" flate2 = "1.0" @@ -120,8 +106,8 @@ http-body = "0.4.6" # Update blocked by http http-range = "0.1.5" int-enum = "0.5" # Update blocked due to API breaking changes mini-moka = "0.10.3" -notify = { git = "https://github.com/notify-rs/notify.git", rev = "c3929ed114fbb0bc7457a9a498260461596b00ca", default-features = false, features = [ - "macos_fsevent", +notify = { git = "https://github.com/notify-rs/notify.git", rev = "c3929ed114", default-features = false, features = [ + "macos_fsevent" ] } serde-hashkey = "0.4.5" serde_repr = "0.1.19" @@ -134,11 +120,11 @@ tracing-appender = "0.2.3" # Override features of transitive dependencies [dependencies.openssl] -version = "=0.10.64" features = ["vendored"] +version = "0.10.66" [dependencies.openssl-sys] -version = "=0.9.102" features = ["vendored"] +version = "0.9.103" # Platform-specific dependencies [target.'cfg(target_os = "macos")'.dependencies] @@ -155,8 +141,8 @@ trash = "4.1" icrate = { version = "0.1.2", features = [ "Foundation", "Foundation_NSFileManager", - "Foundation_NSString", "Foundation_NSNumber", + "Foundation_NSString" ] } [target.'cfg(target_os = "android")'.dependencies] @@ -164,7 +150,7 @@ tracing-android = "0.2.0" [dev-dependencies] # Workspace dependencies -globset = { workspace = true } +globset = { workspace = true } tracing-test = { workspace = true } # Specific Core dependencies diff --git a/core/crates/file-path-helper/Cargo.toml b/core/crates/file-path-helper/Cargo.toml index a769102eed86..f3e408e43260 100644 --- a/core/crates/file-path-helper/Cargo.toml +++ b/core/crates/file-path-helper/Cargo.toml @@ -1,30 +1,31 @@ [package] -name = "sd-core-file-path-helper" +name = "sd-core-file-path-helper" version = "0.1.0" -authors = ["Ericson Soares "] -readme = "README.md" -rust-version = "1.75" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares "] +edition.workspace = true +license.workspace = true +readme = "README.md" +repository.workspace = true +rust-version = "1.75" [dependencies] # Inner Core Sub-crates sd-core-prisma-helpers = { path = "../prisma-helpers" } -sd-core-sync = { path = "../sync" } +sd-core-sync = { path = "../sync" } # Spacedrive Sub-crates sd-prisma = { path = "../../../crates/prisma" } -sd-utils = { path = "../../../crates/utils" } +sd-utils = { path = "../../../crates/utils" } # Workspace dependencies -chrono = { workspace = true, features = ["serde"] } +chrono = { workspace = true, features = ["serde"] } prisma-client-rust = { workspace = true } -regex = { workspace = true } -serde = { workspace = true, features = ["derive"] } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["fs"] } -tracing = { workspace = true } +regex = { workspace = true } +serde = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs"] } +tracing = { workspace = true } [target.'cfg(windows)'.dependencies] winapi-util = "0.1.8" diff --git a/core/crates/heavy-lifting/Cargo.toml b/core/crates/heavy-lifting/Cargo.toml index 6729096d996b..1dcc11bb5e2c 100644 --- a/core/crates/heavy-lifting/Cargo.toml +++ b/core/crates/heavy-lifting/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "sd-core-heavy-lifting" +name = "sd-core-heavy-lifting" version = "0.1.0" -authors = ["Ericson Soares "] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares "] +edition.workspace = true +license.workspace = true +repository.workspace = true [features] default = [] @@ -14,48 +15,48 @@ ffmpeg = ["dep:sd-ffmpeg"] [dependencies] # Inner Core Sub-crates sd-core-file-path-helper = { path = "../file-path-helper" } -sd-core-indexer-rules = { path = "../indexer-rules" } -sd-core-prisma-helpers = { path = "../prisma-helpers" } -sd-core-sync = { path = "../sync" } +sd-core-indexer-rules = { path = "../indexer-rules" } +sd-core-prisma-helpers = { path = "../prisma-helpers" } +sd-core-sync = { path = "../sync" } # Spacedrive Sub-crates -sd-ffmpeg = { path = "../../../crates/ffmpeg", optional = true } -sd-file-ext = { path = "../../../crates/file-ext" } -sd-images = { path = "../../../crates/images" } +sd-ffmpeg = { path = "../../../crates/ffmpeg", optional = true } +sd-file-ext = { path = "../../../crates/file-ext" } +sd-images = { path = "../../../crates/images" } sd-media-metadata = { path = "../../../crates/media-metadata" } -sd-prisma = { path = "../../../crates/prisma" } -sd-sync = { path = "../../../crates/sync" } -sd-task-system = { path = "../../../crates/task-system" } -sd-utils = { path = "../../../crates/utils" } +sd-prisma = { path = "../../../crates/prisma" } +sd-sync = { path = "../../../crates/sync" } +sd-task-system = { path = "../../../crates/task-system" } +sd-utils = { path = "../../../crates/utils" } # Workspace dependencies -async-channel = { workspace = true } -async-trait = { workspace = true } -blake3 = { workspace = true } -chrono = { workspace = true, features = ["serde"] } -futures = { workspace = true } +async-channel = { workspace = true } +async-trait = { workspace = true } +blake3 = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +futures = { workspace = true } futures-concurrency = { workspace = true } -globset = { workspace = true } -image = { workspace = true } -itertools = { workspace = true } -lending-stream = { workspace = true } -once_cell = { workspace = true } -prisma-client-rust = { workspace = true } -rmpv = { workspace = true } -rmp-serde = { workspace = true } -rspc = { workspace = true } -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } -specta = { workspace = true } -static_assertions = { workspace = true } -strum = { workspace = true, features = ["derive", "phf"] } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["fs", "sync", "parking_lot"] } -tokio-stream = { workspace = true, features = ["fs"] } -tracing = { workspace = true } -uuid = { workspace = true, features = ["v4", "serde"] } -webp = { workspace = true } +globset = { workspace = true } +image = { workspace = true } +itertools = { workspace = true } +lending-stream = { workspace = true } +once_cell = { workspace = true } +prisma-client-rust = { workspace = true } +rmp-serde = { workspace = true } +rmpv = { workspace = true } +rspc = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +specta = { workspace = true } +static_assertions = { workspace = true } +strum = { workspace = true, features = ["derive", "phf"] } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs", "parking_lot", "sync"] } +tokio-stream = { workspace = true, features = ["fs"] } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde", "v4"] } +webp = { workspace = true } [dev-dependencies] -tempfile = { workspace = true } +tempfile = { workspace = true } tracing-test = { workspace = true } diff --git a/core/crates/indexer-rules/Cargo.toml b/core/crates/indexer-rules/Cargo.toml index 10f5f476bfc4..db7a6dcb35e4 100644 --- a/core/crates/indexer-rules/Cargo.toml +++ b/core/crates/indexer-rules/Cargo.toml @@ -1,34 +1,32 @@ [package] -name = "sd-core-indexer-rules" +name = "sd-core-indexer-rules" version = "0.1.0" -authors = [ - "Ericson Soares ", - "VĂ­tor Vasconcellos ", -] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares ", "VĂ­tor Vasconcellos "] +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] # Spacedrive Sub-crates sd-prisma = { path = "../../../crates/prisma" } -sd-utils = { path = "../../../crates/utils" } +sd-utils = { path = "../../../crates/utils" } # Workspace dependencies -chrono = { workspace = true } +chrono = { workspace = true } futures-concurrency = { workspace = true } -gix-ignore = { workspace = true, features = ["serde"] } -globset = { workspace = true, features = ["serde1"] } -once_cell = { workspace = true } -prisma-client-rust = { workspace = true } -rmp-serde = { workspace = true } -rspc = { workspace = true } -serde = { workspace = true, features = ["derive"] } -specta = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["fs"] } -tracing = { workspace = true } -uuid = { workspace = true, features = ["v4", "serde"] } +gix-ignore = { workspace = true, features = ["serde"] } +globset = { workspace = true, features = ["serde1"] } +once_cell = { workspace = true } +prisma-client-rust = { workspace = true } +rmp-serde = { workspace = true } +rspc = { workspace = true } +serde = { workspace = true, features = ["derive"] } +specta = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs"] } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde", "v4"] } [dev-dependencies] tempfile = { workspace = true } diff --git a/core/crates/prisma-helpers/Cargo.toml b/core/crates/prisma-helpers/Cargo.toml index 66d1be7632eb..6a3a47a4ccfc 100644 --- a/core/crates/prisma-helpers/Cargo.toml +++ b/core/crates/prisma-helpers/Cargo.toml @@ -1,18 +1,19 @@ [package] -name = "sd-core-prisma-helpers" +name = "sd-core-prisma-helpers" version = "0.1.0" -authors = ["Ericson Soares "] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares "] +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] # Spacedrive Sub-crates sd-prisma = { path = "../../../crates/prisma" } -sd-utils = { path = "../../../crates/utils" } +sd-utils = { path = "../../../crates/utils" } # Workspace dependencies prisma-client-rust = { workspace = true } -serde = { workspace = true, features = ["derive"] } -specta = { workspace = true } -uuid = { workspace = true, features = ["v4", "serde"] } +serde = { workspace = true, features = ["derive"] } +specta = { workspace = true } +uuid = { workspace = true, features = ["serde", "v4"] } diff --git a/core/crates/sync/Cargo.toml b/core/crates/sync/Cargo.toml index 85858de5c0b3..84ca5c3d1013 100644 --- a/core/crates/sync/Cargo.toml +++ b/core/crates/sync/Cargo.toml @@ -1,6 +1,7 @@ [package] -name = "sd-core-sync" +name = "sd-core-sync" version = "0.0.0" + edition = "2021" [features] @@ -8,27 +9,27 @@ default = [] [dependencies] # Spacedrive Sub-crates -sd-prisma = { path = "../../../crates/prisma" } -sd-sync = { path = "../../../crates/sync" } -sd-utils = { path = "../../../crates/utils" } sd-actors = { path = "../../../crates/actors" } +sd-prisma = { path = "../../../crates/prisma" } +sd-sync = { path = "../../../crates/sync" } +sd-utils = { path = "../../../crates/utils" } # Workspace dependencies -async-channel = { workspace = true } -futures = { workspace = true } +async-channel = { workspace = true } +futures = { workspace = true } futures-concurrency = { workspace = true } -prisma-client-rust = { workspace = true, features = ["rspc"] } -rmpv = { workspace = true } -rmp-serde = { workspace = true } -rspc = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -tokio = { workspace = true } -thiserror = { workspace = true } -tracing = { workspace = true } -uhlc = { workspace = true } -uuid = { workspace = true } +prisma-client-rust = { workspace = true, features = ["rspc"] } +rmp-serde = { workspace = true } +rmpv = { workspace = true } +rspc = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } +uhlc = { workspace = true } +uuid = { workspace = true } [dev-dependencies] -tracing-test = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } +tracing-test = { workspace = true } diff --git a/core/prisma/migrations/migration_lock.toml b/core/prisma/migrations/migration_lock.toml index e5e5c4705ab0..6fcf33dafba6 100644 --- a/core/prisma/migrations/migration_lock.toml +++ b/core/prisma/migrations/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "sqlite" \ No newline at end of file +provider = "sqlite" diff --git a/core/src/util/unsafe_streamed_query.rs b/core/src/util/unsafe_streamed_query.rs index 1e3954512d0c..9a316373a7b5 100644 --- a/core/src/util/unsafe_streamed_query.rs +++ b/core/src/util/unsafe_streamed_query.rs @@ -3,7 +3,7 @@ use std::pin::pin; use async_stream::stream; use futures::{Stream, StreamExt}; use serde::Serialize; -use specta::{reference::Reference, DataType, Generics, Type, TypeMap}; +use specta::{DataType, Generics, Type, TypeMap}; #[derive(Serialize)] #[serde(untagged)] @@ -16,10 +16,6 @@ impl Type for Output { fn inline(type_map: &mut TypeMap, generics: Generics) -> DataType { T::inline(type_map, generics) } - - fn reference(type_map: &mut TypeMap, generics: &[DataType]) -> Reference { - T::reference(type_map, generics) - } } // Marked as unsafe as the types are a lie and this should always be used with `useUnsafeStreamedQuery` diff --git a/crates/actors/Cargo.toml b/crates/actors/Cargo.toml index 29fb43a88c27..65d33cff7a24 100644 --- a/crates/actors/Cargo.toml +++ b/crates/actors/Cargo.toml @@ -1,13 +1,14 @@ [package] -name = "sd-actors" +name = "sd-actors" version = "0.1.0" -license.workspace = true -edition.workspace = true + +edition.workspace = true +license.workspace = true repository.workspace = true [dependencies] -async-channel = { workspace = true } -futures = { workspace = true } +async-channel = { workspace = true } +futures = { workspace = true } pin-project-lite = { workspace = true } -tokio = { workspace = true } -tracing = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml index a1cb437e69fb..73e188559cb4 100644 --- a/crates/ai/Cargo.toml +++ b/crates/ai/Cargo.toml @@ -1,63 +1,64 @@ [package] -name = "sd-ai" +name = "sd-ai" version = "0.1.0" -authors = ["Ericson Soares "] -readme = "README.md" -description = "A simple library to generate video thumbnails using ffmpeg with the webp format" -rust-version = "1.75" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares "] +description = "A simple library to generate video thumbnails using ffmpeg with the webp format" +edition.workspace = true +license.workspace = true +readme = "README.md" +repository.workspace = true +rust-version = "1.75" [dependencies] # Inner Core Sub-crates sd-core-file-path-helper = { path = "../../core/crates/file-path-helper" } -sd-core-prisma-helpers = { path = "../../core/crates/prisma-helpers" } -sd-core-sync = { path = "../../core/crates/sync" } +sd-core-prisma-helpers = { path = "../../core/crates/prisma-helpers" } +sd-core-sync = { path = "../../core/crates/sync" } # Spacedrive Sub-crates sd-prisma = { path = "../prisma" } -sd-sync = { path = "../sync" } -sd-utils = { path = "../utils" } +sd-sync = { path = "../sync" } +sd-utils = { path = "../utils" } -async-channel = { workspace = true } -chrono = { workspace = true, features = ["serde"] } -futures = { workspace = true } +async-channel = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +futures = { workspace = true } futures-concurrency = { workspace = true } -image = { workspace = true } -once_cell = { workspace = true } -prisma-client-rust = { workspace = true } -reqwest = { workspace = true, features = ["stream", "native-tls-vendored"] } -rmp-serde = { workspace = true } -rmpv = { workspace = true } -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["fs"] } -tokio-stream = { workspace = true } -tracing = { workspace = true } -uuid = { workspace = true, features = ["v4", "serde"] } +image = { workspace = true } +once_cell = { workspace = true } +prisma-client-rust = { workspace = true } +reqwest = { workspace = true, features = ["native-tls-vendored", "stream"] } +rmp-serde = { workspace = true } +rmpv = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs"] } +tokio-stream = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde", "v4"] } # Note: half and ndarray version must be the same as used in ort -half = { version = "2.1", features = ['num-traits'] } +half = { version = "2.1", features = ['num-traits'] } ndarray = "0.15" -url = '2.5.0' +url = '2.5.0' # Microsoft does not provide a release for osx-gpu. See: https://github.com/microsoft/onnxruntime/releases # "gpu" means CUDA or TensorRT EP. Thus, the ort crate cannot download them at build time. # Ref: https://github.com/pykeio/ort/blob/d7defd1862969b4b44f7f3f4b9c72263690bd67b/build.rs#L148 [target.'cfg(target_os = "windows")'.dependencies] ort = { version = "=2.0.0-rc.0", default-features = false, features = [ - "ndarray", + "directml", "half", "load-dynamic", - "directml", + "ndarray" ] } [target.'cfg(target_os = "linux")'.dependencies] ort = { version = "=2.0.0-rc.0", default-features = false, features = [ - "ndarray", "half", - "xnnpack", + "ndarray", + "xnnpack" ] } # [target.'cfg(target_os = "android")'.dependencies] # ort = { version = "=2.0.0-rc.0", default-features = false, features = [ @@ -71,9 +72,9 @@ ort = { version = "=2.0.0-rc.0", default-features = false, features = [ # ] } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] ort = { version = "=2.0.0-rc.0", features = [ - "ndarray", + "coreml", "half", "load-dynamic", - "coreml", - "xnnpack", + "ndarray", + "xnnpack" ] } diff --git a/crates/cloud-api/Cargo.toml b/crates/cloud-api/Cargo.toml index 792947700f5b..49c78576a2e9 100644 --- a/crates/cloud-api/Cargo.toml +++ b/crates/cloud-api/Cargo.toml @@ -1,8 +1,9 @@ [package] -name = "sd-cloud-api" +name = "sd-cloud-api" version = "0.1.0" -license.workspace = true -edition.workspace = true + +edition.workspace = true +license.workspace = true repository.workspace = true [dependencies] @@ -10,13 +11,13 @@ repository.workspace = true sd-p2p = { path = "../p2p" } # Workspace dependencies -base64 = { workspace = true } -reqwest = { workspace = true, features = ["native-tls-vendored"] } -rmpv = { workspace = true } -rspc = { workspace = true } -serde = { workspace = true } +base64 = { workspace = true } +reqwest = { workspace = true, features = ["native-tls-vendored"] } +rmpv = { workspace = true } +rspc = { workspace = true } +serde = { workspace = true } serde_json = { workspace = true } -specta = { workspace = true } -thiserror = { workspace = true } -tracing = { workspace = true } -uuid = { workspace = true } +specta = { workspace = true } +thiserror = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true } diff --git a/crates/crypto/Cargo.toml b/crates/crypto/Cargo.toml index 4b570d2e2dc0..3e8810500cfa 100644 --- a/crates/crypto/Cargo.toml +++ b/crates/crypto/Cargo.toml @@ -1,49 +1,42 @@ [package] -name = "sd-crypto" -rust-version = "1.72" +name = "sd-crypto" version = "0.0.0" + authors = ["Jake Robinson "] description = """ A cryptographic library that provides safe and high-level encryption, hashing, and encoding interfaces. """ -readme = "README.md" +edition.workspace = true keywords = ["crypto"] -edition = { workspace = true } -license = { workspace = true } -repository = { workspace = true } +license.workspace = true +readme = "README.md" +repository.workspace = true +rust-version = "1.72" + [features] -sys = [] -serde = [ - "dep:serde", - "dep:serde_json", - "dep:serde-big-array", - "dep:serdect", - "bincode/serde", -] +experimental = [] keyring = ["dep:linux-keyutils", "dep:security-framework"] secret-service = [ - "keyring", "dep:secret-service", "dep:zbus", + "keyring" ] # explicit enabling required as the secret service api requires `zbus` and is messy -experimental = [] +serde = ["bincode/serde", "dep:serde", "dep:serde-big-array", "dep:serde_json", "dep:serdect"] +sys = [] [dependencies] # rng -rand_core = "0.9.0-alpha.0" -rand = "0.9.0-alpha.0" +rand = "0.9.0-alpha.0" rand_chacha = "0.9.0-alpha.0" +rand_core = "0.9.0-alpha.0" # hashing -argon2 = { version = "0.6.0-pre.0", default_features = false, features = [ - "alloc", - "zeroize", -] } +argon2 = { version = "0.6.0-pre.0", default_features = false, features = ["alloc", "zeroize"] } balloon-hash = { version = "0.5.0-pre.0", default_features = false, features = [ "alloc", - "zeroize", + "zeroize" ] } blake3 = { version = "1.5.0", features = ["traits-preview", "zeroize"] } @@ -51,27 +44,27 @@ blake3 = { version = "1.5.0", features = ["traits-preview", "zeroize"] } cmov = "0.3.1" # aeads -aes-gcm-siv = "0.11.1" +aead = { version = "0.5.2", default-features = false, features = ["stream"] } +aes-gcm-siv = "0.11.1" +bincode = { version = "2.0.0-rc.3", features = ["alloc", "derive"] } chacha20poly1305 = "0.10.1" -thiserror = "1.0.57" -aead = { version = "0.5.2", default-features = false, features = ["stream"] } -bincode = { version = "2.0.0-rc.3", features = ["derive", "alloc"] } +thiserror = "1.0.57" -zeroize = { version = "1.7.0", features = ["derive", "aarch64"] } +zeroize = { version = "1.7.0", features = ["aarch64", "derive"] } -serde = { version = "1.0.197", features = ["derive"], optional = true } -serde_json = { version = "1.0.114", optional = true } +serde = { version = "1.0.197", features = ["derive"], optional = true } serde-big-array = { version = "0.5.1", optional = true } -serdect = { version = "0.3.0-pre.0", optional = true } +serde_json = { version = "1.0.114", optional = true } +serdect = { version = "0.3.0-pre.0", optional = true } specta = { workspace = true, optional = true } # for asynchronous crypto tokio = { workspace = true, features = [ "io-util", - "rt-multi-thread", "macros", - "sync", + "rt-multi-thread", + "sync" ], optional = true } redb = "1.5.0" @@ -91,14 +84,14 @@ uuid = { version = "1.7.0", features = ["v4"] } linux-keyutils = { version = "0.2.4", features = ["std"], optional = true } secret-service = { version = "3.0.1", features = [ "crypto-rust", - "rt-tokio-crypto-rust", + "rt-tokio-crypto-rust" ], optional = true } # this needs to remain at versions < 4, as they made some changes and i can't get it # to compile for the time being zbus = { version = "4.0", default_features = false, features = [ - "tokio", "blocking", + "tokio" ], optional = true } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] @@ -106,44 +99,44 @@ security-framework = { version = "2.9.2", optional = true } [dev-dependencies] criterion = "0.5.1" -paste = "1.0.14" -tempfile = "3.10.1" +paste = "1.0.14" +tempfile = "3.10.1" [clippy] allow = ["unwrap_in_tests"] [[bench]] -path = "benches/crypto/aes-256-gcm-siv.rs" -name = "aes-256-gcm-siv" harness = false +name = "aes-256-gcm-siv" +path = "benches/crypto/aes-256-gcm-siv.rs" [[bench]] -path = "benches/crypto/xchacha20-poly1305.rs" -name = "xchacha20-poly1305" harness = false +name = "xchacha20-poly1305" +path = "benches/crypto/xchacha20-poly1305.rs" [[bench]] -path = "benches/hashing/argon2id.rs" -name = "argon2id" -bench = false +bench = false harness = false +name = "argon2id" +path = "benches/hashing/argon2id.rs" [[bench]] -path = "benches/hashing/blake3-balloon.rs" -name = "blake3-balloon" -bench = false +bench = false harness = false +name = "blake3-balloon" +path = "benches/hashing/blake3-balloon.rs" [[bench]] -path = "benches/hashing/blake3.rs" -name = "blake3" harness = false +name = "blake3" +path = "benches/hashing/blake3.rs" [[bench]] -path = "benches/hashing/blake3-kdf.rs" -name = "blake3-kdf" harness = false +name = "blake3-kdf" +path = "benches/hashing/blake3-kdf.rs" [[example]] -path = "examples/file_encryption.rs" name = "file_encryption" +path = "examples/file_encryption.rs" diff --git a/crates/fda/Cargo.toml b/crates/fda/Cargo.toml index 24f1a86e16eb..25c3e5507de5 100644 --- a/crates/fda/Cargo.toml +++ b/crates/fda/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "sd-fda" +name = "sd-fda" version = "0.1.0" -authors = ["Jake Robinson "] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Jake Robinson "] +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] thiserror = { workspace = true } diff --git a/crates/ffmpeg/Cargo.toml b/crates/ffmpeg/Cargo.toml index 9f84182f218d..ea6e3ff0c0e1 100644 --- a/crates/ffmpeg/Cargo.toml +++ b/crates/ffmpeg/Cargo.toml @@ -1,33 +1,31 @@ [package] -name = "sd-ffmpeg" +name = "sd-ffmpeg" version = "0.1.0" -authors = [ - "Ericson Soares ", - "VĂ­tor Vasconcellos ", -] -readme = "README.md" -description = "A simple library to generate video thumbnails using ffmpeg with the webp format" -rust-version = "1.78" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Ericson Soares ", "VĂ­tor Vasconcellos "] +description = "A simple library to generate video thumbnails using ffmpeg with the webp format" +edition.workspace = true +license.workspace = true +readme = "README.md" +repository.workspace = true +rust-version = "1.78" [dependencies] # Spacedrive Sub-crates sd-utils = { path = "../utils" } # Workspace dependencies -chrono = { workspace = true, features = ["serde"] } -image = { workspace = true } -libc = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +image = { workspace = true } +libc = { workspace = true } thiserror = { workspace = true } -tokio = { workspace = true, features = ["fs", "rt"] } -tracing = { workspace = true } -webp = { workspace = true } +tokio = { workspace = true, features = ["fs", "rt"] } +tracing = { workspace = true } +webp = { workspace = true } # Specific FFmpeg dependencies ffmpeg-sys-next = "7.0" [dev-dependencies] tempfile = { workspace = true } -tokio = { workspace = true, features = ["fs", "rt", "macros"] } +tokio = { workspace = true, features = ["fs", "macros", "rt"] } diff --git a/crates/file-ext/Cargo.toml b/crates/file-ext/Cargo.toml index 0ba69efe6ee2..a7b357854631 100644 --- a/crates/file-ext/Cargo.toml +++ b/crates/file-ext/Cargo.toml @@ -1,21 +1,19 @@ [package] -name = "sd-file-ext" +name = "sd-file-ext" version = "0.0.0" -authors = [ - "Brendan Allen ", - "Jamie Pine ", -] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Brendan Allen ", "Jamie Pine "] +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } -specta = { workspace = true } -strum = { workspace = true, features = ["derive"] } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +specta = { workspace = true } +strum = { workspace = true, features = ["derive"] } strum_macros = { workspace = true } -tokio = { workspace = true, features = ["fs", "rt", "io-util"] } +tokio = { workspace = true, features = ["fs", "io-util", "rt"] } [dev-dependencies] -tokio = { workspace = true, features = ["fs", "rt", "macros"] } +tokio = { workspace = true, features = ["fs", "macros", "rt"] } diff --git a/crates/images/Cargo.toml b/crates/images/Cargo.toml index 73fc9fd77fc9..b602584dadb4 100644 --- a/crates/images/Cargo.toml +++ b/crates/images/Cargo.toml @@ -1,38 +1,29 @@ [package] -name = "sd-images" +name = "sd-images" version = "0.1.0" -authors = [ - "Jake Robinson ", - "VĂ­tor Vasconcellos ", -] -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Jake Robinson ", "VĂ­tor Vasconcellos "] +edition.workspace = true +license.workspace = true +repository.workspace = true [features] heif = ["dep:libheif-rs", "dep:libheif-sys"] [dependencies] # Workspace dependencies -image = { workspace = true } +image = { workspace = true } once_cell = { workspace = true } -rspc = { workspace = true, optional = true } # error conversion -specta = { workspace = true, optional = true } -serde = { workspace = true, optional = true, features = ["derive"] } +rspc = { workspace = true, optional = true } # error conversion +serde = { workspace = true, optional = true, features = ["derive"] } +specta = { workspace = true, optional = true } thiserror = { workspace = true } -tracing = { workspace = true } +tracing = { workspace = true } # Specific Images dependencies -bincode = { version = "=2.0.0-rc.3", features = [ - "derive", - "alloc", -], optional = true } +bincode = { version = "=2.0.0-rc.3", features = ["alloc", "derive"], optional = true } # Disable defaults for libheif* to avoid bindgen and use pre-compiled headers -libheif-rs = { version = "1.0", default-features = false, optional = true } -libheif-sys = { version = "2.1", default-features = false, optional = true } -pdfium-render = { version = "0.8.15", features = [ - "sync", - "image", - "thread_safe", -] } -resvg = "0.42.0" +libheif-rs = { version = "1.0", default-features = false, optional = true } +libheif-sys = { version = "2.1", default-features = false, optional = true } +pdfium-render = { version = "0.8.15", features = ["image", "sync", "thread_safe"] } +resvg = "0.43.0" diff --git a/crates/media-metadata/Cargo.toml b/crates/media-metadata/Cargo.toml index a0ed6c83f5bc..672f4c160d87 100644 --- a/crates/media-metadata/Cargo.toml +++ b/crates/media-metadata/Cargo.toml @@ -1,10 +1,11 @@ [package] -name = "sd-media-metadata" +name = "sd-media-metadata" version = "0.1.0" + authors = [ - "Jake Robinson ", - "VĂ­tor Vasconcellos ", "Ericson Soares ", + "Jake Robinson ", + "VĂ­tor Vasconcellos " ] edition = "2021" @@ -14,17 +15,17 @@ ffmpeg = ["dep:sd-ffmpeg"] [dependencies] # Spacedrive Sub-crates sd-ffmpeg = { path = "../ffmpeg", optional = true } -sd-utils = { path = "../utils" } +sd-utils = { path = "../utils" } # Workspace dependencies -chrono = { workspace = true, features = ["serde"] } -image = { workspace = true } -rand = { workspace = true } -serde = { workspace = true, features = ["derive"] } +chrono = { workspace = true, features = ["serde"] } +image = { workspace = true } +rand = { workspace = true } +serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -specta = { workspace = true, features = ["chrono"] } -thiserror = { workspace = true } -tokio = { workspace = true } +specta = { workspace = true, features = ["chrono"] } +thiserror = { workspace = true } +tokio = { workspace = true } # Specific Media Metadata dependencies kamadak-exif = "0.5.5" diff --git a/crates/p2p/Cargo.toml b/crates/p2p/Cargo.toml index c670181f8f32..ead36f24ff1f 100644 --- a/crates/p2p/Cargo.toml +++ b/crates/p2p/Cargo.toml @@ -1,61 +1,54 @@ [package] -name = "sd-p2p" +name = "sd-p2p" version = "0.2.0" -description = "Rust Peer to Peer Networking Library" -authors = ["Oscar Beaumont "] -readme = "README.md" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +authors = ["Oscar Beaumont "] +description = "Rust Peer to Peer Networking Library" +edition.workspace = true +license.workspace = true +readme = "README.md" +repository.workspace = true # TODO: Remove features??? and dependencies [features] default = [] -specta = [] +specta = [] [dependencies] # Workspace dependencies -base64 = { workspace = true } -base91 = { workspace = true } -ed25519-dalek = { workspace = true } -futures = { workspace = true } +base64 = { workspace = true } +base91 = { workspace = true } +ed25519-dalek = { workspace = true } +futures = { workspace = true } pin-project-lite = { workspace = true } -reqwest = { workspace = true } -rmp-serde = { workspace = true } -serde = { workspace = true, features = ["derive"] } -specta = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = [ - "macros", - "sync", - "time", - "io-util", - "fs", -] } -tokio-stream = { workspace = true, features = ["sync"] } -tokio-util = { workspace = true, features = ["compat"] } -tracing = { workspace = true } -uuid = { workspace = true, features = ["serde"] } +reqwest = { workspace = true } +rmp-serde = { workspace = true } +serde = { workspace = true, features = ["derive"] } +specta = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs", "io-util", "macros", "sync", "time"] } +tokio-stream = { workspace = true, features = ["sync"] } +tokio-util = { workspace = true, features = ["compat"] } +tracing = { workspace = true } +uuid = { workspace = true, features = ["serde"] } # Specific P2P dependencies dns-lookup = "2.0" flume = "=0.11.0" # Must match version used by `mdns-sd` futures-core = "0.3.30" hash_map_diff = "0.2.0" -if-watch = { version = "=3.2.0", features = [ - "tokio", -] } # Override features used by libp2p-quic +if-watch = { version = "=3.2.0", features = ["tokio"] } # Override features used by libp2p-quic libp2p = { version = "=0.53.2", features = [ - "tokio", - "serde", + "autonat", + "dcutr", "macros", + "noise", "quic", - "autonat", "relay", - "yamux", - "noise", - "dcutr", + "serde", + "tokio", + "yamux" ] } # Update blocked due to custom patch libp2p-stream = "=0.1.0-alpha" # Update blocked due to custom patch mdns-sd = "0.11.1" @@ -67,6 +60,6 @@ sync_wrapper = "1.0" zeroize = { version = "1.8", features = ["derive"] } [dev-dependencies] -tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } -uuid = { workspace = true, features = ["v4"] } +uuid = { workspace = true, features = ["v4"] } diff --git a/crates/p2p/crates/block/Cargo.toml b/crates/p2p/crates/block/Cargo.toml index 033345e04119..77f1150356d8 100644 --- a/crates/p2p/crates/block/Cargo.toml +++ b/crates/p2p/crates/block/Cargo.toml @@ -1,18 +1,19 @@ [package] -name = "sd-p2p-block" +name = "sd-p2p-block" version = "0.1.0" -authors = ["Oscar Beaumont "] -license.workspace = true -edition.workspace = true + +authors = ["Oscar Beaumont "] +edition.workspace = true +license.workspace = true repository.workspace = true [dependencies] # Spacedrive Sub-crates -sd-p2p = { path = "../../" } +sd-p2p = { path = "../../" } sd-p2p-proto = { path = "../proto" } # Workspace dependencies thiserror = { workspace = true } -tokio = { workspace = true } -tracing = { workspace = true } -uuid = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true } diff --git a/crates/p2p/crates/proto/Cargo.toml b/crates/p2p/crates/proto/Cargo.toml index 51bd00b91af6..685aaf4ec97f 100644 --- a/crates/p2p/crates/proto/Cargo.toml +++ b/crates/p2p/crates/proto/Cargo.toml @@ -1,13 +1,14 @@ [package] -name = "sd-p2p-proto" +name = "sd-p2p-proto" version = "0.1.0" -authors = ["Oscar Beaumont "] -license.workspace = true -edition.workspace = true + +authors = ["Oscar Beaumont "] +edition.workspace = true +license.workspace = true repository.workspace = true [dependencies] ed25519-dalek = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["io-util"] } -uuid = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["io-util"] } +uuid = { workspace = true } diff --git a/crates/p2p/crates/tunnel/Cargo.toml b/crates/p2p/crates/tunnel/Cargo.toml index 816a5cef171a..bbedd8b1da3e 100644 --- a/crates/p2p/crates/tunnel/Cargo.toml +++ b/crates/p2p/crates/tunnel/Cargo.toml @@ -1,17 +1,18 @@ [package] -name = "sd-p2p-tunnel" +name = "sd-p2p-tunnel" version = "0.1.0" -authors = ["Oscar Beaumont "] -license.workspace = true -edition.workspace = true + +authors = ["Oscar Beaumont "] +edition.workspace = true +license.workspace = true repository.workspace = true [dependencies] # Spacedrive Sub-crates -sd-p2p = { path = "../../" } +sd-p2p = { path = "../../" } sd-p2p-proto = { path = "../proto" } # Workspace dependencies -tokio = { workspace = true, features = ["io-util"] } thiserror = { workspace = true } -uuid = { workspace = true, features = ["v4"] } +tokio = { workspace = true, features = ["io-util"] } +uuid = { workspace = true, features = ["v4"] } diff --git a/crates/prisma-cli/Cargo.toml b/crates/prisma-cli/Cargo.toml index 69522f1af4ee..b6594a4076c9 100644 --- a/crates/prisma-cli/Cargo.toml +++ b/crates/prisma-cli/Cargo.toml @@ -1,9 +1,10 @@ [package] -name = "prisma-cli" +name = "prisma-cli" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] # Spacedrive Sub-crates diff --git a/crates/prisma/Cargo.toml b/crates/prisma/Cargo.toml index d42d563c863e..5910d57e2dfd 100644 --- a/crates/prisma/Cargo.toml +++ b/crates/prisma/Cargo.toml @@ -1,6 +1,7 @@ [package] -name = "sd-prisma" +name = "sd-prisma" version = "0.1.0" + edition = "2021" [dependencies] @@ -9,8 +10,8 @@ sd-sync = { path = "../sync" } # Workspace dependencies prisma-client-rust = { workspace = true } -rmpv = { workspace = true } -rmp-serde = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -uuid = { workspace = true } +rmp-serde = { workspace = true } +rmpv = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +uuid = { workspace = true } diff --git a/crates/sync-generator/Cargo.toml b/crates/sync-generator/Cargo.toml index 8b07f7146945..7ca3a9ae35fb 100644 --- a/crates/sync-generator/Cargo.toml +++ b/crates/sync-generator/Cargo.toml @@ -1,14 +1,15 @@ [package] -name = "sd-sync-generator" +name = "sd-sync-generator" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] prisma-client-rust-sdk = { workspace = true } -serde = { workspace = true, features = ["derive"] } -thiserror = { workspace = true } +serde = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } # Specific Sync Generator dependencies nom = "7.1.3" diff --git a/crates/sync/Cargo.toml b/crates/sync/Cargo.toml index 003217aaffba..8b15355ca686 100644 --- a/crates/sync/Cargo.toml +++ b/crates/sync/Cargo.toml @@ -1,17 +1,18 @@ [package] -name = "sd-sync" +name = "sd-sync" version = "0.1.0" -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +repository.workspace = true [dependencies] prisma-client-rust = { workspace = true } -rmp = { workspace = true } -rmp-serde = { workspace = true } -rmpv = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -specta = { workspace = true, features = ["uuid", "uhlc", "serde_json"] } -uhlc = { workspace = true } -uuid = { workspace = true, features = ["serde", "v4"] } +rmp = { workspace = true } +rmp-serde = { workspace = true } +rmpv = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +specta = { workspace = true, features = ["serde_json", "uhlc", "uuid"] } +uhlc = { workspace = true } +uuid = { workspace = true, features = ["serde", "v4"] } diff --git a/crates/sync/example/Cargo.toml b/crates/sync/example/Cargo.toml index 8bd3f690d1f2..49521583abfc 100644 --- a/crates/sync/example/Cargo.toml +++ b/crates/sync/example/Cargo.toml @@ -1,26 +1,27 @@ [package] -name = "sd-sync-example" +name = "sd-sync-example" version = "0.1.0" -rust-version = "1.64" -publish = false -license = { workspace = true } -repository = { workspace = true } -edition = { workspace = true } + +edition.workspace = true +license.workspace = true +publish = false +repository.workspace = true +rust-version = "1.64" [dependencies] # Spacedrive Sub-crates sd-sync = { path = ".." } # Workspace dependencies -axum = { workspace = true } -http = { workspace = true } +axum = { workspace = true } +http = { workspace = true } prisma-client-rust = { workspace = true } -rspc = { workspace = true, features = ["axum"] } -serde_json = { workspace = true } -serde = { workspace = true, features = ["derive"] } -tokio = { workspace = true, features = ["full"] } -uuid = { workspace = true, features = ["v4"] } +rspc = { workspace = true, features = ["axum"] } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +tokio = { workspace = true, features = ["full"] } +uuid = { workspace = true, features = ["v4"] } # Specific Core dependencies -dotenv = "0.15.0" +dotenv = "0.15.0" tower-http = { version = "0.4.4", features = ["cors"] } # Update blocked by http diff --git a/crates/task-system/Cargo.toml b/crates/task-system/Cargo.toml index fcc5b1a238e7..03e31ba602ea 100644 --- a/crates/task-system/Cargo.toml +++ b/crates/task-system/Cargo.toml @@ -1,41 +1,37 @@ [package] -name = "sd-task-system" +name = "sd-task-system" version = "0.1.0" -authors = ["Ericson Soares "] -rust-version = "1.75" -license.workspace = true -edition.workspace = true + +authors = ["Ericson Soares "] +edition.workspace = true +license.workspace = true repository.workspace = true +rust-version = "1.75" [dependencies] # Workspace deps -async-channel = { workspace = true } -async-trait = { workspace = true } -futures = { workspace = true } +async-channel = { workspace = true } +async-trait = { workspace = true } +futures = { workspace = true } futures-concurrency = { workspace = true } -pin-project-lite = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = [ - "sync", - "parking_lot", - "rt-multi-thread", - "time", -] } -tokio-stream = { workspace = true } -tracing = { workspace = true } -uuid = { workspace = true, features = ["v4"] } +pin-project-lite = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["parking_lot", "rt-multi-thread", "sync", "time"] } +tokio-stream = { workspace = true } +tracing = { workspace = true } +uuid = { workspace = true, features = ["v4"] } # Specific Task System dependencies downcast-rs = "1.2" [dev-dependencies] -lending-stream = { workspace = true } -rand = { workspace = true } -rmp-serde = { workspace = true } -serde = { workspace = true, features = ["derive"] } -tempfile = { workspace = true } -thiserror = { workspace = true } -tokio = { workspace = true, features = ["macros", "test-util", "fs"] } -tracing-test = { workspace = true, features = ["no-env-filter"] } -uuid = { workspace = true, features = ["serde"] } +lending-stream = { workspace = true } +rand = { workspace = true } +rmp-serde = { workspace = true } +serde = { workspace = true, features = ["derive"] } +tempfile = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["fs", "macros", "test-util"] } tracing-subscriber = { workspace = true, features = ["env-filter"] } +tracing-test = { workspace = true, features = ["no-env-filter"] } +uuid = { workspace = true, features = ["serde"] } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 1294af2345df..c535b0c0f474 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -1,6 +1,7 @@ [package] -name = "sd-utils" +name = "sd-utils" version = "0.1.0" + edition = "2021" [dependencies] @@ -9,6 +10,6 @@ sd-prisma = { path = "../prisma" } # Workspace dependencies prisma-client-rust = { workspace = true } -rspc = { workspace = true, features = ["unstable"] } -thiserror = { workspace = true } -uuid = { workspace = true } +rspc = { workspace = true, features = ["unstable"] } +thiserror = { workspace = true } +uuid = { workspace = true } diff --git a/interface/app/$libraryId/TopBar/TopBarOptions.tsx b/interface/app/$libraryId/TopBar/TopBarOptions.tsx index 99750b435b34..85274a022e5a 100644 --- a/interface/app/$libraryId/TopBar/TopBarOptions.tsx +++ b/interface/app/$libraryId/TopBar/TopBarOptions.tsx @@ -1,5 +1,5 @@ import { Cards, IconWeight, Minus, Square, X } from '@phosphor-icons/react'; -import { getCurrent, Window } from '@tauri-apps/api/window'; +import { Window } from '@tauri-apps/api/window'; import clsx from 'clsx'; import { useCallback, useEffect, useLayoutEffect, useState } from 'react'; import { ModifierKeys, Popover, Tooltip, usePopover } from '@sd/ui'; @@ -185,7 +185,7 @@ function ToolGroup({ export function WindowsControls({ windowSize }: { windowSize: number }) { const [maximized, setMaximized] = useState(false); const getWindowState = useCallback(async () => { - const isMaximized = await getCurrent().isMaximized(); + const isMaximized = await Window.getCurrent().isMaximized(); setMaximized(isMaximized); }, []); diff --git a/package.json b/package.json index 4b5454b2aed0..27431ca33d55 100644 --- a/package.json +++ b/package.json @@ -54,10 +54,11 @@ "@babel/plugin-syntax-import-assertions": "^7.24.1", "@cspell/dict-rust": "^4.0.2", "@cspell/dict-typescript": "^3.1.2", - "@ianvs/prettier-plugin-sort-imports": "^4.2.1", + "@ianvs/prettier-plugin-sort-imports": "^4.3.1", + "@taplo/cli": "^0.7.0", "cspell": "^8.6.0", - "prettier": "^3.2.5", - "prettier-plugin-tailwindcss": "^0.5.12", + "prettier": "^3.3.3", + "prettier-plugin-tailwindcss": "^0.6.6", "turbo": "^1.12.5", "turbo-ignore": "^1.12.5", "typescript": "^5.4.2", @@ -72,5 +73,5 @@ "eslintConfig": { "root": true }, - "packageManager": "pnpm@9.6.0" + "packageManager": "pnpm@9.7.0" } diff --git a/packages/client/src/core.ts b/packages/client/src/core.ts index 98019c02c990..598cf8756f6c 100644 --- a/packages/client/src/core.ts +++ b/packages/client/src/core.ts @@ -142,7 +142,7 @@ export type Procedures = { { key: "locations.quickRescan", input: LibraryArgs, result: null } | { key: "notifications.listen", input: never, result: Notification } | { key: "p2p.events", input: never, result: P2PEvent } | - { key: "search.ephemeralPaths", input: LibraryArgs, result: EphemeralPathsResultItem } | + { key: "search.ephemeralPaths", input: LibraryArgs, result: { entries: ExplorerItem[]; errors: Error[] } } | { key: "sync.active", input: LibraryArgs, result: SyncStatus } | { key: "sync.newMessage", input: LibraryArgs, result: null } }; @@ -246,8 +246,6 @@ export type EphemeralPathOrder = { field: "name"; value: SortOrder } | { field: export type EphemeralPathSearchArgs = { path: string; withHiddenFiles: boolean; order?: EphemeralPathOrder | null } -export type EphemeralPathsResultItem = { entries: ExplorerItem[]; errors: Error[] } - export type EphemeralRenameFileArgs = { kind: EphemeralRenameKind } export type EphemeralRenameKind = { One: EphemeralRenameOne } | { Many: EphemeralRenameMany } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c282f204c931..62197e9cf73b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,17 +40,20 @@ importers: specifier: ^3.1.2 version: 3.1.2 '@ianvs/prettier-plugin-sort-imports': - specifier: ^4.2.1 - version: 4.2.1(prettier@3.2.5) + specifier: ^4.3.1 + version: 4.3.1(prettier@3.3.3) + '@taplo/cli': + specifier: ^0.7.0 + version: 0.7.0 cspell: specifier: ^8.6.0 version: 8.6.0 prettier: - specifier: ^3.2.5 - version: 3.2.5 + specifier: ^3.3.3 + version: 3.3.3 prettier-plugin-tailwindcss: - specifier: ^0.5.12 - version: 0.5.12(@ianvs/prettier-plugin-sort-imports@4.2.1(prettier@3.2.5))(prettier@3.2.5) + specifier: ^0.6.6 + version: 0.6.6(@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.3.3))(prettier@3.3.3) turbo: specifier: ^1.12.5 version: 1.12.5 @@ -93,7 +96,7 @@ importers: version: 0.0.0-main-dc31e5b2 '@oscartbeaumont-sd/rspc-tauri': specifier: '=0.0.0-main-dc31e5b2' - version: 0.0.0-main-dc31e5b2(patch_hash=aivg4lv3fcaaigmygku42cefnu)(@tauri-apps/api@2.0.0-beta.16) + version: 0.0.0-main-dc31e5b2(patch_hash=aivg4lv3fcaaigmygku42cefnu)(@tauri-apps/api@2.0.0-rc.0) '@remix-run/router': specifier: '=1.13.1' version: 1.13.1(patch_hash=rgixflaa47ddt4t677o2d275p4) @@ -111,19 +114,19 @@ importers: version: 0.7.3(typescript@5.4.2)(zod@3.22.4) '@tanstack/react-query': specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) '@tauri-apps/api': - specifier: next - version: 2.0.0-beta.16 + specifier: '=2.0.0-rc.0' + version: 2.0.0-rc.0 '@tauri-apps/plugin-dialog': - specifier: 2.0.0-beta.3 - version: 2.0.0-beta.3 + specifier: '=2.0.0-rc.0' + version: 2.0.0-rc.0 '@tauri-apps/plugin-os': - specifier: 2.0.0-beta.3 - version: 2.0.0-beta.3 + specifier: '=2.0.0-rc.0' + version: 2.0.0-rc.0 '@tauri-apps/plugin-shell': - specifier: 2.0.0-beta.3 - version: 2.0.0-beta.3 + specifier: '=2.0.0-rc.0' + version: 2.0.0-rc.0 consistent-hash: specifier: ^1.2.2 version: 1.2.2 @@ -150,8 +153,8 @@ importers: specifier: ^2.16.0 version: 2.16.0 '@tauri-apps/cli': - specifier: 2.0.0-beta.20 - version: 2.0.0-beta.20 + specifier: '=2.0.0-rc.3' + version: 2.0.0-rc.3 '@types/react': specifier: ^18.2.67 version: 18.2.67 @@ -187,10 +190,10 @@ importers: version: 1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@react-three/drei': specifier: ^9.88.13 - version: 9.102.6(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0))(@types/react@18.2.67)(@types/three@0.162.0)(immer@10.0.4)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(three@0.161.0) + version: 9.102.6(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0))(@types/react@18.2.67)(@types/three@0.162.0)(immer@10.0.4)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(three@0.161.0) '@react-three/fiber': specifier: ^8.15.11 - version: 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0) + version: 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0) '@sd/assets': specifier: workspace:* version: link:../../packages/assets @@ -365,7 +368,7 @@ importers: version: 6.5.20(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-screens@3.29.0(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) '@react-navigation/drawer': specifier: ^6.6.14 - version: 6.6.15(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-gesture-handler@2.14.1(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-reanimated@3.6.3(@babel/core@7.24.0)(@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.24.0))(@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.0))(@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.24.0))(@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.24.0))(@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-screens@3.29.0(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) + version: 6.6.15(3fzmnfc2je7bh62gn24exmf5uu) '@react-navigation/native': specifier: ^6.1.16 version: 6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) @@ -627,7 +630,7 @@ importers: version: link:../../interface '@tanstack/react-query': specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) html-to-image: specifier: ^1.11.11 version: 1.11.11 @@ -745,10 +748,10 @@ importers: version: 7.107.0 '@tanstack/react-query': specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) '@tanstack/react-query-devtools': specifier: ^4.36.1 - version: 4.36.1(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 4.36.1(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@tanstack/react-table': specifier: ^8.10.7 version: 8.13.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -817,7 +820,7 @@ importers: version: 4.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) react-i18next: specifier: ^13.5.0 - version: 13.5.0(i18next@23.10.1)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + version: 13.5.0(i18next@23.10.1)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) react-json-view: specifier: ^1.21.3 version: 1.21.3(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -919,13 +922,13 @@ importers: version: 0.0.0-main-dc31e5b2 '@oscartbeaumont-sd/rspc-react': specifier: '=0.0.0-main-dc31e5b2' - version: 0.0.0-main-dc31e5b2(@oscartbeaumont-sd/rspc-client@0.0.0-main-dc31e5b2)(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0))(react@18.2.0) + version: 0.0.0-main-dc31e5b2(@oscartbeaumont-sd/rspc-client@0.0.0-main-dc31e5b2)(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react@18.2.0) '@solid-primitives/deep': specifier: ^0.2.4 version: 0.2.7(solid-js@1.8.15) '@tanstack/react-query': specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + version: 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) '@tanstack/solid-query': specifier: ^5.17.9 version: 5.28.5(solid-js@1.8.15) @@ -996,7 +999,7 @@ importers: version: 1.12.5(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.1.3 - version: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5) + version: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3) eslint-plugin-react: specifier: ^7.34.1 version: 7.34.1(eslint@8.57.0) @@ -1217,7 +1220,7 @@ importers: version: 48.2.1(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.1.3 - version: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5) + version: 5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -2980,8 +2983,8 @@ packages: resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} deprecated: Use @eslint/object-schema instead - '@ianvs/prettier-plugin-sort-imports@4.2.1': - resolution: {integrity: sha512-NKN1LVFWUDGDGr3vt+6Ey3qPeN/163uR1pOPAlkWpgvAqgxQ6kSdUf1F0it8aHUtKRUzEGcK38Wxd07O61d7+Q==} + '@ianvs/prettier-plugin-sort-imports@4.3.1': + resolution: {integrity: sha512-ZHwbyjkANZOjaBm3ZosADD2OUYGFzQGxfy67HmGZU94mHqe7g1LCMA7YYKB1Cq+UTPCBqlAYapY0KXAjKEw8Sg==} peerDependencies: '@vue/compiler-sfc': 2.7.x || 3.x prettier: 2 || 3 @@ -3582,6 +3585,9 @@ packages: '@radix-ui/number@1.0.1': resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==} + '@radix-ui/primitive@1.0.0': + resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==} + '@radix-ui/primitive@1.0.1': resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==} @@ -3624,6 +3630,11 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-compose-refs@1.0.0': + resolution: {integrity: sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-compose-refs@1.0.1': resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} peerDependencies: @@ -3677,6 +3688,12 @@ packages: '@types/react': optional: true + '@radix-ui/react-dismissable-layer@1.0.2': + resolution: {integrity: sha512-WjJzMrTWROozDqLB0uRWYvj4UuXsM/2L19EmQ3Au+IJWqwvwq9Bwd+P8ivo0Deg9JDPArR1I6MbWNi1CmXsskg==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-dismissable-layer@1.0.4': resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==} peerDependencies: @@ -3851,6 +3868,12 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-primitive@1.0.1': + resolution: {integrity: sha512-fHbmislWVkZaIdeF6GZxF0A/NH/3BjrGIYj+Ae6eTmTCr7EB0RQAAVEiqsXK6p3/JcRqVSBQoceZroj30Jj3XA==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-primitive@1.0.3': resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} peerDependencies: @@ -3929,6 +3952,11 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-slot@1.0.1': + resolution: {integrity: sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-slot@1.0.2': resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} peerDependencies: @@ -3990,6 +4018,11 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-use-callback-ref@1.0.0': + resolution: {integrity: sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-use-callback-ref@1.0.1': resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} peerDependencies: @@ -4008,6 +4041,11 @@ packages: '@types/react': optional: true + '@radix-ui/react-use-escape-keydown@1.0.2': + resolution: {integrity: sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==} + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + '@radix-ui/react-use-escape-keydown@1.0.3': resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==} peerDependencies: @@ -5098,87 +5136,87 @@ packages: '@tanstack/virtual-core@3.2.0': resolution: {integrity: sha512-P5XgYoAw/vfW65byBbJQCw+cagdXDT/qH6wmABiLt4v4YBT2q2vqCOhihe+D1Nt325F/S/0Tkv6C5z0Lv+VBQQ==} - '@tauri-apps/api@2.0.0-beta.11': - resolution: {integrity: sha512-wJRY+fBUm3KpqZDHMIz5HRv+1vlnvRJ/dFxiyY3NlINTx2qXqDou5qWYcP1CuZXsd39InWVPV3FAZvno/kGCkA==} - engines: {node: '>= 18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} + '@taplo/cli@0.7.0': + resolution: {integrity: sha512-Ck3zFhQhIhi02Hl6T4ZmJsXdnJE+wXcJz5f8klxd4keRYgenMnip3JDPMGDRLbnC/2iGd8P0sBIQqI3KxfVjBg==} + hasBin: true - '@tauri-apps/api@2.0.0-beta.16': - resolution: {integrity: sha512-YGjkR9HxS/YyIoqoXDkk8o9Yy5NW6u9YxzeqEodwwOUoeS0nac6mzLTW3VYIuSelHmyUQCgbyENVY6e5CJXA4Q==} + '@tauri-apps/api@2.0.0-rc.0': + resolution: {integrity: sha512-v454Qs3REHc3Za59U+/eSmBsdmF+3NE5+76+lFDaitVqN4ZglDHENDaMARYKGJVZuxiSkzyqG0SeG7lLQjVkPA==} engines: {node: '>= 18.18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - '@tauri-apps/cli-darwin-arm64@2.0.0-beta.20': - resolution: {integrity: sha512-oCJOCib7GuYkwkBXx+ekamR8NZZU+2i3MLP+DHpDxK5gS2uhCE+CBkamJkNt6y1x6xdVnwyqZOm5RvN4SRtyIA==} + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.3': + resolution: {integrity: sha512-szYCSr/ChbCF+S6Wnr15TYpI2cZR07d+AQOiFGuScP0preM8Pbsk/sb0hfLwqzepjVFFNVWQba9sG7FEW2Y2XA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-beta.20': - resolution: {integrity: sha512-lC5QSnRExedYN4Ds6ZlSvC2PxP8qfIYBJQ5ktf+PJI5gQALdNeVtd6YnTG1ODCEklfLq9WKkGwp7JdALTU5wDA==} + '@tauri-apps/cli-darwin-x64@2.0.0-rc.3': + resolution: {integrity: sha512-BJv6EJOY1DJbRzVtfg8CcBAlnS5OjhBAc5YKjh4BT7EyOcop8HStBSxhL6yjWrUP7eLR1iIsW/uSehVJwzYIdQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.20': - resolution: {integrity: sha512-nZCeBMHHye5DLOJV5k2w658hnCS+LYaOZ8y/G9l3ei+g0L/HBjlSy6r4simsAT5TG8+l3oCZzLBngfTMdDS/YA==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.3': + resolution: {integrity: sha512-fwx805/xL4sF/EdMYqcUHQHzMYwo+OVTBTz5x/JWK8D57rnmLHAP+ZhnfFsZQLRo2QRT2l1Ye3bDyU+QRA1JFA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.20': - resolution: {integrity: sha512-B79ISVLPVBgwnCchVqwTKU+vxnFYqxKomcR4rmsvxfs0NVtT5QuNzE1k4NUQnw3966yjwhYR3mnHsSJQSB4Eyw==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.3': + resolution: {integrity: sha512-3KauzO1Ls4kuY0nr82S4X8XFxlQAMN+Mqp8LLqvQ+PPMp92XQAkPH7osQdoHIEoW5gsE69U2JaiQ5tHSqNM9og==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.20': - resolution: {integrity: sha512-ojIkv/1uZHhcrgfIN8xgn4BBeo/Xg+bnV0wer6lD78zyxkUMWeEZ+u3mae1ejCJNhhaZOxNaUQ67MvDOiGyr5Q==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.3': + resolution: {integrity: sha512-ngHS0foffm1xO5gqnDKGeYMKj8ceGmrFP5dDldoaaMQubw1SyFa0pRUjb7fZSYiO7F4SOSa8NYeMqlF9peZmnQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.20': - resolution: {integrity: sha512-xBy1FNbHKlc7T6pOmFQQPECxJaI5A9QWX7Kb9N64cNVusoOGlvc3xHYkXMS4PTr7xXOT0yiE1Ww2OwDRJ3lYsg==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.3': + resolution: {integrity: sha512-0/am9pVvuUHGmz32M8ffz1fpLnc08j3nzcRe5wUdL2AxfT+wKMII+Dn99GtCVgcdDW4jSXDMRUwrBkGocGC2OA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-beta.20': - resolution: {integrity: sha512-+O6zq5jmtUxA1FUAAwF2ywPysy4NRo2Y6G+ESZDkY9XosRwdt5OUjqAsYktZA3AxDMZVei8r9buwTqUwi9ny/g==} + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.3': + resolution: {integrity: sha512-r7mRi8q8TqTFVjb9kAsU7IgwUgno2s8Ip4xwq9psQhlRE3JGEZQmSEcy1jqTjfl6KFh6lJcDR7l+9/EMhL/D3Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.20': - resolution: {integrity: sha512-RswgMbWyOQcv53CHvIuiuhAh4kKDqaGyZfWD4VlxqX/XhkoF5gsNgr0MxzrY7pmoL+89oVI+fiGVJz4nOQE5vA==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.3': + resolution: {integrity: sha512-2J6KjmDIQCw6HF1X6/yPcd+JLl7pxrH2zVMGmNllaoWhHeByvRobqFWnT7gcdHaA3dGTo432CwWvOgTgrINQpQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.20': - resolution: {integrity: sha512-5lgWmDVXhX3SBGbiv5SduM1yajiRnUEJClWhSdRrEEJeXdsxpCsBEhxYnUnDCEzPKxLLn5fdBv3VrVctJ03csQ==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.3': + resolution: {integrity: sha512-8q75CsHDSEDdgi6xPwim+BaQZFCswK2Dn/qL38V3Mh9kmVvC8oGJMPC66bC20dF+v3KWeFm2FNNGQqOSXCveHg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.20': - resolution: {integrity: sha512-SuSiiVQTQPSzWlsxQp/NMzWbzDS9TdVDOw7CCfgiG5wnT2GsxzrcIAVN6i7ILsVFLxrjr0bIgPldSJcdcH84Yw==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.3': + resolution: {integrity: sha512-qeBRJYalahxEXolekcpZJ/HBrIJacG2NWJBGhhi797mIwnbmlpbHMc8blIJtNNNwVUb2BjXuxKQVfojQ5YYrcg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-beta.20': - resolution: {integrity: sha512-707q9uIc2oNrYHd2dtMvxTrpZXVpart5EIktnRymNOpphkLlB6WUBjHD+ga45WqTU6cNGKbYvkKqTNfshNul9Q==} + '@tauri-apps/cli@2.0.0-rc.3': + resolution: {integrity: sha512-iNF95pieBmverl1EmQyqh+fhcIClS544fN5Ex5lAbYLTiHZ/gm3lOfVBhF6NPaKd/sfLuy7K1tfDXlHztBfANw==} engines: {node: '>= 10'} hasBin: true - '@tauri-apps/plugin-dialog@2.0.0-beta.3': - resolution: {integrity: sha512-B3KxLjFxCVB3AIYWN/xY9HM6tO7m4u6aQk1t0ZrBToXThowRU9f62527EO0oj0uNlyKlXx20up68NkpdlER0yg==} + '@tauri-apps/plugin-dialog@2.0.0-rc.0': + resolution: {integrity: sha512-DPOXYe8SQ6Radk/67EOdaomlxL7oF99JO/ZUaPp1IBEs3Wro7lhlz63CfdKIBfKIZTLJLzP1R7/EiPL/GTA3Bg==} - '@tauri-apps/plugin-os@2.0.0-beta.3': - resolution: {integrity: sha512-kuTfns6z7z/RKAqij3293fnSsgRHlogO/SzNWziFDGHpijGUm/peH70Cv45LKvHw+7kEMX+nfHFWOZm8UEVy/w==} + '@tauri-apps/plugin-os@2.0.0-rc.0': + resolution: {integrity: sha512-OWAl8mooKnGykSD4iog8WRqcnOSx0gGmTJBlEExHdFeIuOHg0Ezvd+WiVLhT9LBg7go3ibNWRWpe/ZG7YEp4Vw==} - '@tauri-apps/plugin-shell@2.0.0-beta.3': - resolution: {integrity: sha512-iSFKUJzmdBE194J0q2O3nWgO86tApVsB9kKD4UkB4YNGTIz09hgeXsOIEo3bMfJEmQe54H/zPBzPo9TeuZZFGA==} + '@tauri-apps/plugin-shell@2.0.0-rc.0': + resolution: {integrity: sha512-bhUcQcrqZoK8H1DFXapr5r1Z75oh6Kd5Tltz97XpZFLREEqp+KhN2Fvyh8r/fKAyenYsTYUIsDsyGdjdueuF9g==} '@testing-library/dom@9.3.4': resolution: {integrity: sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==} @@ -10984,26 +11022,27 @@ packages: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} - prettier-plugin-tailwindcss@0.5.12: - resolution: {integrity: sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==} + prettier-plugin-tailwindcss@0.6.6: + resolution: {integrity: sha512-OPva5S7WAsPLEsOuOWXATi13QrCKACCiIonFgIR6V4lYv4QLp++UXVhZSzRbZxXGimkQtQT86CC6fQqTOybGng==} engines: {node: '>=14.21.3'} peerDependencies: '@ianvs/prettier-plugin-sort-imports': '*' '@prettier/plugin-pug': '*' '@shopify/prettier-plugin-liquid': '*' '@trivago/prettier-plugin-sort-imports': '*' + '@zackad/prettier-plugin-twig-melody': '*' prettier: ^3.0 prettier-plugin-astro: '*' prettier-plugin-css-order: '*' prettier-plugin-import-sort: '*' prettier-plugin-jsdoc: '*' prettier-plugin-marko: '*' + prettier-plugin-multiline-arrays: '*' prettier-plugin-organize-attributes: '*' prettier-plugin-organize-imports: '*' prettier-plugin-sort-imports: '*' prettier-plugin-style-order: '*' prettier-plugin-svelte: '*' - prettier-plugin-twig-melody: '*' peerDependenciesMeta: '@ianvs/prettier-plugin-sort-imports': optional: true @@ -11013,6 +11052,8 @@ packages: optional: true '@trivago/prettier-plugin-sort-imports': optional: true + '@zackad/prettier-plugin-twig-melody': + optional: true prettier-plugin-astro: optional: true prettier-plugin-css-order: @@ -11023,6 +11064,8 @@ packages: optional: true prettier-plugin-marko: optional: true + prettier-plugin-multiline-arrays: + optional: true prettier-plugin-organize-attributes: optional: true prettier-plugin-organize-imports: @@ -11033,16 +11076,14 @@ packages: optional: true prettier-plugin-svelte: optional: true - prettier-plugin-twig-melody: - optional: true prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} engines: {node: '>=14'} hasBin: true @@ -15842,14 +15883,14 @@ snapshots: '@humanwhocodes/object-schema@2.0.2': {} - '@ianvs/prettier-plugin-sort-imports@4.2.1(prettier@3.2.5)': + '@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.3.3)': dependencies: '@babel/core': 7.24.0 '@babel/generator': 7.23.6 '@babel/parser': 7.24.0 '@babel/traverse': 7.24.0 '@babel/types': 7.24.0 - prettier: 3.2.5 + prettier: 3.3.3 semver: 7.6.0 transitivePeerDependencies: - supports-color @@ -16408,16 +16449,10 @@ snapshots: '@tanstack/react-query': 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) react: 18.2.0 - '@oscartbeaumont-sd/rspc-react@0.0.0-main-dc31e5b2(@oscartbeaumont-sd/rspc-client@0.0.0-main-dc31e5b2)(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0))(react@18.2.0)': + '@oscartbeaumont-sd/rspc-tauri@0.0.0-main-dc31e5b2(patch_hash=aivg4lv3fcaaigmygku42cefnu)(@tauri-apps/api@2.0.0-rc.0)': dependencies: '@oscartbeaumont-sd/rspc-client': 0.0.0-main-dc31e5b2 - '@tanstack/react-query': 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) - react: 18.2.0 - - '@oscartbeaumont-sd/rspc-tauri@0.0.0-main-dc31e5b2(patch_hash=aivg4lv3fcaaigmygku42cefnu)(@tauri-apps/api@2.0.0-beta.16)': - dependencies: - '@oscartbeaumont-sd/rspc-client': 0.0.0-main-dc31e5b2 - '@tauri-apps/api': 2.0.0-beta.16 + '@tauri-apps/api': 2.0.0-rc.0 '@phosphor-icons/core@2.0.8': {} @@ -16485,6 +16520,10 @@ snapshots: dependencies: '@babel/runtime': 7.24.0 + '@radix-ui/primitive@1.0.0': + dependencies: + '@babel/runtime': 7.24.0 + '@radix-ui/primitive@1.0.1': dependencies: '@babel/runtime': 7.24.0 @@ -16529,6 +16568,11 @@ snapshots: '@types/react': 18.2.67 '@types/react-dom': 18.2.22 + '@radix-ui/react-compose-refs@1.0.0(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + react: 18.2.0 + '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.67)(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -16588,6 +16632,17 @@ snapshots: optionalDependencies: '@types/react': 18.2.67 + '@radix-ui/react-dismissable-layer@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + '@radix-ui/primitive': 1.0.0 + '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) + '@radix-ui/react-primitive': 1.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) + '@radix-ui/react-use-escape-keydown': 1.0.2(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + '@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -16679,7 +16734,7 @@ snapshots: '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.67)(react@18.2.0) '@radix-ui/react-context': 1.0.1(@types/react@18.2.67)(react@18.2.0) '@radix-ui/react-direction': 1.0.1(@types/react@18.2.67)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.22)(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.67)(react@18.2.0) '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.22)(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@radix-ui/react-id': 1.0.1(@types/react@18.2.67)(react@18.2.0) @@ -16791,6 +16846,13 @@ snapshots: '@types/react': 18.2.67 '@types/react-dom': 18.2.22 + '@radix-ui/react-primitive@1.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + '@radix-ui/react-slot': 1.0.1(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.22)(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -16899,6 +16961,12 @@ snapshots: '@types/react': 18.2.67 '@types/react-dom': 18.2.22 + '@radix-ui/react-slot@1.0.1(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) + react: 18.2.0 + '@radix-ui/react-slot@1.0.2(@types/react@18.2.67)(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -16982,6 +17050,11 @@ snapshots: '@types/react': 18.2.67 '@types/react-dom': 18.2.22 + '@radix-ui/react-use-callback-ref@1.0.0(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + react: 18.2.0 + '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.67)(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -16997,6 +17070,12 @@ snapshots: optionalDependencies: '@types/react': 18.2.67 + '@radix-ui/react-use-escape-keydown@1.0.2(react@18.2.0)': + dependencies: + '@babel/runtime': 7.24.0 + '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) + react: 18.2.0 + '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.67)(react@18.2.0)': dependencies: '@babel/runtime': 7.24.0 @@ -17584,13 +17663,6 @@ snapshots: nullthrows: 1.1.1 react-native: 0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0) - '@react-native/virtualized-lists@0.73.4(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))': - dependencies: - invariant: 2.2.4 - nullthrows: 1.1.1 - react-native: 0.73.4(@babel/core@7.24.0)(react@18.2.0) - optional: true - '@react-navigation/bottom-tabs@6.5.20(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-screens@3.29.0(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)': dependencies: '@react-navigation/elements': 1.3.30(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) @@ -17612,8 +17684,8 @@ snapshots: react-is: 16.13.1 use-latest-callback: 0.1.9(react@18.2.0) - ? '@react-navigation/drawer@6.6.15(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-gesture-handler@2.14.1(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-reanimated@3.6.3(@babel/core@7.24.0)(@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.24.0))(@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.0))(@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.24.0))(@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.24.0))(@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-screens@3.29.0(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)' - : dependencies: + '@react-navigation/drawer@6.6.15(3fzmnfc2je7bh62gn24exmf5uu)': + dependencies: '@react-navigation/elements': 1.3.30(@react-navigation/native@6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native-safe-area-context@4.8.2(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) '@react-navigation/native': 6.1.17(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) color: 4.2.3 @@ -17695,13 +17767,13 @@ snapshots: '@react-spring/types': 9.7.3 react: 18.2.0 - '@react-spring/three@9.6.1(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0))(react@18.2.0)(three@0.161.0)': + '@react-spring/three@9.6.1(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0))(react@18.2.0)(three@0.161.0)': dependencies: '@react-spring/animated': 9.6.1(react@18.2.0) '@react-spring/core': 9.6.1(react@18.2.0) '@react-spring/shared': 9.6.1(react@18.2.0) '@react-spring/types': 9.6.1 - '@react-three/fiber': 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0) + '@react-three/fiber': 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0) react: 18.2.0 three: 0.161.0 @@ -17718,12 +17790,12 @@ snapshots: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - '@react-three/drei@9.102.6(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0))(@types/react@18.2.67)(@types/three@0.162.0)(immer@10.0.4)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(three@0.161.0)': + '@react-three/drei@9.102.6(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0))(@types/react@18.2.67)(@types/three@0.162.0)(immer@10.0.4)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(three@0.161.0)': dependencies: '@babel/runtime': 7.24.0 '@mediapipe/tasks-vision': 0.10.8 - '@react-spring/three': 9.6.1(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0))(react@18.2.0)(three@0.161.0) - '@react-three/fiber': 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0) + '@react-spring/three': 9.6.1(@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0))(react@18.2.0)(three@0.161.0) + '@react-three/fiber': 8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0) '@use-gesture/react': 10.3.0(react@18.2.0) camera-controls: 2.8.3(three@0.161.0) cross-env: 7.0.3 @@ -17751,7 +17823,7 @@ snapshots: - '@types/three' - immer - '@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)))(expo@50.0.13(@babel/core@7.24.0))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)(three@0.161.0)': + '@react-three/fiber@8.15.19(expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))))(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))))(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0)(three@0.161.0)': dependencies: '@babel/runtime': 7.24.0 '@types/react-reconciler': 0.26.7 @@ -17767,11 +17839,11 @@ snapshots: three: 0.161.0 zustand: 3.7.2(react@18.2.0) optionalDependencies: - expo: 50.0.13(@babel/core@7.24.0) - expo-asset: 9.0.2(expo@50.0.13(@babel/core@7.24.0)) - expo-file-system: 16.0.8(expo@50.0.13(@babel/core@7.24.0)) + expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) + expo-asset: 9.0.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))) + expo-file-system: 16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))) react-dom: 18.2.0(react@18.2.0) - react-native: 0.73.4(@babel/core@7.24.0)(react@18.2.0) + react-native: 0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0) '@redux-devtools/extension@3.3.0(redux@5.0.1)': dependencies: @@ -18279,7 +18351,7 @@ snapshots: jscodeshift: 0.15.2(@babel/preset-env@7.24.0(@babel/core@7.24.0)) leven: 3.1.0 ora: 5.4.1 - prettier: 3.2.5 + prettier: 3.3.3 prompts: 2.4.2 read-pkg-up: 7.0.1 semver: 7.6.0 @@ -18314,7 +18386,7 @@ snapshots: globby: 11.1.0 jscodeshift: 0.15.2(@babel/preset-env@7.24.0(@babel/core@7.24.0)) lodash: 4.17.21 - prettier: 3.2.5 + prettier: 3.3.3 recast: 0.23.6 tiny-invariant: 1.3.3 transitivePeerDependencies: @@ -18833,10 +18905,10 @@ snapshots: '@tanstack/query-core@5.28.4': {} - '@tanstack/react-query-devtools@4.36.1(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@tanstack/react-query-devtools@4.36.1(@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@tanstack/match-sorter-utils': 8.11.8 - '@tanstack/react-query': 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0) + '@tanstack/react-query': 4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) superjson: 1.13.3 @@ -18851,15 +18923,6 @@ snapshots: react-dom: 18.2.0(react@18.2.0) react-native: 0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0) - '@tanstack/react-query@4.36.1(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0)': - dependencies: - '@tanstack/query-core': 4.36.1 - react: 18.2.0 - use-sync-external-store: 1.2.0(react@18.2.0) - optionalDependencies: - react-dom: 18.2.0(react@18.2.0) - react-native: 0.73.4(@babel/core@7.24.0)(react@18.2.0) - '@tanstack/react-table@8.13.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@tanstack/table-core': 8.13.2 @@ -18888,64 +18951,64 @@ snapshots: '@tanstack/virtual-core@3.2.0': {} - '@tauri-apps/api@2.0.0-beta.11': {} + '@taplo/cli@0.7.0': {} - '@tauri-apps/api@2.0.0-beta.16': {} + '@tauri-apps/api@2.0.0-rc.0': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-beta.20': + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.3': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-beta.20': + '@tauri-apps/cli-darwin-x64@2.0.0-rc.3': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.20': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.3': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.20': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.3': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.20': + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.3': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.20': + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.3': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-beta.20': + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.3': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.20': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.3': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.20': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.3': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.20': + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.3': optional: true - '@tauri-apps/cli@2.0.0-beta.20': + '@tauri-apps/cli@2.0.0-rc.3': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-beta.20 - '@tauri-apps/cli-darwin-x64': 2.0.0-beta.20 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-beta.20 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-beta.20 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-beta.20 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-beta.20 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-beta.20 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-beta.20 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-beta.20 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-beta.20 + '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.3 + '@tauri-apps/cli-darwin-x64': 2.0.0-rc.3 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.3 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.3 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.3 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.3 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.3 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.3 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.3 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.3 - '@tauri-apps/plugin-dialog@2.0.0-beta.3': + '@tauri-apps/plugin-dialog@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.11 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-os@2.0.0-beta.3': + '@tauri-apps/plugin-os@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.11 + '@tauri-apps/api': 2.0.0-rc.0 - '@tauri-apps/plugin-shell@2.0.0-beta.3': + '@tauri-apps/plugin-shell@2.0.0-rc.0': dependencies: - '@tauri-apps/api': 2.0.0-beta.11 + '@tauri-apps/api': 2.0.0-rc.0 '@testing-library/dom@9.3.4': dependencies: @@ -22124,10 +22187,10 @@ snapshots: resolve: 1.22.8 semver: 7.6.0 - eslint-plugin-prettier@5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5): + eslint-plugin-prettier@5.1.3(@types/eslint@8.56.5)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3): dependencies: eslint: 8.57.0 - prettier: 3.2.5 + prettier: 3.3.3 prettier-linter-helpers: 1.0.0 synckit: 0.8.8 optionalDependencies: @@ -22416,19 +22479,6 @@ snapshots: - expo - supports-color - expo-asset@9.0.2(expo@50.0.13(@babel/core@7.24.0)): - dependencies: - '@react-native/assets-registry': 0.73.1 - blueimp-md5: 2.19.0 - expo-constants: 15.4.5(expo@50.0.13(@babel/core@7.24.0)) - expo-file-system: 16.0.8(expo@50.0.13(@babel/core@7.24.0)) - invariant: 2.2.4 - md5-file: 3.2.3 - transitivePeerDependencies: - - expo - - supports-color - optional: true - expo-av@13.10.5(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))): dependencies: expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) @@ -22450,34 +22500,15 @@ snapshots: transitivePeerDependencies: - supports-color - expo-constants@15.4.5(expo@50.0.13(@babel/core@7.24.0)): - dependencies: - '@expo/config': 8.5.4 - expo: 50.0.13(@babel/core@7.24.0) - transitivePeerDependencies: - - supports-color - optional: true - expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))): dependencies: expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) - expo-file-system@16.0.8(expo@50.0.13(@babel/core@7.24.0)): - dependencies: - expo: 50.0.13(@babel/core@7.24.0) - optional: true - expo-font@11.10.3(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))): dependencies: expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) fontfaceobserver: 2.3.0 - expo-font@11.10.3(expo@50.0.13(@babel/core@7.24.0)): - dependencies: - expo: 50.0.13(@babel/core@7.24.0) - fontfaceobserver: 2.3.0 - optional: true - expo-haptics@12.8.1(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))): dependencies: expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) @@ -22491,11 +22522,6 @@ snapshots: dependencies: expo: 50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) - expo-keep-awake@12.8.2(expo@50.0.13(@babel/core@7.24.0)): - dependencies: - expo: 50.0.13(@babel/core@7.24.0) - optional: true - expo-linking@6.2.2(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))): dependencies: expo-constants: 15.4.5(expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))) @@ -22534,33 +22560,6 @@ snapshots: expo-status-bar@1.11.1: {} - expo@50.0.13(@babel/core@7.24.0): - dependencies: - '@babel/runtime': 7.24.0 - '@expo/cli': 0.17.8(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)))(expo-modules-autolinking@1.10.3) - '@expo/config': 8.5.4 - '@expo/config-plugins': 7.8.4 - '@expo/metro-config': 0.17.6(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))) - '@expo/vector-icons': 14.0.0 - babel-preset-expo: 10.0.1(@babel/core@7.24.0) - expo-asset: 9.0.2(expo@50.0.13(@babel/core@7.24.0)) - expo-file-system: 16.0.8(expo@50.0.13(@babel/core@7.24.0)) - expo-font: 11.10.3(expo@50.0.13(@babel/core@7.24.0)) - expo-keep-awake: 12.8.2(expo@50.0.13(@babel/core@7.24.0)) - expo-modules-autolinking: 1.10.3 - expo-modules-core: 1.11.12 - fbemitter: 3.0.0 - whatwg-url-without-unicode: 8.0.0-3 - transitivePeerDependencies: - - '@babel/core' - - '@react-native/babel-preset' - - bluebird - - bufferutil - - encoding - - supports-color - - utf-8-validate - optional: true - expo@50.0.13(@babel/core@7.24.0)(@react-native/babel-preset@0.73.21(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))): dependencies: '@babel/runtime': 7.24.0 @@ -26319,15 +26318,15 @@ snapshots: dependencies: fast-diff: 1.3.0 - prettier-plugin-tailwindcss@0.5.12(@ianvs/prettier-plugin-sort-imports@4.2.1(prettier@3.2.5))(prettier@3.2.5): + prettier-plugin-tailwindcss@0.6.6(@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.3.3))(prettier@3.3.3): dependencies: - prettier: 3.2.5 + prettier: 3.3.3 optionalDependencies: - '@ianvs/prettier-plugin-sort-imports': 4.2.1(prettier@3.2.5) + '@ianvs/prettier-plugin-sort-imports': 4.3.1(prettier@3.3.3) prettier@2.8.8: {} - prettier@3.2.5: {} + prettier@3.3.3: {} pretty-bytes@5.6.0: {} @@ -26632,7 +26631,7 @@ snapshots: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-i18next@13.5.0(i18next@23.10.1)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0))(react@18.2.0): + react-i18next@13.5.0(i18next@23.10.1)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0))(react@18.2.0): dependencies: '@babel/runtime': 7.24.0 html-parse-stringify: 3.0.1 @@ -26640,7 +26639,7 @@ snapshots: react: 18.2.0 optionalDependencies: react-dom: 18.2.0(react@18.2.0) - react-native: 0.73.4(@babel/core@7.24.0)(react@18.2.0) + react-native: 0.73.4(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0))(react@18.2.0) react-intersection-observer@9.8.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0): dependencies: @@ -26899,56 +26898,6 @@ snapshots: - supports-color - utf-8-validate - react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0): - dependencies: - '@jest/create-cache-key-function': 29.7.0 - '@react-native-community/cli': 12.3.2 - '@react-native-community/cli-platform-android': 12.3.2 - '@react-native-community/cli-platform-ios': 12.3.2 - '@react-native/assets-registry': 0.73.1 - '@react-native/codegen': 0.73.3(@babel/preset-env@7.24.0(@babel/core@7.24.0)) - '@react-native/community-cli-plugin': 0.73.16(@babel/core@7.24.0)(@babel/preset-env@7.24.0(@babel/core@7.24.0)) - '@react-native/gradle-plugin': 0.73.4 - '@react-native/js-polyfills': 0.73.1 - '@react-native/normalize-colors': 0.73.2 - '@react-native/virtualized-lists': 0.73.4(react-native@0.73.4(@babel/core@7.24.0)(react@18.2.0)) - abort-controller: 3.0.0 - anser: 1.4.10 - ansi-regex: 5.0.1 - base64-js: 1.5.1 - chalk: 4.1.2 - deprecated-react-native-prop-types: 5.0.0 - event-target-shim: 5.0.1 - flow-enums-runtime: 0.0.6 - invariant: 2.2.4 - jest-environment-node: 29.7.0 - jsc-android: 250231.0.0 - memoize-one: 5.2.1 - metro-runtime: 0.80.6 - metro-source-map: 0.80.6 - mkdirp: 0.5.6 - nullthrows: 1.1.1 - pretty-format: 26.6.2 - promise: 8.3.0 - react: 18.2.0 - react-devtools-core: 4.28.5 - react-refresh: 0.14.0 - react-shallow-renderer: 16.15.0(react@18.2.0) - regenerator-runtime: 0.13.11 - scheduler: 0.24.0-canary-efb381bbf-20230505 - stacktrace-parser: 0.1.10 - whatwg-fetch: 3.6.20 - ws: 6.2.2 - yargs: 17.7.2 - transitivePeerDependencies: - - '@babel/core' - - '@babel/preset-env' - - bufferutil - - encoding - - supports-color - - utf-8-validate - optional: true - react-reconciler@0.27.0(react@18.2.0): dependencies: loose-envify: 1.4.0 diff --git a/scripts/autoformat.sh b/scripts/autoformat.sh index d8aa0b87d6d4..5a7b5270fb77 100755 --- a/scripts/autoformat.sh +++ b/scripts/autoformat.sh @@ -67,6 +67,9 @@ wait pnpm run format & wait +# Format toml files +git ls-tree -r HEAD --name-only | grep '.toml$' | xargs pnpm taplo format + if [ "${1:-}" != "only-frontend" ]; then # Run clippy and formatter for backend cargo clippy --fix --all --all-targets --all-features --allow-dirty --allow-staged diff --git a/turbo.json b/turbo.json index ea9c9edd67db..6251e1a18ff0 100644 --- a/turbo.json +++ b/turbo.json @@ -16,5 +16,14 @@ "cache": false } }, - "globalEnv": ["PORT", "NODE_ENV", "GENERATE_SOURCEMAP", "DEV"] + "globalEnv": [ + "PORT", + "NODE_ENV", + "GENERATE_SOURCEMAP", + "DEV", + "VITE_SDSERVER_ORIGIN", + "VITE_SD_DEMO_MODE", + "VITE_SDSERVER_ORIGIN", + "VITE_LANDING_ORIGIN" + ] }