Skip to content

Commit 520b1c6

Browse files
committed
build(tauri): switch to fork of typeshare with support for u64/i64: 1Password/typeshare#140
1 parent 11eabcb commit 520b1c6

File tree

4 files changed

+31
-11
lines changed

4 files changed

+31
-11
lines changed

Cargo.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ comfy-table = "7.1.0"
3232
cynic-codegen = { version = "3.4.0", features = ["rkyv"] }
3333
cynic = "3.4.0"
3434
chrono = "0.4.31"
35-
typeshare = "1.0.1"
35+
typeshare = { git = "https://github.com/1password/typeshare", rev = "556b44aafd5304eedf17206800f69834e3820b7c" }
3636
thiserror = "1.0.56"
3737
strict-yaml-rust = "0.1.2"
3838
dotrain = { git = "https://github.com/rainlanguage/dotrain", rev = "b813542cb1c9a2399664a606761f3a3db7b842af" }

flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
# Generate Typescript types from rust types
2424
mkdir -p tauri-app/src/lib/typeshare;
2525
26+
cargo install --git https://github.com/1Password/typeshare --rev 556b44aafd5304eedf17206800f69834e3820b7c
27+
2628
typeshare crates/subgraph/src/types/vault_balance_changes_list.rs crates/subgraph/src/types/vault_balance_change.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/vaultBalanceChangesList.ts;
2729
typeshare crates/subgraph/src/types/order_detail.rs crates/common/src/types/order_detail_extended.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/orderDetail.ts;
2830
@@ -36,6 +38,7 @@
3638
3739
typeshare crates/settings/src/parse.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/appSettings.ts;
3840
typeshare crates/settings/src/config.rs crates/settings/src/chart.rs crates/settings/src/deployer.rs crates/settings/src/network.rs crates/settings/src/order.rs crates/settings/src/orderbook.rs crates/settings/src/scenario.rs crates/settings/src/token.rs crates/settings/src/deployment.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/config.ts;
41+
typeshare crates/settings/src/string_structs.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/configString.ts;
3942
4043
typeshare tauri-app/src-tauri/src/toast.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/toast.ts;
4144
typeshare tauri-app/src-tauri/src/transaction_status.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/transactionStatus.ts;
@@ -46,7 +49,6 @@
4649
cd tauri-app && npm i && npm run lint
4750
'';
4851
additionalBuildInputs = [
49-
pkgs.typeshare
5052
pkgs.wasm-bindgen-cli
5153
rainix.rust-toolchain.${system}
5254
rainix.rust-build-inputs.${system}

tauri-app/src-tauri/Cargo.lock

Lines changed: 25 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)