diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f03b5db0b..1bc6f4d8e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,15 +1,53 @@ -name: "test" +name: "scaffolding-ci" on: # Trigger the workflow on push or pull request, # but only for the main branch push: - branches: [ develop, develop-0.1, develop-0.2, develop-0.3 ] + branches: [develop, develop-0.3] pull_request: - branches: [ develop, develop-0.1, develop-0.2, develop-0.3 ] + branches: [develop, develop-0.3] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }} + cancel-in-progress: true jobs: - test_fmt_lint: + cargo_test: + name: cargo_test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.80.0 + - uses: Swatinem/rust-cache@v2 + - run: cargo test --no-fail-fast + + rustfmt: + name: rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.80.0 + components: rustfmt + - run: cargo fmt --all -- --check + + clippy: + name: clippy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: 1.80.0 + components: clippy + - uses: Swatinem/rust-cache@v2 + - run: cargo clippy -- -D warnings + + nix_build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -18,40 +56,33 @@ jobs: if: runner.os == 'Linux' uses: AdityaGarg8/remove-unwanted-software@v2 with: - remove-dotnet: 'true' - remove-android: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' + remove-dotnet: "true" + remove-android: "true" + remove-codeql: "true" + remove-docker-images: "true" - name: Install nix - uses: cachix/install-nix-action@v27 + uses: cachix/install-nix-action@v30 with: install_url: https://releases.nixos.org/nix/nix-2.24.4/install - uses: cachix/cachix-action@v15 with: - name: holochain-ci - - - name: rustfmt check - run: | - cd $GITHUB_WORKSPACE - nix develop .#ci --command cargo fmt --all --check - - - name: clippy check - run: | - cd $GITHUB_WORKSPACE - nix develop .#ci --command cargo clippy --all-features --all-targets -- -D warnings + name: holochain-scaffolding-cli + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + extraPullNames: holochain-ci - - name: unittests + - name: Build run: | cd $GITHUB_WORKSPACE - nix develop .#ci --command cargo test --no-fail-fast + nix develop --accept-flake-config .#ci --command echo 'test' testbuild: runs-on: ubuntu-latest + needs: [nix_build] strategy: matrix: - template: [ svelte, vue, lit, react, vanilla ] + template: [svelte, vue, lit, react, vanilla] steps: - uses: actions/checkout@v4 @@ -59,27 +90,30 @@ jobs: if: runner.os == 'Linux' uses: AdityaGarg8/remove-unwanted-software@v2 with: - remove-dotnet: 'true' - remove-android: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' + remove-dotnet: "true" + remove-android: "true" + remove-codeql: "true" + remove-docker-images: "true" - name: Install nix - uses: cachix/install-nix-action@v27 + uses: cachix/install-nix-action@v30 with: install_url: https://releases.nixos.org/nix/nix-2.24.4/install - uses: cachix/cachix-action@v15 with: - name: holochain-ci + name: holochain-scaffolding-cli + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + extraPullNames: holochain-ci - name: Build and test run: | cd $GITHUB_WORKSPACE - nix develop .#ci --command ./run_test.sh -t ${{ matrix.template }} + nix develop --accept-flake-config .#ci --command ./run_test.sh -t ${{ matrix.template }} testbuild_by_scope: runs-on: ubuntu-latest + needs: [nix_build] strategy: matrix: scope: @@ -92,21 +126,23 @@ jobs: if: runner.os == 'Linux' uses: AdityaGarg8/remove-unwanted-software@v2 with: - remove-dotnet: 'true' - remove-android: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' + remove-dotnet: "true" + remove-android: "true" + remove-codeql: "true" + remove-docker-images: "true" - name: Install nix - uses: cachix/install-nix-action@v27 + uses: cachix/install-nix-action@v30 with: install_url: https://releases.nixos.org/nix/nix-2.24.4/install - uses: cachix/cachix-action@v15 with: - name: holochain-ci + name: holochain-scaffolding-cli + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + extraPullNames: holochain-ci - name: Build and test run: | cd $GITHUB_WORKSPACE - nix develop .#ci --command ./run_test.sh -s ${{ matrix.scope }} + nix develop --accept-flake-config .#ci --command ./run_test.sh -s ${{ matrix.scope }} diff --git a/Cargo.lock b/Cargo.lock index 0496cbced..292845794 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addr2line" version = "0.24.2" @@ -33,30 +23,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - [[package]] name = "ahash" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", ] @@ -67,8 +40,8 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.15", + "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -83,37 +56,11 @@ dependencies = [ "memchr", ] -[[package]] -name = "aitia" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ffc5ea27add6e66262bbbb39bebb1234f24384f579672ed2ef53125b150def" -dependencies = [ - "anyhow", - "derive_more", - "holochain_trace", - "parking_lot 0.12.3", - "petgraph", - "regex", - "serde", - "serde_json", - "tracing", - "tracing-core", - "tracing-serde", - "tracing-subscriber", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "android-tzdata" @@ -136,14 +83,14 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -156,55 +103,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.90" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" - -[[package]] -name = "app_dirs2" -version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e" -dependencies = [ - "jni", - "ndk-context", - "winapi 0.3.9", - "xdg", -] +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "approx" @@ -217,9 +152,9 @@ dependencies = [ [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -245,209 +180,9 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.82", -] - -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" -dependencies = [ - "async-channel 2.3.1", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" -dependencies = [ - "async-lock", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-once-cell" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" - -[[package]] -name = "async-process" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" -dependencies = [ - "async-channel 2.3.1", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if 1.0.0", - "event-listener 5.3.1", - "futures-lite", - "rustix", - "tracing", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - -[[package]] -name = "async-signal" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if 1.0.0", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.59.0", -] - -[[package]] -name = "async-std" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" -dependencies = [ - "async-attributes", - "async-channel 1.9.0", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-stream" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22068c0c19514942eefcfd4daf8976ef1aad84e61539f95cd200c35202f80af5" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.89", ] -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - [[package]] name = "async-trait" version = "0.1.83" @@ -456,7 +191,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -473,16 +208,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.4.0", + "winapi", ] [[package]] @@ -497,24 +223,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99d887f4066f8a1b4a713a8121fab07ff543863ac86177ebdee6b5cb18acf12" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "derive_more", "serde", "shrinkwraprs", ] -[[package]] -name = "backon" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" -dependencies = [ - "fastrand", - "futures-core", - "pin-project", - "tokio", -] - [[package]] name = "backtrace" version = "0.3.74" @@ -522,7 +236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -536,24 +250,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "better_scoped_tls" version = "0.1.2" @@ -563,12 +265,6 @@ dependencies = [ "scoped-tls", ] -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - [[package]] name = "bincode" version = "1.3.3" @@ -584,7 +280,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec 0.6.3", + "bit-vec", ] [[package]] @@ -593,21 +289,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" -dependencies = [ - "serde", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -640,7 +321,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.1", + "constant_time_eq", ] [[package]] @@ -652,35 +333,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel 2.3.1", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "bloomfilter" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0bdbcf2078e0ba8a74e1fe0cf36f54054a04485759b61dfd60b174658e9607" -dependencies = [ - "bit-vec 0.7.0", - "getrandom 0.2.15", - "siphasher 1.0.1", -] - [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", "serde", @@ -697,7 +354,7 @@ dependencies = [ "serde", "serde_yaml 0.9.34+deprecated", "text-block-macros", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -733,9 +390,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -761,33 +418,6 @@ dependencies = [ "serde", ] -[[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 = "c_linked_list" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" - [[package]] name = "camino" version = "1.1.9" @@ -817,32 +447,20 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cc" -version = "1.1.31" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -891,16 +509,6 @@ dependencies = [ "half", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "2.34.0" @@ -918,9 +526,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -928,15 +536,14 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim 0.11.1", - "terminal_size", ] [[package]] @@ -948,29 +555,20 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "cloudabi" -version = "0.0.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -982,25 +580,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.15.8" @@ -1014,34 +593,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[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.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "contrafact" -version = "0.2.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bfae7a2ef93841d7e9e5ef69e387b26e70f7b156434b6b95714006cc00e1f9" -dependencies = [ - "arbitrary", - "derive_more", - "either", - "itertools 0.10.5", - "num", - "once_cell", - "rand 0.7.3", - "tracing", -] - [[package]] name = "convert_case" version = "0.4.0" @@ -1088,8 +645,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.4.0", - "cfg-if 1.0.0", + "autocfg", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -1097,9 +654,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1193,18 +750,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "cron" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" -dependencies = [ - "chrono", - "nom", - "once_cell", + "cfg-if", ] [[package]] @@ -1323,7 +869,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1345,7 +891,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1354,27 +900,17 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728" -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - [[package]] name = "dashmap" version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -1383,20 +919,14 @@ version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - [[package]] name = "data-url" version = "0.3.1" @@ -1421,7 +951,7 @@ dependencies = [ "swc_ecma_parser", "swc_eq_ignore_macros", "text_lines", - "thiserror", + "thiserror 1.0.69", "unicode-width", "url", ] @@ -1470,13 +1000,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1518,7 +1048,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1538,7 +1068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core 0.20.2", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1551,7 +1081,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1572,12 +1102,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.10.7" @@ -1586,7 +1110,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", - "subtle", ] [[package]] @@ -1595,16 +1118,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", + "dirs-sys", ] [[package]] @@ -1615,19 +1129,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "winapi", ] [[package]] @@ -1638,17 +1140,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", -] - -[[package]] -name = "dns-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" -dependencies = [ - "byteorder", - "quick-error", + "syn 2.0.89", ] [[package]] @@ -1660,12 +1152,6 @@ dependencies = [ "litrs", ] -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "dprint-core" version = "0.66.2" @@ -1749,11 +1235,11 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1794,7 +1280,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -1822,34 +1308,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "err-derive" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "errno" version = "0.3.9" @@ -1860,33 +1318,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1907,9 +1338,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "filetime" @@ -1917,30 +1348,24 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "libredox", "windows-sys 0.59.0", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "fixt" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f814489f08e6262a3c945050a7af9e3fce2e72ec924b71791ea5cb0c119ff" +checksum = "d1c114318bcc5149305e6a0bdf8cea370c949a227b8b89ec23f82580f1643768" dependencies = [ "holochain_serialized_bytes", "lazy_static", - "parking_lot 0.12.3", + "parking_lot", "paste", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "serde", "strum", "strum_macros 0.18.0", @@ -1948,23 +1373,14 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2001,12 +1417,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "from_variant" version = "0.1.9" @@ -2015,15 +1425,9 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.82", + "syn 2.0.89", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "funty" version = "2.0.0" @@ -2078,19 +1482,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" version = "0.3.31" @@ -2099,7 +1490,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -2114,12 +1505,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.31" @@ -2147,12 +1532,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "gcollections" version = "1.5.0" @@ -2175,49 +1554,16 @@ dependencies = [ "version_check", ] -[[package]] -name = "get_if_addrs" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" -dependencies = [ - "c_linked_list", - "get_if_addrs-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "get_if_addrs-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" -dependencies = [ - "gcc", - "libc", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2228,10 +1574,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a34addaffa7d2c80637807444f171c646cad7549fcdac8019544034678f76d5" dependencies = [ "futures", - "mockall", "must_future", "paste", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -2278,70 +1623,22 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "governor" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c5d2f987ee8f6dff3fa1a352058dc59b990e447e4c7846aa7d804971314f7b" -dependencies = [ - "dashmap 4.0.2", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.11.2", - "quanta", - "rand 0.8.5", - "smallvec", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http", "indexmap 2.6.0", "slab", "tokio", @@ -2355,7 +1652,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crunchy", ] @@ -2370,17 +1667,7 @@ dependencies = [ "pest_derive", "serde", "serde_json", - "thiserror", -] - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash 0.3.8", - "autocfg 1.4.0", + "thiserror 1.0.69", ] [[package]] @@ -2404,9 +1691,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -2449,111 +1736,10 @@ dependencies = [ ] [[package]] -name = "hc_sleuth" -version = "0.2.4" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d2674895db5188f4b89f3926e2b5d76dfa51dfdb59ccc1e47233791c028b41" -dependencies = [ - "aitia", - "anyhow", - "derive_more", - "holochain_state_types", - "holochain_trace", - "holochain_types", - "kitsune_p2p", - "once_cell", - "parking_lot 0.12.3", - "petgraph", - "regex", - "serde", - "structopt", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "hdi" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d39173c3c05d81f2ad851588de91b991619ed398e201cb60829d060de88f609" -dependencies = [ - "getrandom 0.2.15", - "hdk_derive", - "holo_hash", - "holochain_integrity_types", - "holochain_wasmer_guest", - "paste", - "serde", - "serde_bytes", - "tracing", - "tracing-core", -] - -[[package]] -name = "hdk" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2af08cc1dacd885294bc55d5f688ceb938dccb5be29bebf9d927985a9365073" -dependencies = [ - "getrandom 0.2.15", - "hdi", - "hdk_derive", - "holo_hash", - "holochain_wasmer_guest", - "holochain_zome_types", - "paste", - "serde", - "serde_bytes", - "thiserror", - "tracing", - "tracing-core", -] - -[[package]] -name = "hdk_derive" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7f8147abdaa1d1c6079dee3b6ac1a7633fc865236397b773a4cdc4f47f5e03" -dependencies = [ - "darling 0.14.4", - "heck 0.5.0", - "holochain_integrity_types", - "paste", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 0.2.12", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.12", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -2597,28 +1783,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - [[package]] name = "holo_hash" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084269a9c353018fac9ec0e9c494b3182e5c6e56b1b8cc542c0742c6a680f8c7" +checksum = "6a88406ef8231a1e5a9cf1157c1e8422dd26c2c03e9c551ea553e18211e41ef8" dependencies = [ - "arbitrary", "base64 0.22.1", "blake2b_simd", "derive_more", @@ -2629,196 +1799,25 @@ dependencies = [ "holochain_wasmer_common", "kitsune_p2p_dht_arc", "must_future", - "proptest", - "proptest-derive 0.5.0", - "rand 0.8.5", - "rusqlite", - "serde", - "serde_bytes", - "thiserror", -] - -[[package]] -name = "holochain" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba0848591df566b252d5198af3cc7c98662a4995237a7079cbbc06798916179" -dependencies = [ - "aitia", - "anyhow", - "arbitrary", - "async-once-cell", - "async-trait", - "backtrace", - "base64 0.22.1", - "cfg-if 1.0.0", - "chrono", - "contrafact", - "derive_more", - "diff", - "either", - "fallible-iterator 0.3.0", - "fixt", - "futures", - "get_if_addrs", - "getrandom 0.2.15", - "ghost_actor", - "hc_sleuth", - "hdk", - "holo_hash", - "holochain_cascade", - "holochain_conductor_api", - "holochain_conductor_services", - "holochain_keystore", - "holochain_metrics", - "holochain_nonce", - "holochain_p2p", - "holochain_secure_primitive", - "holochain_serialized_bytes", - "holochain_sqlite", - "holochain_state", - "holochain_test_wasm_common", - "holochain_trace", - "holochain_types", - "holochain_util", - "holochain_wasm_test_utils", - "holochain_wasmer_host", - "holochain_websocket", - "holochain_zome_types", - "hostname 0.4.0", - "human-panic", - "itertools 0.12.1", - "kitsune_p2p", - "kitsune_p2p_bin_data", - "kitsune_p2p_block", - "kitsune_p2p_bootstrap", - "kitsune_p2p_types", - "lair_keystore", - "matches", - "mockall", - "mr_bundle", - "nanoid", - "once_cell", - "one_err", - "opentelemetry_api", - "parking_lot 0.12.3", - "petgraph", - "predicates 3.1.2", - "rand 0.8.5", - "rand-utf8", - "rand_chacha 0.3.1", + "rand", "rusqlite", - "sd-notify", "serde", "serde_bytes", - "serde_json", - "serde_yaml 0.9.34+deprecated", - "shrinkwraprs", - "sodoken", - "structopt", - "strum", - "subtle-encoding", - "task-motel", - "tempfile", - "thiserror", - "tiny-keccak", - "tokio", - "tokio-stream", - "toml 0.8.19", - "tracing", - "tracing-futures", - "tracing-subscriber", - "tx5-go-pion-turn", - "tx5-signal-srv", - "unwrap_to", - "url", - "url2", - "uuid", - "wasmer", - "wasmer-middlewares", -] - -[[package]] -name = "holochain_cascade" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5367c9b4ab525ef5fc76faea4634777c969904dfb5306ac4fbbb82f1d3488dfb" -dependencies = [ - "async-trait", - "fixt", - "futures", - "holo_hash", - "holochain_nonce", - "holochain_p2p", - "holochain_serialized_bytes", - "holochain_sqlite", - "holochain_state", - "holochain_trace", - "holochain_types", - "holochain_util", - "holochain_zome_types", - "kitsune_p2p", - "mockall", - "opentelemetry_api", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "holochain_conductor_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f5ff95b2f5854927fbe48cf058f7049ca972afa4b9d21a3a1bfe0c7f1650d2" -dependencies = [ - "derive_more", - "holo_hash", - "holochain_keystore", - "holochain_serialized_bytes", - "holochain_state_types", - "holochain_types", - "holochain_zome_types", - "kitsune_p2p_bin_data", - "kitsune_p2p_types", - "serde", - "serde_yaml 0.9.34+deprecated", - "shrinkwraprs", - "thiserror", - "tracing", - "url2", -] - -[[package]] -name = "holochain_conductor_services" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c47e9eb42dc0d067b851105f2b045d8a5c80a49169fd852e4dda1c83974619b" -dependencies = [ - "anyhow", - "async-trait", - "derive_more", - "futures", - "holochain_keystore", - "holochain_types", - "mockall", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "holochain_integrity_types" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7147cf3c2b5ca2d685478033d403f4cd0bcc02d264d1918a8d5d19f9f3716a6" +checksum = "7fd4760d58ef5285e077a098cb349ecbe0b63c7cc178a1252ea60fab8a6457ec" dependencies = [ - "arbitrary", "derive_builder 0.20.2", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "proptest", - "proptest-derive 0.5.0", "serde", "serde_bytes", "subtle", @@ -2828,9 +1827,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30842315f7f9799dc0c45a84a4fc04d365b35d1e622b04b9a9274c0c2865479" +checksum = "867cbe3ec85701df713cfce7c94f831ca9b1c25ad5884b83ae7b060781ad886b" dependencies = [ "base64 0.22.1", "derive_more", @@ -2845,73 +1844,30 @@ dependencies = [ "must_future", "nanoid", "one_err", - "parking_lot 0.12.3", + "parking_lot", "serde", "serde_bytes", "shrinkwraprs", "sodoken", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] -[[package]] -name = "holochain_metrics" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e1f87c7facc14c511bc0af887f798e305f02c8fedbac3a162693ad94c152f3" -dependencies = [ - "influxive", - "opentelemetry_api", - "tracing", -] - [[package]] name = "holochain_nonce" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc07bedfeb839fe9dabd089c22a963a0bf1711175b6738adac2721d2c56f5423" +checksum = "2f192b947aa545e4db11d623691044075cebb5755f5aa187f4ec44fab624a72d" dependencies = [ - "getrandom 0.2.15", + "getrandom", "holochain_secure_primitive", "kitsune_p2p_timestamp", ] -[[package]] -name = "holochain_p2p" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2ac413d25711deedc52b9643b21e55f97dca6676dc558bb27a4451ce6ace67" -dependencies = [ - "aitia", - "async-trait", - "derive_more", - "fixt", - "futures", - "ghost_actor", - "hc_sleuth", - "holo_hash", - "holochain_keystore", - "holochain_nonce", - "holochain_serialized_bytes", - "holochain_trace", - "holochain_types", - "holochain_zome_types", - "kitsune_p2p", - "kitsune_p2p_types", - "mockall", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", -] - [[package]] name = "holochain_scaffolding_cli" -version = "0.3000.8" +version = "0.3000.9" dependencies = [ "anyhow", "build-fs-tree", @@ -2919,13 +1875,11 @@ dependencies = [ "colored", "convert_case 0.6.0", "dialoguer", - "dirs 4.0.0", + "dirs", "dprint-plugin-typescript", "git2", "handlebars", - "holochain", "holochain_types", - "holochain_util", "ignore", "include_dir", "itertools 0.10.5", @@ -2943,17 +1897,17 @@ dependencies = [ "serde_json", "serde_yaml 0.8.26", "structopt", - "syn 2.0.82", - "thiserror", + "syn 2.0.89", + "thiserror 1.0.69", "tokio", "toml 0.5.11", ] [[package]] name = "holochain_secure_primitive" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c7f8b2236b65c115bff2591180f157cad3c9f401b748d90966fbc69019bbfb" +checksum = "f4579c2b39c8e88cbbd84c8a9fc3d1873cb3facde8aab49b5f9d51c15723a608" dependencies = [ "paste", "serde", @@ -2966,16 +1920,13 @@ version = "0.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742" dependencies = [ - "arbitrary", "holochain_serialized_bytes_derive", - "proptest", - "proptest-derive 0.4.0", "rmp-serde", "serde", "serde-transcode", "serde_bytes", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2990,16 +1941,16 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78ca4707ff9aa43ecef4d3c9d2ec4118c5450f29940abf2d6f89fa2855d79db" +checksum = "72e5b4ef8277dec3193036261e16aa82e01f20e5a7f90e139a47653c4fcd9d42" dependencies = [ "anyhow", "async-trait", "derive_more", "fallible-iterator 0.3.0", "futures", - "getrandom 0.2.15", + "getrandom", "hc_r2d2_sqlite", "holo_hash", "holochain_nonce", @@ -3015,7 +1966,7 @@ dependencies = [ "num_cpus", "once_cell", "opentelemetry_api", - "parking_lot 0.12.3", + "parking_lot", "pretty_assertions", "r2d2", "rmp-serde", @@ -3026,80 +1977,23 @@ dependencies = [ "shrinkwraprs", "sqlformat", "tempfile", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "holochain_state" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8edc1eccef9ced0eb8fa09384fd4e453d93f3d276cd3fbdd135534cf0be7331" -dependencies = [ - "aitia", - "async-recursion", - "base64 0.22.1", - "chrono", - "contrafact", - "cron", - "fallible-iterator 0.3.0", - "hc_sleuth", - "holo_hash", - "holochain_keystore", - "holochain_nonce", - "holochain_p2p", - "holochain_serialized_bytes", - "holochain_sqlite", - "holochain_state_types", - "holochain_types", - "holochain_zome_types", - "kitsune_p2p", - "nanoid", - "one_err", - "parking_lot 0.12.3", - "serde", - "serde_json", - "shrinkwraprs", - "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] -[[package]] -name = "holochain_state_types" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71a594c05251edbd7fa6b77ca4b5d7151f26b6c86688233625ecf50950194b4" -dependencies = [ - "holo_hash", - "holochain_integrity_types", - "serde", -] - -[[package]] -name = "holochain_test_wasm_common" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1379bf1a68ed7ddca04bc590ced2a1b6c75ac94c70f99c802d89de8f18d26e30" -dependencies = [ - "hdk", - "serde", -] - [[package]] name = "holochain_trace" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce62b79d729210d7128fbb5f0dec8658d028b6b802aeb54239ac7eb0bea7c7e" +checksum = "b58cf1b6db34d184732e7de95fb9459d1dace2a75836c829b5d512701881f77d" dependencies = [ "chrono", "derive_more", "inferno", "once_cell", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", "tracing-core", "tracing-serde", @@ -3108,22 +2002,20 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f9fbeda2915fe865a9524e8b844a88577dd03162fc17e217c18fd9e12dbcb" +checksum = "3b3debd9d53f6295c02f4e9e9c974bebe749b8d61c96fd38d00c24201984916e" dependencies = [ "anyhow", - "arbitrary", "async-trait", "automap", "backtrace", - "contrafact", "derive_builder 0.20.2", "derive_more", "fixt", "flate2", "futures", - "getrandom 0.2.15", + "getrandom", "holo_hash", "holochain_keystore", "holochain_nonce", @@ -3132,17 +2024,14 @@ dependencies = [ "holochain_trace", "holochain_util", "holochain_zome_types", - "isotest", "itertools 0.12.1", "kitsune_p2p_dht", "mr_bundle", "must_future", "nanoid", "one_err", - "parking_lot 0.12.3", - "proptest", - "proptest-derive 0.5.0", - "rand 0.8.5", + "parking_lot", + "rand", "regex", "rusqlite", "serde", @@ -3155,19 +2044,19 @@ dependencies = [ "strum", "strum_macros 0.18.0", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "holochain_util" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241da30e37f9bd047d437cd301e5cf1f799ed4c604ac79b0eae73023bbdf3fee" +checksum = "b9f16d3fef427cce0525eefeb00f258be948f683b4e80986200d1a299832a89a" dependencies = [ "backtrace", - "cfg-if 1.0.0", + "cfg-if", "colored", "dunce", "futures", @@ -3179,94 +2068,27 @@ dependencies = [ ] [[package]] -name = "holochain_wasm_test_utils" -version = "0.3.4" +name = "holochain_wasmer_common" +version = "0.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76862565008fd7ca7c7aeda0f923816d589bb429968320f95c739e29c1b9ae7a" -dependencies = [ - "holochain_types", - "holochain_util", - "strum", - "strum_macros 0.18.0", - "toml 0.8.19", - "walkdir", -] - -[[package]] -name = "holochain_wasmer_common" -version = "0.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81862ba8234412864273d21983c99af4e8b97739a5e4c354030470acdc6b431c" +checksum = "81862ba8234412864273d21983c99af4e8b97739a5e4c354030470acdc6b431c" dependencies = [ "holochain_serialized_bytes", "serde", "serde_bytes", "test-fuzz", - "thiserror", - "wasmer", -] - -[[package]] -name = "holochain_wasmer_guest" -version = "0.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce20cd8eb137a355394e57612cf2cf7836dab57948d56af9f9fe080ea168d41" -dependencies = [ - "holochain_serialized_bytes", - "holochain_wasmer_common", - "parking_lot 0.12.3", - "paste", - "serde", - "tracing", -] - -[[package]] -name = "holochain_wasmer_host" -version = "0.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a4f17340ec82de3f33d81f2be9b5e7bf3b60c30f04e40d3bb9aa78674a36f7" -dependencies = [ - "bimap", - "bytes", - "hex", - "holochain_serialized_bytes", - "holochain_wasmer_common", - "parking_lot 0.12.3", - "rand 0.8.5", - "serde", - "tracing", + "thiserror 1.0.69", "wasmer", - "wasmer-middlewares", -] - -[[package]] -name = "holochain_websocket" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7aa63263362a1ed08ce50954ca8a6f1f51b64569a89b371103824abb7fd0787" -dependencies = [ - "async-trait", - "futures", - "holochain_serialized_bytes", - "holochain_types", - "serde", - "serde_bytes", - "tokio", - "tokio-tungstenite 0.21.0", - "tracing", ] [[package]] name = "holochain_zome_types" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ebb387850abc517b938eb1e0f431102d10b70b639eb7b56a4626b5570d4a06" +checksum = "9800467c9b55b474ac5eb3694dc7913334a5e99c8fecd114b190f1fcea4e0c38" dependencies = [ - "arbitrary", - "contrafact", "derive_builder 0.20.2", "derive_more", - "fixt", "holo_hash", "holochain_integrity_types", "holochain_nonce", @@ -3277,19 +2099,14 @@ dependencies = [ "kitsune_p2p_timestamp", "nanoid", "num_enum", - "once_cell", - "proptest", - "proptest-derive 0.5.0", - "rand 0.8.5", "rusqlite", "serde", "serde_bytes", "serde_yaml 0.9.34+deprecated", "shrinkwraprs", - "strum", "subtle", "subtle-encoding", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -3302,28 +2119,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - -[[package]] -name = "hostname" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "windows", -] - [[package]] name = "hstr" version = "0.2.12" @@ -3338,17 +2133,6 @@ dependencies = [ "triomphe", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -3360,17 +2144,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -3378,7 +2151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -3389,8 +2162,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -3400,64 +2173,18 @@ version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "human-panic" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" -dependencies = [ - "anstream", - "anstyle", - "backtrace", - "os_info", - "serde", - "serde_derive", - "toml 0.8.19", - "uuid", -] - -[[package]] -name = "hyper" -version = "0.14.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "itoa", "pin-project-lite", @@ -3466,20 +2193,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.31", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.3" @@ -3487,29 +2200,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http", + "hyper", "hyper-util", - "rustls 0.23.15", + "rustls 0.23.18", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.31", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -3518,7 +2218,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper", "hyper-util", "native-tls", "tokio", @@ -3528,18 +2228,18 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.5.0", + "http", + "http-body", + "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -3569,49 +2269,148 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] [[package]] -name = "idna" -version = "0.5.0" +name = "icu_locid" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", ] [[package]] -name = "if-addrs" -version = "0.7.0" +name = "icu_locid_transform" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ - "libc", - "winapi 0.3.9", + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", ] [[package]] -name = "if-addrs" -version = "0.10.2" +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ - "libc", - "windows-sys 0.48.0", + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", ] [[package]] -name = "if-addrs" -version = "0.12.0" +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2a33e9c38988ecbda730c85b0fd9ddcdf83c0305ac7fd21c8bb9f57f2f0cc8" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ - "libc", - "windows-sys 0.52.0", + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -3630,7 +2429,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "same-file", "walkdir", "winapi-util", @@ -3661,7 +2460,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.4.0", + "autocfg", "hashbrown 0.12.3", "serde", ] @@ -3673,7 +2472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] @@ -3684,7 +2483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88" dependencies = [ "ahash 0.8.11", - "clap 4.5.20", + "clap 4.5.21", "crossbeam-channel", "crossbeam-utils", "dashmap 6.1.0", @@ -3701,189 +2500,58 @@ dependencies = [ ] [[package]] -name = "influxdb" -version = "0.7.2" +name = "intervallum" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601aa12a5876c044ea2a94a9443d0f086e6fc1f7bb4264bd7120e63c1462d1c8" +checksum = "18bfda24d3930aa647f90044d5ef87d0c8120f13b86b2d60e8aade66e656e659" dependencies = [ - "chrono", - "futures-util", - "http 0.2.12", - "lazy_static", - "regex", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror", + "bit-set", + "gcollections", + "num-integer", + "num-traits", + "trilean", ] [[package]] -name = "influxive" -version = "0.0.2-alpha.1" +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "is-macro" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e33972c836e620ade20e7c0c66062c60a90b222ed46f5f872f1a4721967191" +checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4" dependencies = [ - "influxive-child-svc", - "influxive-otel", - "influxive-writer", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "influxive-child-svc" -version = "0.0.2-alpha.1" +name = "is-terminal" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0923b25ac29f6e2ac600b0d3762792c4cb86438c3f2c7daa1f6e65e66f7f0d4d" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hex-literal", - "influxive-core", - "influxive-downloader", - "influxive-writer", - "tempfile", - "tokio", - "tracing", + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", ] [[package]] -name = "influxive-core" -version = "0.0.2-alpha.1" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5db78961ebb97b6d16ba61a65b38978a67cf7efaa91903c500b4771d1920d00" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] -name = "influxive-downloader" -version = "0.0.2-alpha.1" +name = "itertools" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "264581af3b49d108e76382e301d4228f89a3995e373363b877bb42b1312ebba3" -dependencies = [ - "base64 0.21.7", - "digest", - "dirs 5.0.1", - "flate2", - "futures", - "hex", - "hex-literal", - "influxive-core", - "reqwest 0.11.27", - "sha2", - "tar", - "tempfile", - "tokio", - "zip 0.6.6", -] - -[[package]] -name = "influxive-otel" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882f4ff61b099d34855841a6ea4d1890a1bd2aad2d07d8aaa63c99059d0f295c" -dependencies = [ - "influxive-core", - "opentelemetry_api", - "tokio", -] - -[[package]] -name = "influxive-otel-atomic-obs" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac0ec101d28862a46c15d6140cec376b02725160dfcf57282952898a94cf35e" -dependencies = [ - "opentelemetry_api", -] - -[[package]] -name = "influxive-writer" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89db32ac1865b814d5f4109635226c1d89189852d88f9ae704c0b51d6d2a8f25" -dependencies = [ - "influxdb", - "influxive-core", - "tokio", - "tracing", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "intervallum" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bfda24d3930aa647f90044d5ef87d0c8120f13b86b2d60e8aade66e656e659" -dependencies = [ - "bit-set", - "gcollections", - "num-integer", - "num-traits", - "trilean", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "is-macro" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 2.0.82", -] - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "isotest" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868ab2c0c71eff3fca21f4ea4673ade85ca0149c45a55c79016147562737aef8" -dependencies = [ - "futures", - "paste", -] - -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" dependencies = [ "either", ] @@ -3917,31 +2585,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if 1.0.0", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -3961,67 +2607,16 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kitsune_p2p" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d272496c5477868077d2ac66347c554776a02cc4aa3f0070a1c8bef4b7b493" -dependencies = [ - "arrayref", - "base64 0.22.1", - "blake2b_simd", - "bloomfilter", - "bytes", - "derive_more", - "fixt", - "futures", - "ghost_actor", - "governor", - "holochain_trace", - "itertools 0.12.1", - "kitsune_p2p_bin_data", - "kitsune_p2p_block", - "kitsune_p2p_bootstrap_client", - "kitsune_p2p_fetch", - "kitsune_p2p_mdns", - "kitsune_p2p_proxy", - "kitsune_p2p_timestamp", - "kitsune_p2p_transport_quic", - "kitsune_p2p_types", - "maplit", - "mockall", - "must_future", - "nanoid", - "num-traits", - "once_cell", - "opentelemetry_api", - "parking_lot 0.12.3", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tx5", - "url2", -] - [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc59fb1b86a9f5cf1a32d5e8d1b9a3fc0b5bcaf5051a7ea0ea6cda33b22e4e6" +checksum = "2635f38fec30356e299e4f9be0fe5d7c103226e0651d74b587e26a970bb0a9c3" dependencies = [ - "arbitrary", "base64 0.22.1", "derive_more", - "fixt", "holochain_util", "kitsune_p2p_dht_arc", - "proptest", - "proptest-derive 0.5.0", "serde", "serde_bytes", "shrinkwraprs", @@ -4029,58 +2624,21 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f88a80a2a7332e55ce6255aaf861a017f32265d013163c14b629ea82b3f5ae" +checksum = "b6455d6d2af2a8fffd664c7f8e9ace7a2417c80b0520c66da8dd51a241672383" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", "serde", ] -[[package]] -name = "kitsune_p2p_bootstrap" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bad4a4b0ed02c2a0ca4ff077cab9a37480717aa0848fe2c30d9220901007039" -dependencies = [ - "clap 4.5.20", - "futures", - "kitsune_p2p_bin_data", - "kitsune_p2p_types", - "parking_lot 0.12.3", - "rand 0.8.5", - "reqwest 0.12.8", - "serde", - "serde_bytes", - "thiserror", - "tokio", - "warp", -] - -[[package]] -name = "kitsune_p2p_bootstrap_client" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a99a165f88ac8ffebfcee7acfaa3b536c277330a6320d56b1a01b20cd54204" -dependencies = [ - "kitsune_p2p_bin_data", - "kitsune_p2p_bootstrap", - "kitsune_p2p_types", - "reqwest 0.12.8", - "serde", - "serde_bytes", - "url2", -] - [[package]] name = "kitsune_p2p_dht" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c339b0a7048cfe5f3903cabad0a36953b115d238cd10de96b2823ad9083352f" +checksum = "d3b208ac37b916377fe8f7e551538f94d0ea47a3d9019f7269a14fce8a838910" dependencies = [ - "arbitrary", - "colored", "derivative", "derive_more", "futures", @@ -4088,124 +2646,47 @@ dependencies = [ "kitsune_p2p_timestamp", "must_future", "num-traits", - "proptest", - "proptest-derive 0.5.0", - "rand 0.8.5", + "rand", "serde", "statrs", - "thiserror", + "thiserror 1.0.69", "tracing", ] [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a4aaba87ad569f00d00b304df22dbf6466062dc2c1885333e772ab0924fef9" +checksum = "cfdea47003a2a9f211e8ce8d7ad90fbfebc84f15fb33e618a25b0218623571ca" dependencies = [ - "arbitrary", "derive_more", "gcollections", "intervallum", "kitsune_p2p_timestamp", "num-traits", - "proptest", - "proptest-derive 0.5.0", "rusqlite", "serde", ] -[[package]] -name = "kitsune_p2p_fetch" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22dec85daf72f6ac2db34ed597bd23cab2832cc49b40ba69e510fb2d4b764aff" -dependencies = [ - "backon", - "derive_more", - "indexmap 2.6.0", - "kitsune_p2p_timestamp", - "kitsune_p2p_types", - "serde", - "tokio", - "tracing", -] - -[[package]] -name = "kitsune_p2p_mdns" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11be3238a3f66c48c73e73eb8f7b4f99ca197720d1bf3a365a3fc44a58fb9e44" -dependencies = [ - "base64 0.22.1", - "err-derive 0.3.1", - "futures", - "libmdns", - "mdns", - "tokio", - "tokio-stream", -] - -[[package]] -name = "kitsune_p2p_proxy" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f99d8099a90583b5c6ffd5227c13560a812af629e53e4fb1393c05597fe4a0" -dependencies = [ - "base64 0.22.1", - "derive_more", - "futures", - "holochain_trace", - "kitsune_p2p_transport_quic", - "kitsune_p2p_types", - "serde", - "serde_bytes", - "structopt", - "tokio", -] - [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2771d5362ce0c0b0a6343ddf56fb76c2d1c3b9985702dddabb0da8a49165b61a" +checksum = "226b704144107187791209d928c65ac356c3af3abbdaf691c80233fb0b6c59b4" dependencies = [ - "arbitrary", "chrono", - "once_cell", - "proptest", - "proptest-derive 0.5.0", - "rand 0.8.5", "rusqlite", "serde", ] -[[package]] -name = "kitsune_p2p_transport_quic" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8915c7a4f609606c9932629d7927f5e52fc527af85d23bfd808f6900fb26c54" -dependencies = [ - "blake2b_simd", - "futures", - "if-addrs 0.12.0", - "kitsune_p2p_types", - "quinn", - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "kitsune_p2p_types" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aeaa0b7ef5a1f05430ce248159718a40a4b3657edaf14f2f9b524f7a82a285" +checksum = "5849a890cc7b233b4c474bef8f3d7b00cb5d82208c6a35ccdb249e34467e2d8f" dependencies = [ - "arbitrary", "base64 0.22.1", "derive_more", - "fixt", "futures", "ghost_actor", "holochain_trace", @@ -4214,33 +2695,21 @@ dependencies = [ "kitsune_p2p_dht_arc", "kitsune_p2p_timestamp", "lair_keystore_api", - "mockall", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "paste", - "proptest", - "proptest-derive 0.5.0", "rmp-serde", "rustls 0.20.9", "serde", "serde_bytes", "serde_json", "sysinfo", - "thiserror", + "thiserror 1.0.69", "tokio", "url", "url2", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "lair_keystore" version = "0.4.6" @@ -4269,7 +2738,7 @@ dependencies = [ "lru", "nanoid", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rcgen", "serde", "serde_json", @@ -4279,7 +2748,7 @@ dependencies = [ "toml 0.8.19", "tracing", "url", - "winapi 0.3.9", + "winapi", "zeroize", ] @@ -4297,9 +2766,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" [[package]] name = "libflate" @@ -4338,41 +2807,11 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if 1.0.0", - "windows-targets 0.52.6", -] - [[package]] name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libmdns" -version = "0.7.4" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a60d8339ad1ddf68a81335fcafb6c6cf20d5036138a1e4ef86b8ce87f076c92" -dependencies = [ - "byteorder", - "futures-util", - "hostname 0.3.1", - "if-addrs 0.7.0", - "log", - "multimap", - "nix", - "rand 0.8.5", - "socket2 0.4.10", - "thiserror", - "tokio", - "winapi 0.3.9", -] +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -4382,14 +2821,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", + "redox_syscall", ] [[package]] name = "libsodium-sys-stable" -version = "1.21.3" +version = "1.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e7b5bc5a90cb1a680d8b0340f935d575292b8458e077f8da8cf134289d7dcf" +checksum = "798a1c6d8c3424c0686ca46f2929d81809b371ef61a68c5d1880570584d32b85" dependencies = [ "cc", "libc", @@ -4399,7 +2838,7 @@ dependencies = [ "tar", "ureq", "vcpkg", - "zip 2.2.0", + "zip", ] [[package]] @@ -4409,7 +2848,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", - "openssl-sys", "pkg-config", "vcpkg", ] @@ -4438,6 +2876,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "litrs" version = "0.4.1" @@ -4450,7 +2894,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.4.0", + "autocfg", "scopeguard", ] @@ -4465,9 +2909,6 @@ name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -dependencies = [ - "value-bag", -] [[package]] name = "lru" @@ -4475,7 +2916,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -4496,12 +2937,6 @@ dependencies = [ "libc", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "markup_fmt" version = "0.10.0" @@ -4517,13 +2952,7 @@ dependencies = [ ] [[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" +name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" @@ -4531,38 +2960,16 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matrixmultiply" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ - "autocfg 1.4.0", + "autocfg", "rawpointer", ] -[[package]] -name = "mdns" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c769962ac75a6ea437f0922b27834bcccd4c013d591383a16ae5731e3ef0f3f3" -dependencies = [ - "async-std", - "async-stream", - "dns-parser", - "err-derive 0.2.4", - "futures-core", - "futures-util", - "log", - "net2", -] - [[package]] name = "memchr" version = "2.7.4" @@ -4587,22 +2994,13 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.4.0", -] - [[package]] name = "memoffset" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.4.0", + "autocfg", ] [[package]] @@ -4611,16 +3009,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4650,37 +3038,10 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if 1.0.0", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates 2.1.5", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "more-asserts" version = "0.2.2" @@ -4689,51 +3050,20 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cec7cfbc138e42e4bd650166536c646e7d205f12c78d4bb770b309cc85a81ac" +checksum = "09a39986a954e2ae673c735409fe965b836129e0c7cedc8bdb8d8e7e6524b65d" dependencies = [ - "arbitrary", "derive_more", "flate2", "futures", "holochain_util", - "proptest", - "proptest-derive 0.5.0", - "reqwest 0.12.8", + "reqwest", "rmp-serde", "serde", "serde_bytes", "serde_yaml 0.9.34+deprecated", - "test-strategy", - "thiserror", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 0.2.12", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -dependencies = [ - "serde", + "thiserror 1.0.69", ] [[package]] @@ -4758,7 +3088,7 @@ dependencies = [ "num-complex", "num-rational", "num-traits", - "rand 0.8.5", + "rand", "rand_distr", "simba", "typenum", @@ -4781,7 +3111,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -4801,51 +3131,12 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "new_debug_unreachable" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -dependencies = [ - "hashbrown 0.8.2", -] - [[package]] name = "nom" version = "7.1.3" @@ -4856,25 +3147,13 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a1290799eababa63ea60af0cbc3f03363e328e58f32fb0294798ed3e85f444" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - [[package]] name = "ntapi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4884,21 +3163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi 0.3.9", -] - -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", + "winapi", ] [[package]] @@ -4946,24 +3211,12 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg 1.4.0", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint", "num-integer", "num-traits", ] @@ -4974,7 +3227,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.4.0", + "autocfg", "libm", ] @@ -5006,7 +3259,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -5043,7 +3296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -5059,7 +3312,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -5070,9 +3323,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.3.2+3.3.2" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -5102,73 +3355,16 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", "urlencoding", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] - -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -5176,21 +3372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", + "parking_lot_core", ] [[package]] @@ -5199,24 +3381,13 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] -[[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" @@ -5229,18 +3400,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - [[package]] name = "pem" version = "1.1.1" @@ -5263,7 +3422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -5287,7 +3446,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -5301,17 +3460,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.6.0", - "quickcheck", -] - [[package]] name = "phf" version = "0.11.2" @@ -5339,7 +3487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", - "rand 0.8.5", + "rand", ] [[package]] @@ -5352,7 +3500,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -5361,34 +3509,34 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -5403,577 +3551,200 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2" [[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "pluralizer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b9f792eceda75e0b4febff66105639933dd775007ed1f3a13ae4911c5d97e1" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if 1.0.0", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" - -[[package]] -name = "predicates-tree" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettyplease" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "910d41a655dac3b764f1ade94821093d3610248694320cd072303a8eedcf221d" -dependencies = [ - "proc-macro2", - "syn 2.0.82", -] - -[[package]] -name = "proc-macro-crate" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" -dependencies = [ - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prometheus" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.12.3", - "protobuf", - "thiserror", -] - -[[package]] -name = "proptest" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" -dependencies = [ - "bit-set", - "bit-vec 0.6.3", - "bitflags 2.6.0", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift 0.3.0", - "regex-syntax 0.8.5", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "proptest-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "proptest-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - -[[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - -[[package]] -name = "psm" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quanta" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98dc777a7a39b76b1a26ae9d3f691f4c1bc0455090aa0b64dfa8cb7fc34c135" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[package]] -name = "quickcheck" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456" -dependencies = [ - "rand 0.6.5", - "rand_core 0.4.2", -] - -[[package]] -name = "quinn" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls 0.20.9", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" -dependencies = [ - "bytes", - "fxhash", - "rand 0.8.5", - "ring 0.16.20", - "rustls 0.20.9", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" -dependencies = [ - "futures-util", - "libc", - "quinn-proto", - "socket2 0.4.10", - "tokio", - "tracing", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot 0.12.3", - "scheduled-thread-pool", -] - -[[package]] -name = "radium" -version = "0.7.0" +name = "pkg-config" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] -name = "rand" -version = "0.6.5" +name = "pluralizer" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +checksum = "48b9f792eceda75e0b4febff66105639933dd775007ed1f3a13ae4911c5d97e1" dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift 0.1.1", - "winapi 0.3.9", + "lazy_static", + "regex", ] [[package]] -name = "rand" -version = "0.7.3" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "rand" -version = "0.8.5" +name = "ppv-lite86" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "zerocopy", ] [[package]] -name = "rand-utf8" -version = "0.0.1" +name = "pretty_assertions" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f2017cdc22f0f49fc0385c036847c03403fa5f95bc36e7f420e8e42446e80f" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ - "rand 0.8.5", + "diff", + "yansi", ] [[package]] -name = "rand_chacha" -version = "0.1.1" +name = "prettyplease" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", + "proc-macro2", + "syn 2.0.89", ] [[package]] -name = "rand_chacha" -version = "0.2.2" +name = "proc-macro-crate" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "toml_edit", ] [[package]] -name = "rand_chacha" -version = "0.3.1" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", ] [[package]] -name = "rand_core" -version = "0.3.1" +name = "proc-macro-error-attr" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "rand_core 0.4.2", + "proc-macro2", + "quote", + "version_check", ] [[package]] -name = "rand_core" -version = "0.4.2" +name = "proc-macro2" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] [[package]] -name = "rand_core" -version = "0.5.1" +name = "psm" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ - "getrandom 0.1.16", + "cc", ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" dependencies = [ - "getrandom 0.2.15", + "ptr_meta_derive", ] [[package]] -name = "rand_distr" -version = "0.4.3" +name = "ptr_meta_derive" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "num-traits", - "rand 0.8.5", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "rand_hc" -version = "0.1.0" +name = "quick-xml" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ - "rand_core 0.3.1", + "memchr", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "quote" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "rand_core 0.5.1", + "proc-macro2", ] [[package]] -name = "rand_isaac" -version = "0.1.1" +name = "r2d2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ - "rand_core 0.3.1", + "log", + "parking_lot", + "scheduled-thread-pool", ] [[package]] -name = "rand_jitter" -version = "0.1.4" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] -name = "rand_os" -version = "0.1.3" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "cloudabi", - "fuchsia-cprng", "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", + "rand_chacha", + "rand_core", ] [[package]] -name = "rand_pcg" -version = "0.1.2" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", + "ppv-lite86", + "rand_core", ] [[package]] -name = "rand_xorshift" -version = "0.1.1" +name = "rand_core" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "rand_core 0.3.1", + "getrandom", ] [[package]] -name = "rand_xorshift" -version = "0.3.0" +name = "rand_distr" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ - "rand_core 0.6.4", + "num-traits", + "rand", ] [[package]] @@ -6015,24 +3786,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -6048,9 +3801,9 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.15", + "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6067,13 +3820,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -6088,9 +3841,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -6132,68 +3885,22 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", - "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.5.0", - "hyper-rustls 0.27.3", - "hyper-tls 0.6.0", + "hyper", + "hyper-rustls", + "hyper-tls", "hyper-util", "ipnet", "js-sys", @@ -6203,12 +3910,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", - "system-configuration 0.6.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -6240,7 +3947,7 @@ dependencies = [ "spin 0.5.2", "untrusted 0.7.1", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6250,8 +3957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if 1.0.0", - "getrandom 0.2.15", + "cfg-if", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -6386,9 +4093,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -6411,59 +4118,17 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.15" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -6479,26 +4144,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "rustls-webpki" version = "0.102.8" @@ -6516,18 +4161,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" version = "1.0.18" @@ -6554,9 +4187,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -6567,7 +4200,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.3", + "parking_lot", ] [[package]] @@ -6592,7 +4225,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -6617,12 +4250,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "sd-notify" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be20c5f7f393ee700f8b2f28ea35812e4e212f40774b550cd2a93ea91684451" - [[package]] name = "seahash" version = "4.1.0" @@ -6644,9 +4271,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -6678,9 +4305,9 @@ dependencies = [ [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -6731,7 +4358,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -6742,14 +4369,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "indexmap 2.6.0", "itoa", @@ -6806,7 +4433,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -6840,18 +4467,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -6862,7 +4478,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -6947,18 +4563,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" -dependencies = [ - "serde", -] +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" @@ -6966,7 +4573,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.4.0", + "autocfg", ] [[package]] @@ -6987,21 +4594,11 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ - "autocfg 1.4.0", + "autocfg", "static_assertions", "version_check", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.5.7" @@ -7023,7 +4620,7 @@ dependencies = [ "num_cpus", "once_cell", "one_err", - "parking_lot 0.12.3", + "parking_lot", "tokio", ] @@ -7062,7 +4659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "psm", "windows-sys 0.59.0", @@ -7084,7 +4681,7 @@ dependencies = [ "lazy_static", "nalgebra", "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -7102,7 +4699,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -7123,29 +4720,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.82", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.82", -] - [[package]] name = "structopt" version = "0.3.26" @@ -7208,7 +4782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7259,7 +4833,7 @@ checksum = "12d0a8eaaf1606c9207077d75828008cb2dfb51b095a766bd2b72ef893576e31" dependencies = [ "ast_node", "better_scoped_tls", - "cfg-if 1.0.0", + "cfg-if", "either", "from_variant", "new_debug_unreachable", @@ -7267,7 +4841,7 @@ dependencies = [ "once_cell", "rustc-hash", "serde", - "siphasher 0.3.11", + "siphasher", "swc_allocator", "swc_atoms", "swc_eq_ignore_macros", @@ -7325,7 +4899,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -7336,7 +4910,7 @@ checksum = "27e18fbfe83811ffae2bb23727e45829a0d19c6870bced7c0f545cc99ad248dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -7362,9 +4936,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -7373,29 +4947,22 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.89", ] [[package]] @@ -7404,7 +4971,7 @@ version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys", "libc", "ntapi", @@ -7413,17 +4980,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys 0.5.0", -] - [[package]] name = "system-configuration" version = "0.6.1" @@ -7432,17 +4988,7 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", "core-foundation", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "system-configuration-sys", ] [[package]] @@ -7463,9 +5009,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -7478,25 +5024,13 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" -[[package]] -name = "task-motel" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228e85537ffb5943539a46bf561786323f6112114005ba055e496192a6f8f41" -dependencies = [ - "futures", - "parking_lot 0.12.3", - "tokio", - "tracing", -] - [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "once_cell", "rustix", @@ -7512,22 +5046,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" -dependencies = [ - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "test-fuzz" version = "3.0.4" @@ -7585,18 +5103,6 @@ dependencies = [ "test-fuzz-internal", ] -[[package]] -name = "test-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf41af45e3f54cc184831d629d41d5b2bda8297e29c81add7ae4f362ed5e01b" -dependencies = [ - "proc-macro2", - "quote", - "structmeta", - "syn 2.0.82", -] - [[package]] name = "text-block-macros" version = "0.1.1" @@ -7623,22 +5129,42 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -7647,7 +5173,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -7683,21 +5209,22 @@ dependencies = [ ] [[package]] -name = "tiny-keccak" -version = "2.0.2" +name = "tiny_pretty" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +checksum = "4b3f46f0549180b9c6f7f76270903f1a06867c43a03998b99dce81aa1760c3b2" dependencies = [ - "crunchy", + "unicode-width", ] [[package]] -name = "tiny_pretty" -version = "0.2.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b3f46f0549180b9c6f7f76270903f1a06867c43a03998b99dce81aa1760c3b2" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "unicode-width", + "displaydoc", + "zerovec", ] [[package]] @@ -7717,18 +5244,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", "libc", "mio", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] @@ -7741,7 +5268,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] @@ -7754,78 +5281,17 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.15", + "rustls 0.23.18", "rustls-pki-types", "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", - "tungstenite 0.18.0", - "webpki", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.21.0", -] - [[package]] name = "tokio-util" version = "0.7.12" @@ -7907,7 +5373,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -7921,14 +5386,14 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -7990,209 +5455,24 @@ dependencies = [ [[package]] name = "trilean" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424" - -[[package]] -name = "triomphe" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http 0.2.12", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.20.9", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki", -] - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tx5" -version = "0.0.15-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26db071e98ea6e59b2f4776c3695f7ac76fe3e49e1831bc1c694aeb12132dff2" -dependencies = [ - "bit_field", - "bytes", - "futures", - "influxive-otel-atomic-obs", - "once_cell", - "opentelemetry_api", - "parking_lot 0.12.3", - "rand 0.8.5", - "rand-utf8", - "serde", - "serde_json", - "tokio", - "tracing", - "tx5-core", - "tx5-go-pion", - "tx5-signal", - "url", -] - -[[package]] -name = "tx5-core" -version = "0.0.15-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebfac463c45038a97f4680577dc4fa834e09cd8e71ee9afc885542e7f59e281" -dependencies = [ - "app_dirs2", - "base64 0.13.1", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "tempfile", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "tx5-go-pion" -version = "0.0.15-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7671dfde166b4cd952ad4768514e3755253e0af72c24e1469c743e0f9a77f2a0" -dependencies = [ - "futures", - "parking_lot 0.12.3", - "tokio", - "tracing", - "tx5-go-pion-sys", - "url", -] - -[[package]] -name = "tx5-go-pion-sys" -version = "0.0.15-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c9feca91791769d1b25ba46efa89493a648572dce6b79fdde2dbad73deb45a" -dependencies = [ - "Inflector", - "base64 0.13.1", - "dirs 5.0.1", - "libc", - "libloading", - "once_cell", - "ouroboros", - "sha2", - "tracing", - "tx5-core", - "zip 0.6.6", -] - -[[package]] -name = "tx5-go-pion-turn" -version = "0.0.15-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb92ddd44e049708d79e4315bf1c44b6992cd3a3cf95296ad24afd446daa3746" -dependencies = [ - "base64 0.13.1", - "dirs 5.0.1", - "dunce", - "if-addrs 0.10.2", - "once_cell", - "sha2", - "tokio", - "tracing", - "tx5-core", - "zip 0.6.6", -] +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424" [[package]] -name = "tx5-signal" -version = "0.0.15-alpha" +name = "triomphe" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4c7f15970697c26916e3063266e20052056315077cf742d501f0c283ea02a2" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" dependencies = [ - "futures", - "lair_keystore_api", - "once_cell", - "parking_lot 0.12.3", - "rand 0.8.5", - "rand-utf8", - "rcgen", - "ring 0.16.20", - "rustls 0.20.9", - "rustls-native-certs", - "rustls-pemfile 1.0.4", - "serde_json", - "sha2", - "socket2 0.5.7", - "tokio", - "tokio-rustls 0.23.4", - "tokio-tungstenite 0.18.0", - "tracing", - "tx5-core", - "url", - "webpki-roots 0.23.1", + "serde", + "stable_deref_trait", ] [[package]] -name = "tx5-signal-srv" -version = "0.0.15-alpha" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6add3578c5b9f8c361629acec50d155593ed6da02971bb2385b43412a21d38" -dependencies = [ - "clap 4.5.20", - "dirs 5.0.1", - "futures", - "if-addrs 0.10.2", - "once_cell", - "prometheus", - "rand 0.8.5", - "sodoken", - "tokio", - "tracing", - "tracing-subscriber", - "tx5-core", - "warp", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-arena" @@ -8212,24 +5492,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicase" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" - -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-id-start" version = "1.3.1" @@ -8238,18 +5500,9 @@ checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b" [[package]] name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" @@ -8263,12 +5516,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unicode_categories" version = "0.1.1" @@ -8293,12 +5540,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "unwrap_to" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad414b2eed757c1b6f810f8abc814e298a9c89176b21fae092c7a87756fb839" - [[package]] name = "unzip-n" version = "0.1.2" @@ -8324,9 +5565,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -8351,10 +5592,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" @@ -8368,9 +5615,8 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", - "serde", + "getrandom", + "rand", ] [[package]] @@ -8379,12 +5625,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-bag" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" - [[package]] name = "vcpkg" version = "0.2.15" @@ -8403,15 +5643,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -8431,41 +5662,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "warp" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http 0.2.12", - "hyper 0.14.31", - "log", - "mime", - "mime_guess", - "multer", - "percent-encoding", - "pin-project", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-tungstenite 0.21.0", - "tokio-util", - "tower-service", - "tracing", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -8478,7 +5674,7 @@ version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "wasm-bindgen-macro", ] @@ -8494,7 +5690,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -8504,7 +5700,7 @@ version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -8528,7 +5724,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8548,19 +5744,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-streams" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasmer" version = "4.3.1" @@ -8568,7 +5751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -8578,7 +5761,7 @@ dependencies = [ "serde-wasm-bindgen", "shared-buffer", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "tracing", "wasm-bindgen", "wasmer-compiler", @@ -8587,7 +5770,7 @@ dependencies = [ "wasmer-types", "wasmer-vm", "wat", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8598,7 +5781,7 @@ checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -8610,11 +5793,11 @@ dependencies = [ "self_cell", "shared-buffer", "smallvec", - "thiserror", + "thiserror 1.0.69", "wasmer-types", "wasmer-vm", "wasmparser", - "winapi 0.3.9", + "winapi", "xxhash-rust", ] @@ -8654,7 +5837,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml 0.9.34+deprecated", - "thiserror", + "thiserror 1.0.69", "toml 0.8.19", "url", ] @@ -8671,17 +5854,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "wasmer-middlewares" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "667dbe64667a478fd5726111180dd757113f3589a589f831bfe4ae1a256ae77e" -dependencies = [ - "wasmer", - "wasmer-types", - "wasmer-vm", -] - [[package]] name = "wasmer-types" version = "4.3.1" @@ -8691,14 +5863,14 @@ dependencies = [ "bytecheck", "enum-iterator", "enumset", - "getrandom 0.2.15", + "getrandom", "hex", "indexmap 1.9.3", "more-asserts", "rkyv", "sha2", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "webc", "xxhash-rust", ] @@ -8711,7 +5883,7 @@ checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap 5.5.3", @@ -8722,13 +5894,13 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset 0.9.1", + "memoffset", "more-asserts", "region", "scopeguard", - "thiserror", + "thiserror 1.0.69", "wasmer-types", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8782,7 +5954,7 @@ dependencies = [ "anyhow", "base64 0.22.1", "bytes", - "cfg-if 1.0.0", + "cfg-if", "ciborium", "document-features", "flate2", @@ -8796,7 +5968,7 @@ dependencies = [ "shared-buffer", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", "toml 0.8.19", "url", "wasmer-config", @@ -8804,45 +5976,24 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "rustls-webpki 0.100.3", + "ring 0.17.8", + "untrusted 0.9.0", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "wide" -version = "0.7.28" +version = "0.7.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" +checksum = "58e6db2670d2be78525979e9a5f9c69d296fd7d670549fe9ebf70f8708cb5019" dependencies = [ "bytemuck", "safe_arch", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -8936,15 +6087,6 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -8972,21 +6114,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -9018,12 +6145,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -9042,12 +6163,6 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -9066,12 +6181,6 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -9096,12 +6205,6 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -9120,12 +6223,6 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -9138,12 +6235,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -9162,12 +6253,6 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -9190,14 +6275,16 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wyz" @@ -9219,12 +6306,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "xxhash-rust" version = "0.8.12" @@ -9255,6 +6336,30 @@ dependencies = [ "time", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -9273,7 +6378,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -9283,30 +6409,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] -name = "zip" -version = "0.6.6" +name = "zerovec" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] name = "zip" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352" dependencies = [ "arbitrary", "crc32fast", @@ -9315,7 +6443,7 @@ dependencies = [ "flate2", "indexmap 2.6.0", "memchr", - "thiserror", + "thiserror 2.0.3", "zopfli", ] @@ -9332,32 +6460,3 @@ dependencies = [ "once_cell", "simd-adler32", ] - -[[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", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index b3059959c..08c1474c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "holochain_scaffolding_cli" -version = "0.3000.8" +version = "0.3000.9" description = "CLI to easily generate and modify holochain apps" license = "CAL-1.0" homepage = "https://developer.holochain.org" @@ -18,10 +18,8 @@ name = "holochain_scaffolding_cli" path = "src/lib.rs" [dependencies] -holochain = { features = ["test_utils"], version = "0.3.4" } -holochain_types = "0.3.4" -holochain_util = { features = ["backtrace"], version = "0.3.4" } -mr_bundle = "0.3.4" +holochain_types = "0.3.5" +mr_bundle = "0.3.5" dirs = "4.0.0" ignore = "0.4" @@ -51,5 +49,10 @@ itertools = "0.10" colored = "2.1.0" dprint-plugin-typescript = "0.91.1" markup_fmt = "0.10.0" -git2 = { version = "0.19.0", default-features = false, features = ["https", "ssh_key_from_memory", "vendored-libgit2", "vendored-openssl"] } +git2 = { version = "0.19.0", default-features = false, features = [ + "https", + "ssh_key_from_memory", + "vendored-libgit2", + "vendored-openssl", +] } once_cell = "1.20.2" diff --git a/flake.lock b/flake.lock index 24299c268..0161f742b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1729273024, - "narHash": "sha256-Mb5SemVsootkn4Q2IiY0rr9vrXdCCpQ9HnZeD/J3uXs=", + "lastModified": 1731974733, + "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", "owner": "ipetkov", "repo": "crane", - "rev": "fa8b7445ddadc37850ed222718ca86622be01967", + "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1727691892, - "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", + "lastModified": 1729600306, + "narHash": "sha256-jL3vMQ8GRWA151HGrh/KYOpGbI9XKt5XjBfOjcoqu0o=", "owner": "holochain", "repo": "scaffolding", - "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", + "rev": "96a4346611e24e8b93e64804628ab7722b91ab0a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1729609558, - "narHash": "sha256-qteOA8rTiaWzwpG/wLMbP1o7G/Es4LF4LgPY9/NFsy4=", + "lastModified": 1730894017, + "narHash": "sha256-IMxJzvpk8m487maynFuyU2z4YVJzrY1msbsCtEBdpTw=", "owner": "holochain", "repo": "holonix", - "rev": "b6b92c161498dc77f705bf3f5c9ee70f4457234c", + "rev": "79f9f81e42d87debbd5395a89482dbc9558ef6c1", "type": "github" }, "original": { @@ -153,14 +153,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "root": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1729650555, - "narHash": "sha256-j8Sohst1TbQM6LqQKa/HRMfzsUwMhosuNMj2uOn9JOA=", + "lastModified": 1731983527, + "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab", + "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 498caf435..5f7ab61db 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ lib.wrapCustomTemplate = { system, pkgs, customTemplatePath }: let - scaffolding = inputs.holochain.packages.${system}.hc-scaffold; + scaffolding = inputs.holonix.packages.${system}.hc-scaffold; in pkgs.runCommand "hc-scaffold" { @@ -73,6 +73,26 @@ nonCargoBuildFiles = path: _type: builtins.match ".*(gitignore|md|hbs)$" path != null; includeFilesFilter = path: type: (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type); + + buildInputs = [ pkgs.openssl pkgs.go ] + ++ (lib.optionals pkgs.stdenv.isDarwin + (with pkgs.darwin.apple_sdk.frameworks; [ + CoreFoundation + SystemConfiguration + Security + ])); + + nativeBuildInputs = [ pkgs.perl ]; + + cargoArtifacts = craneLib.buildDepsOnly { + pname = "hc-scaffold-deps"; + src = lib.cleanSourceWith { + src = ./.; + filter = includeFilesFilter; + name = "source"; + }; + inherit buildInputs nativeBuildInputs; + }; in craneLib.buildPackage { pname = "hc-scaffold"; @@ -84,15 +104,7 @@ }; doCheck = false; - buildInputs = [ pkgs.openssl pkgs.go ] - ++ (lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; [ - CoreFoundation - SystemConfiguration - Security - ])); - - nativeBuildInputs = [ pkgs.perl ]; + inherit cargoArtifacts buildInputs nativeBuildInputs; }; checks.custom-template = flake.lib.wrapCustomTemplate { @@ -124,4 +136,10 @@ }; }; }; + + + nixConfig = { + extra-substituters = [ "https://holochain-ci.cachix.org" "https://holochain-scaffolding-cli.cachix.org" ]; + extra-trusted-public-keys = [ "holochain-ci.cachix.org-1:5IUSkZc0aoRS53rfkvH9Kid40NpyjwCMCzwRTXy+QN8=" "holochain-scaffolding-cli.cachix.org-1:DznpFcPqqPqiP05k/0lT6qeQ/N3KOvKQW/EP4Pf3A2E=" ]; + }; } diff --git a/guides/maintenance.md b/guides/maintenance.md index 3c22c9220..0685a99d9 100644 --- a/guides/maintenance.md +++ b/guides/maintenance.md @@ -8,10 +8,10 @@ New development and bug fixes should target the `develop` branch. From there, ch There need to be some exceptions to this workflow to allow changes on maintenance branches that don't make sense to make on `develop`: -- Bug fixes that are specific to a particular version of Holochain. This should be rare, but if Holochain were to introduce an API change between 0.1.x and 0.1.x+1 but NOT make that change for Holochain 0.2.x then the PR for Scaffolding would target `develop-0.1` directly. -- Version bumps for `flake.nix`, `flake.lock` and `Cargo.lock` files should target the maintenance branches directly. -- Version bumps for dependencies of Scaffolding in the `Cargo.toml`. For dependencies that are still on the same version as on `develop` it would be valid to target `develop` and back-port but you'll end up with a tricky lock file merge anyway. -- Version bumps to Scaffolding itself don't make sense on `develop` so they should be made directly on the maintenance branches. +- Bug fixes that are specific to a particular version of Holochain. This should be rare, but if Holochain were to introduce an API change between 0.1.x and 0.1.x+1 but NOT make that change for Holochain 0.2.x then the PR for Scaffolding would target `develop-0.1` directly. +- Version bumps for `flake.nix`, `flake.lock`, `Cargo.lock` and [`versions.rs`](../src/versions.rs) files should target the maintenance branches directly. +- Version bumps for dependencies (typically holochain dependencies) of Scaffolding in the `Cargo.toml` or to Scaffolded hApps in [`versions.rs`](../src/versions.rs). For dependencies that are still on the same version as on `develop` it would be valid to target `develop` and back-port but you'll end up with a tricky lock file merge anyway. +- Version bumps to Scaffolding itself don't make sense on `develop` so they should be made directly on the maintenance branches. To keep back-porting as simple as possible please try to keep changes that target `develop` for back-port separate from changes that fit into these exceptions. @@ -31,7 +31,7 @@ Releases can be done as needed. This may be a single PR back-port, a batch of ch 1. Submit a PR which bumps the Scaffolding version in the `Cargo.toml` on the relevant maintenance branch. This should be merged before the release. 2. Perform any testing which needs to be done before releasing the new changes. -2. Changes on a maintenance branch such as `develop-0.1` are not yet visible to Holonix because there is a tag on the branch with the same version number such as `holochain-0.1`. This is the marker that Holonix will use to fetch the current version of Scaffolding corresponding to its Holochain version. Move this label to the tip of the maintenance branch. Sample commands are given for this below. +3. Changes on a maintenance branch such as `develop-0.1` are not yet visible to Holonix because there is a tag on the branch with the same version number such as `holochain-0.1`. This is the marker that Holonix will use to fetch the current version of Scaffolding corresponding to its Holochain version. Move this label to the tip of the maintenance branch. Sample commands are given for this below. Moving a release tag example: diff --git a/src/cli/example.rs b/src/cli/example.rs index 21ca156bf..7bb36ae64 100644 --- a/src/cli/example.rs +++ b/src/cli/example.rs @@ -270,11 +270,11 @@ impl Example { }; let ScaffoldedTemplate { - file_tree, + mut file_tree, next_instructions, } = scaffold_example(file_tree, package_manager, &template_file_tree, &example)?; - let file_tree = ScaffoldConfig::write_to_package_json(file_tree, template_type)?; + ScaffoldConfig::write_to_package_json(&mut file_tree, template_type)?; build_file_tree(file_tree, &app_dir)?; diff --git a/src/cli/web_app.rs b/src/cli/web_app.rs index 1c71ebfc3..39f5dd8b3 100644 --- a/src/cli/web_app.rs +++ b/src/cli/web_app.rs @@ -90,7 +90,7 @@ impl WebApp { }; let ScaffoldedTemplate { - file_tree, + mut file_tree, next_instructions, } = scaffold_web_app( &name, @@ -101,7 +101,9 @@ impl WebApp { self.holo_enabled, )?; - let file_tree = ScaffoldConfig::write_to_package_json(file_tree, template_type)?; + if !template_type.is_nixified_custom_template() { + ScaffoldConfig::write_to_package_json(&mut file_tree, template_type)?; + } build_file_tree(file_tree, &app_folder)?; diff --git a/src/error.rs b/src/error.rs index 9223009a4..23a881197 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,6 +1,5 @@ use std::{io, path::PathBuf}; -use holochain_util::ffs; use thiserror; #[derive(Debug, thiserror::Error)] @@ -9,9 +8,6 @@ pub enum ScaffoldError { #[error("IO error: {0}")] StdIoError(#[from] std::io::Error), - #[error("ffs::IoError: {0}")] - FfsIoError(#[from] ffs::IoError), - /// MrBundleError #[error(transparent)] MrBundleError(#[from] mr_bundle::error::MrBundleError), diff --git a/src/file_tree.rs b/src/file_tree.rs index f220c8a1f..21dbff58a 100644 --- a/src/file_tree.rs +++ b/src/file_tree.rs @@ -82,8 +82,6 @@ pub fn insert_file( let mut folder_path = file_path.to_path_buf(); folder_path.pop(); - let content = convert_rust_line_to_doc_comments(file_path, content); - insert_file_tree_in_dir( file_tree, &folder_path, @@ -232,7 +230,7 @@ pub fn map_rust_files ScaffoldResult + C /// otherwise returns the original content unchanged. fn convert_rust_line_to_doc_comments(file_path: &Path, content: &str) -> String { if file_path.extension().and_then(|ext| ext.to_str()) == Some("rs") { - let re = Regex::new(r"^\/\/[^\/]|[^\/]\/\/[^\/]").expect("Failed to create regex"); + let re = Regex::new(r"(?:^|[^:])/(/[^/])").expect("Failed to create regex"); content .lines() .map(|line| re.replace_all(line, "/// ").into_owned() + "\n") diff --git a/src/lib.rs b/src/lib.rs index a4cd6e8a1..c3e26c96e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -36,7 +36,7 @@ //! //! # Custom Templates //! -//! The scaffolding tool comes with 4 built-in templates: +//! The scaffolding tool comes with 6 built-in templates: //! //! - Vue (with TypeScript) //! - Svelte (with TypeScript) diff --git a/src/scaffold/app.rs b/src/scaffold/app.rs index 5bfc28d4d..b3643a2ab 100644 --- a/src/scaffold/app.rs +++ b/src/scaffold/app.rs @@ -1,7 +1,7 @@ use std::{collections::BTreeMap, path::PathBuf}; use dialoguer::{theme::ColorfulTheme, Select}; -use holochain::prelude::AppManifest; +use holochain_types::prelude::AppManifest; use mr_bundle::Manifest; use crate::{ diff --git a/src/scaffold/config.rs b/src/scaffold/config.rs index 5c5b3de26..9bbff39c6 100644 --- a/src/scaffold/config.rs +++ b/src/scaffold/config.rs @@ -33,15 +33,15 @@ impl ScaffoldConfig { } pub fn write_to_package_json( - mut web_app_file_tree: FileTree, + web_app_file_tree: &mut FileTree, template_type: &TemplateType, - ) -> ScaffoldResult { + ) -> ScaffoldResult<()> { let config = ScaffoldConfig { template: template_type.clone(), }; let package_json_path = PathBuf::from("package.json"); - map_file(&mut web_app_file_tree, &package_json_path, |c| { + map_file(web_app_file_tree, &package_json_path, |c| { let original_content = c.clone(); let json = serde_json::from_str::(&c)?; let json = match json { @@ -59,6 +59,6 @@ impl ScaffoldConfig { Ok(json) })?; - Ok(web_app_file_tree) + Ok(()) } } diff --git a/src/scaffold/link_type/integrity.rs b/src/scaffold/link_type/integrity.rs index 197a749c1..ef51fc8b8 100644 --- a/src/scaffold/link_type/integrity.rs +++ b/src/scaffold/link_type/integrity.rs @@ -45,14 +45,12 @@ pub fn add_link_type_to_integrity_zome( &|_path, file| { file.items.clone().into_iter().find(|i| { if let syn::Item::Enum(item_enum) = i.clone() { - if item_enum.attrs.iter().any(|a| { + return item_enum.attrs.iter().any(|a| { a.path() .segments .iter() .any(|s| s.ident == "hdk_link_types") - }) { - return true; - } + }); } false }) @@ -101,27 +99,24 @@ pub fn add_link_type_to_integrity_zome( for item in &mut file.items { if let syn::Item::Fn(item_fn) = item { - if item_fn.sig.ident.to_string().eq(&String::from("validate")) { - for stmt in &mut item_fn.block.stmts { - if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt { - if let syn::Expr::Try(try_expr) = &mut *match_expr.expr { - if let syn::Expr::MethodCall(call) = &mut *try_expr.expr { - if call - .method - .to_string() - .eq(&String::from("flattened")) - { - if let Some(turbofish) = &mut call.turbofish { - if let Some(last_arg) = - turbofish.args.last_mut() - { - *last_arg = syn::GenericArgument::Type( - syn::parse_str::( - "LinkTypes", - )?, - ); - } - } + if item_fn.sig.ident != "validate" { + continue; + } + for stmt in &mut item_fn.block.stmts { + if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt { + if let syn::Expr::Try(try_expr) = &mut *match_expr.expr { + if let syn::Expr::MethodCall(call) = &mut *try_expr.expr { + if call.method != "flattened" { + continue; + } + if let Some(turbofish) = &mut call.turbofish { + if let Some(last_arg) = turbofish.args.last_mut() { + *last_arg = + syn::GenericArgument::Type(syn::parse_str::< + syn::Type, + >( + "LinkTypes" + )?); } } } @@ -141,17 +136,17 @@ pub fn add_link_type_to_integrity_zome( a.path() .segments .iter() - .any(|s| s.ident.eq("hdk_link_types")) + .any(|s| s.ident == "hdk_link_types") }) { if item_enum .variants .iter() - .any(|v| v.ident.to_string().eq(&pascal_case_link_type_name)) + .any(|v| v.ident == pascal_case_link_type_name) { return Err(ScaffoldError::LinkTypeAlreadyExists( link_type_name.to_owned(), dna_manifest.name(), - zome_manifest.name.0.to_string(), + zome_manifest.name.to_string(), )); } @@ -184,7 +179,7 @@ pub fn add_link_type_to_integrity_zome( .path_mut(&mut v.iter()) .ok_or(ScaffoldError::PathNotFound(crate_src_path.clone()))?, |file_path, mut file| { - if file_path.eq(file_to_add_validation_to) { + if file_path == file_to_add_validation_to { let validate_create_fn = format_ident!( "validate_create_link_{}", link_type_name.to_case(Case::Snake) @@ -305,7 +300,7 @@ fn validate_referenceable( if entry_type.reference_entry_hash { quote! { - /// Check the entry type for the given entry hash + // Check the entry type for the given entry hash let entry_hash = #address_ident.into_entry_hash().ok_or(wasm_error!(WasmErrorInner::Guest("No entry hash associated with link".to_string())))?; let entry = must_get_entry(entry_hash)?.content; @@ -313,7 +308,7 @@ fn validate_referenceable( } } else { quote! { - /// Check the entry type for the given action hash + // Check the entry type for the given action hash let action_hash = #address_ident.into_action_hash().ok_or(wasm_error!( WasmErrorInner::Guest("No action hash associated with link".to_string()) ))?; @@ -356,12 +351,7 @@ fn add_link_type_signals( } if let syn::Item::Fn(item_fn) = item { - if item_fn - .sig - .ident - .to_string() - .eq(&String::from("signal_action")) - { + if item_fn.sig.ident == "signal_action" { if find_ending_match_expr_in_block(&mut item_fn.block).is_none() { item_fn.block = Box::new(syn::parse_str::( "{ match action.hashed.content.clone() { _ => Ok(()) } }", @@ -391,20 +381,14 @@ fn signal_has_link_types(signal_enum: &syn::ItemEnum) -> bool { signal_enum .variants .iter() - .any(|v| v.ident.to_string().eq(&String::from("LinkCreated"))) + .any(|v| v.ident == "LinkCreated") } fn signal_action_has_link_types(expr_match: &syn::ExprMatch) -> bool { expr_match.arms.iter().any(|arm| { if let syn::Pat::TupleStruct(tuple_struct_pat) = &arm.pat { if let Some(first_segment) = tuple_struct_pat.path.segments.last() { - if first_segment - .ident - .to_string() - .eq(&String::from("CreateLink")) - { - return true; - } + return first_segment.ident == "CreateLink"; } } false @@ -471,9 +455,7 @@ fn signal_action_match_arms() -> ScaffoldResult> { fn is_create_link(pat: &syn::Pat) -> bool { if let syn::Pat::Struct(pat_struct) = pat { if let Some(ps) = pat_struct.path.segments.last() { - if ps.ident.to_string().eq(&String::from("CreateLink")) { - return true; - } + return ps.ident == "CreateLink"; } } false @@ -482,9 +464,7 @@ fn is_create_link(pat: &syn::Pat) -> bool { fn is_delete_link(pat: &syn::Pat) -> bool { if let syn::Pat::Struct(pat_struct) = pat { if let Some(ps) = pat_struct.path.segments.last() { - if ps.ident.to_string().eq(&String::from("DeleteLink")) { - return true; - } + return ps.ident == "DeleteLink"; } } false @@ -495,66 +475,61 @@ fn add_link_type_to_validation_arms( link_type_name: &str, ) -> ScaffoldResult<()> { if let syn::Item::Fn(item_fn) = item { - if item_fn.sig.ident.to_string().eq(&String::from("validate")) { - for stmt in &mut item_fn.block.stmts { - if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt { - if let syn::Expr::Try(try_expr) = &mut *match_expr.expr { - if let syn::Expr::MethodCall(call) = &mut *try_expr.expr { - if call.method.to_string().eq(&String::from("flattened")) { - for arm in &mut match_expr.arms { - if let syn::Pat::TupleStruct(tuple_struct) = &mut arm.pat { - if let Some(path_segment) = - tuple_struct.path.segments.last() - { - let path_segment_str = path_segment.ident.to_string(); - if path_segment_str.eq(&String::from("StoreRecord")) { - if let Some(op_entry_match_expr) = - find_ending_match_expr(&mut arm.body) + if item_fn.sig.ident != "validate" { + return Ok(()); + } + for stmt in &mut item_fn.block.stmts { + if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt { + if let syn::Expr::Try(try_expr) = &mut *match_expr.expr { + if let syn::Expr::MethodCall(call) = &mut *try_expr.expr { + if call.method != "flattened" { + continue; + } + for arm in &mut match_expr.arms { + if let syn::Pat::TupleStruct(tuple_struct) = &mut arm.pat { + if let Some(path_segment) = tuple_struct.path.segments.last() { + if path_segment.ident != "StoreRecord" { + continue; + } + if let Some(op_entry_match_expr) = + find_ending_match_expr(&mut arm.body) + { + for op_record_arm in &mut op_entry_match_expr.arms { + if is_create_link(&op_record_arm.pat) { + // Add new link type to match arm + if find_ending_match_expr(&mut op_record_arm.body) + .is_none() { - for op_record_arm in - &mut op_entry_match_expr.arms - { - if is_create_link(&op_record_arm.pat) { - // Add new link type to match arm - if find_ending_match_expr( - &mut op_record_arm.body, - ) - .is_none() - { - // Change empty invalid to match on link_type - *op_record_arm.body = - syn::parse_str::( - "match link_type {}", - )?; - } - - // Add new link type to match arm - if let Some(link_type_match) = - find_ending_match_expr( - &mut op_record_arm.body, - ) - { - let new_arm: syn::Arm = syn::parse_str( + // Change empty invalid to match on link_type + *op_record_arm.body = + syn::parse_str::( + "match link_type {}", + )?; + } + + // Add new link type to match arm + if let Some(link_type_match) = + find_ending_match_expr(&mut op_record_arm.body) + { + let new_arm: syn::Arm = syn::parse_str( format!( "LinkTypes::{} => validate_create_link_{}(action, base_address, target_address, tag),", link_type_name.to_case(Case::Pascal), link_type_name.to_case(Case::Snake) ).as_str() )?; - link_type_match.arms.push(new_arm); - } - } else if is_delete_link(&op_record_arm.pat) - { - // Add new link type to match arm - if find_ending_match_expr( - &mut op_record_arm.body, - ) - .is_none() - { - // Change empty invalid to match on link_type - *op_record_arm.body = - syn::parse_str::( - r#"{ + link_type_match.arms.push(new_arm); + } + } else if is_delete_link(&op_record_arm.pat) { + // Add new link type to match arm + if find_ending_match_expr(&mut op_record_arm.body) + .is_none() + { + // Change empty invalid to match on link_type + *op_record_arm.body = syn::parse_str::< + syn::Expr, + >( + r#"{ let record = must_get_valid_record(original_action_hash)?; let create_link = match record.action() { Action::CreateLink(create_link) => create_link.clone(), @@ -570,16 +545,14 @@ fn add_link_type_to_validation_arms( }; match link_type {} }"#, - )?; - } - - // Add new entry type to match arm - if let Some(link_type_match) = - find_ending_match_expr( - &mut op_record_arm.body, - ) - { - let new_arm: syn::Arm = + )?; + } + + // Add new entry type to match arm + if let Some(link_type_match) = + find_ending_match_expr(&mut op_record_arm.body) + { + let new_arm: syn::Arm = syn::parse_str( format!( "LinkTypes::{} => validate_delete_link_{}(action, create_link.clone(), base_address, create_link.target_address, create_link.tag),", @@ -587,69 +560,57 @@ fn add_link_type_to_validation_arms( link_type_name.to_case(Case::Snake), ).as_str() )?; - link_type_match.arms.push(new_arm); - } - } - } + link_type_match.arms.push(new_arm); } } } } - if let syn::Pat::Struct(pat_struct) = &mut arm.pat { - if let Some(path_segment) = pat_struct.path.segments.last() - { - let path_segment_str = path_segment.ident.to_string(); - - if path_segment_str - .eq(&String::from("RegisterCreateLink")) - { - // Add new link type to match arm - if find_ending_match_expr(&mut arm.body).is_none() { - // Change empty invalid to match on link_type - *arm.body = syn::parse_str::( - "match link_type {}", - )?; - } + } + } + if let syn::Pat::Struct(pat_struct) = &mut arm.pat { + if let Some(path_segment) = pat_struct.path.segments.last() { + if path_segment.ident == "RegisterCreateLink" { + // Add new link type to match arm + if find_ending_match_expr(&mut arm.body).is_none() { + // Change empty invalid to match on link_type + *arm.body = + syn::parse_str::("match link_type {}")?; + } - // Add new link type to match arm - if let Some(link_type_match) = - find_ending_match_expr(&mut arm.body) - { - let new_arm: syn::Arm = syn::parse_str( - format!( + // Add new link type to match arm + if let Some(link_type_match) = + find_ending_match_expr(&mut arm.body) + { + let new_arm: syn::Arm = syn::parse_str( + format!( "LinkTypes::{} => validate_create_link_{}(action, base_address, target_address, tag),", link_type_name.to_case(Case::Pascal), link_type_name.to_case(Case::Snake) ) - .as_str(), - )?; - link_type_match.arms.push(new_arm); - } - } else if path_segment_str - .eq(&String::from("RegisterDeleteLink")) - { - // Add new link type to match arm - if find_ending_match_expr(&mut arm.body).is_none() { - // Change empty invalid to match on link_type - *arm.body = syn::parse_str::( - "match link_type {}", - )?; - } + .as_str(), + )?; + link_type_match.arms.push(new_arm); + } + } else if path_segment.ident == "RegisterDeleteLink" { + // Add new link type to match arm + if find_ending_match_expr(&mut arm.body).is_none() { + // Change empty invalid to match on link_type + *arm.body = + syn::parse_str::("match link_type {}")?; + } - // Add new link type to match arm - if let Some(link_type_match) = - find_ending_match_expr(&mut arm.body) - { - let new_arm: syn::Arm = syn::parse_str( + // Add new link type to match arm + if let Some(link_type_match) = + find_ending_match_expr(&mut arm.body) + { + let new_arm: syn::Arm = syn::parse_str( format!( "LinkTypes::{} => validate_delete_link_{}(action, original_action, base_address, target_address, tag),", link_type_name.to_case(Case::Pascal), link_type_name.to_case(Case::Snake) ).as_str() )?; - link_type_match.arms.push(new_arm); - } - } + link_type_match.arms.push(new_arm); } } } diff --git a/src/scaffold/web_app/template_type.rs b/src/scaffold/web_app/template_type.rs index 711152b32..cd5de8e39 100644 --- a/src/scaffold/web_app/template_type.rs +++ b/src/scaffold/web_app/template_type.rs @@ -123,6 +123,14 @@ impl TemplateType { .interact()?; Ok(frameworks[selection].clone()) } + + /// Checks whether the custom template'path is a path to a nix store + pub fn is_nixified_custom_template(&self) -> bool { + if let TemplateType::Custom(path) = self { + return path.starts_with("/nix/store/"); + } + false + } } impl From for TemplateType { diff --git a/src/scaffold/zome.rs b/src/scaffold/zome.rs index 6e2bf9b27..4a4dfac3b 100644 --- a/src/scaffold/zome.rs +++ b/src/scaffold/zome.rs @@ -454,7 +454,7 @@ pub fn scaffold_coordinator_zome_in_path( let file_tree = add_common_zome_dependencies_to_workspace_cargo(dna_file_tree.file_tree())?; let mut file_tree = add_workspace_path_dependency(file_tree, zome_name, &path.join(zome_name))?; - let initial_lib_rs = &coordinator::initial_lib_rs(dependencies); + let initial_lib_rs = coordinator::initial_lib_rs(dependencies); let zome: FileTree = dir! { "Cargo.toml" => file!(coordinator::initial_cargo_toml(zome_name, dependencies)), diff --git a/src/scaffold/zome/coordinator.rs b/src/scaffold/zome/coordinator.rs index d1666abf7..e5441426e 100644 --- a/src/scaffold/zome/coordinator.rs +++ b/src/scaffold/zome/coordinator.rs @@ -75,7 +75,7 @@ pub fn initial_lib_rs(dependencies: Option<&Vec>) -> TokenStream { /// Whenever an action is committed, we emit a signal to the UI elements to reactively update them #[hdk_extern(infallible)] pub fn post_commit(committed_actions: Vec) { - /// Don't modify this loop if you want the scaffolding tool to generate appropriate signals for your entries and links + /// Don't modify the for loop if you want the scaffolding tool to generate appropriate signals for your entries and links for action in committed_actions { if let Err(err) = signal_action(action) { error!("Error signaling new action: {:?}", err); diff --git a/src/templates/coordinator.rs b/src/templates/coordinator.rs index 536c75d8b..25769f579 100644 --- a/src/templates/coordinator.rs +++ b/src/templates/coordinator.rs @@ -1,6 +1,6 @@ use std::{ffi::OsString, path::PathBuf}; -use holochain::prelude::ZomeManifest; +use holochain_types::prelude::ZomeManifest; use serde::Serialize; use crate::{ diff --git a/src/utils.rs b/src/utils.rs index cb368a0b1..6ed232620 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -75,20 +75,16 @@ fn get_folder_names(folder: &BTreeMap) -> Vec { #[inline] /// "yes" or "no" input dialog, with the option to specify a recommended answer (yes = true, no = false) pub fn input_yes_or_no(prompt: &str, recommended: Option) -> ScaffoldResult { - let yes_recommended = if recommended == Some(true) { - " (recommended)" - } else { - "" - }; - let no_recommended = if recommended == Some(false) { - " (recommended)" - } else { - "" - }; + let yes_recommended = (recommended == Some(true)) + .then_some("(recommended)") + .unwrap_or_default(); + let no_recommended = (recommended == Some(false)) + .then_some("(recommended)") + .unwrap_or_default(); let items = [ - format!("Yes{}", yes_recommended), - format!("No{}", no_recommended), + format!("Yes {}", yes_recommended), + format!("No {}", no_recommended), ]; let selection = Select::with_theme(&ColorfulTheme::default()) diff --git a/src/versions.rs b/src/versions.rs index e28bc5d67..147bcfd4d 100644 --- a/src/versions.rs +++ b/src/versions.rs @@ -11,13 +11,16 @@ pub const HC_SPIN_VERSION: &str = "0.300.3"; /// npm: pub const WEB_SDK_VERSION: &str = "^0.6.19-prerelease"; -pub const HDI_VERSION: &str = holochain::HDI_VERSION; +/// crates.io +pub const HDI_VERSION: &str = "0.6.0-dev.3"; -pub const HDK_VERSION: &str = holochain::HDK_VERSION; +/// crates.io +pub const HDK_VERSION: &str = "0.5.0-dev.5"; -pub const HOLOCHAIN_VERSION: &str = holochain::HOLOCHAIN_VERSION; +/// crates.io +pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.5"; /// source: /// /// npm: -pub const HOLOCHAIN_PLAYGROUND_CLI_VERSION: &str = "^0.300.0-rc.0"; +pub const HOLOCHAIN_PLAYGROUND_CLI_VERSION: &str = "^0.300.1"; diff --git a/templates/custom-template/custom-template/flake.nix b/templates/custom-template/custom-template/flake.nix index 1fb17e263..24600d6bf 100644 --- a/templates/custom-template/custom-template/flake.nix +++ b/templates/custom-template/custom-template/flake.nix @@ -4,27 +4,30 @@ inputs = { holonix.url = "github:holochain/holonix?ref=main-0.3"; + scaffolding.url = "github:holochain/scaffolding/holochain-0.3"; nixpkgs.follows = "holonix/nixpkgs"; flake-parts.follows = "holonix/flake-parts"; }; outputs = inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = builtins.attrNames inputs.holonix.devShells; - perSystem = { inputs', pkgs, ... }: { + perSystem = { inputs', pkgs, system, ... }: { formatter = pkgs.nixpkgs-fmt; devShells.default = pkgs.mkShell { inputsFrom = [ inputs'.holonix.devShells.default ]; - packages = (with pkgs; [ - nodejs_20 - binaryen - ]); + packages = (with pkgs; [ nodejs_20 binaryen ]); shellHook = '' export PS1='\[\033[1;34m\][holonix:\w]\$\[\033[0m\] ' ''; }; + + packages.app = inputs.scaffolding.lib.wrapCustomTemplate { + inherit pkgs system; + customTemplatePath = ./template; + }; }; }; } diff --git a/templates/custom-template/custom-template/template/collection.instructions.hbs b/templates/custom-template/custom-template/template/collection.instructions.hbs index a26ae14af..51ad54b6f 100644 --- a/templates/custom-template/custom-template/template/collection.instructions.hbs +++ b/templates/custom-template/custom-template/template/collection.instructions.hbs @@ -1,9 +1,2 @@ -{{#if (eq collection_type.type "Global")}} -At first, the UI for this application is empty. If you want the newly scaffolded collection to be the entry point for its UI, import the element in `ui/src/holochain-app.ts`: - - import './{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}'; - -And insert it in the `
` like this: - -
<{{kebab_case collection_name}}>
-{{/if}} +If you want the newly scaffolded collection's component to be the entry point for its UI, import the +generated <{{kebab_case collection_name}}> component. \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs b/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs index 59cd68f89..7694dcbda 100644 --- a/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs +++ b/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs @@ -1,7 +1,16 @@ import { assert, test } from "vitest"; import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama'; -import { NewEntryAction, ActionHash, Record, Link, AppBundleSource, fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client'; +import { + NewEntryAction, + ActionHash, + Record, + Link, + AppBundleSource, + fakeActionHash, + fakeAgentPubKey, + fakeEntryHash +} from '@holochain/client'; import { decode } from '@msgpack/msgpack'; import { create{{pascal_case referenceable.name}} } from './common.js'; @@ -66,4 +75,3 @@ test('create a {{pascal_case referenceable.name}} and get {{lower_case collectio {{/if}} }); }); - diff --git a/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs b/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs index 2be95c31d..70c679dbe 100644 --- a/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs +++ b/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs @@ -4,6 +4,7 @@ import { AppClient, AgentPubKey, Link, EntryHash, ActionHash, Record, NewEntryAc import { consume } from '@lit-labs/context'; import { Task } from '@lit-labs/task'; +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; @@ -13,7 +14,7 @@ import './{{kebab_case referenceable.name}}-detail'; export class {{pascal_case collection_name}} extends LitElement { @consume({ context: clientContext }) client!: AppClient; - + {{#if (eq collection_type.type "ByAuthor")}} @property({ hasChanged: (newVal: AgentPubKey, oldVal: AgentPubKey) => newVal?.toString() !== oldVal?.toString() @@ -23,8 +24,8 @@ export class {{pascal_case collection_name}} extends LitElement { @state() signaledHashes: Array<{{referenceable.hash_type}}> = []; - - _fetch{{pascal_case (plural referenceable.name)}} = new Task(this, ([{{#if (eq collection_type.type "ByAuthor")}}author{{/if}}]) => this.client.callZome({ + + _fetch{{pascal_case (plural referenceable.name)}} = new Task(this, ([{{#if (eq collection_type.type "ByAuthor")}}author{{/if}}]: any) => this.client.callZome({ cap_secret: null, role_name: '{{dna_role_name}}', zome_name: '{{coordinator_zome_manifest.name}}', @@ -34,13 +35,13 @@ export class {{pascal_case collection_name}} extends LitElement { firstUpdated() { {{#if (eq collection_type.type "ByAuthor")}} - if (this.author === undefined) { + if (!this.author) { throw new Error(`The author property is required for the {{kebab_case collection_name}} element`); } {{/if}} this.client.on('signal', signal => { - if (signal.zome_name !== '{{coordinator_zome_manifest.name}}') return; + if (signal.zome_name !== '{{coordinator_zome_manifest.name}}') return; const payload = signal.payload as {{pascal_case coordinator_zome_manifest.name}}Signal; if (payload.type !== 'EntryCreated') return; if (payload.app_entry.type !== '{{pascal_case referenceable.name}}') return; @@ -50,27 +51,29 @@ export class {{pascal_case collection_name}} extends LitElement { this.signaledHashes = [{{#if (eq referenceable.hash_type "ActionHash")}}payload.action.hashed.hash{{else}}(payload.action.hashed.content as NewEntryAction).entry_hash{{/if}}, ...this.signaledHashes]; }); } - + renderList(hashes: Array<{{referenceable.hash_type}}>) { - if (hashes.length === 0) return html`No {{lower_case (plural referenceable.name)}} found{{#if (eq collection_type.type "ByAuthor")}} for this author{{/if}}.`; - - return html` + if (!hashes.length) return html`
No {{lower_case (plural referenceable.name)}} found{{#if (eq collection_type.type "ByAuthor")}} for this author{{/if}}.
`; -
- ${hashes.map(hash => - html`<{{kebab_case referenceable.name}}-detail .{{camel_case referenceable.name}}Hash=${hash} style="margin-bottom: 16px;" @{{kebab_case referenceable.name}}-deleted=${() => { this._fetch{{pascal_case (plural referenceable.name)}}.run(); this.signaledHashes = []; } }>` - )} + return html` +
+ ${hashes.map(hash => html` + <{{kebab_case referenceable.name}}-detail + .{{camel_case referenceable.name}}Hash=${hash} + @{{kebab_case referenceable.name}}-deleted=${() => { this._fetch{{pascal_case (plural referenceable.name)}}.run(); this.signaledHashes = []; } } + > + `)}
`; } render() { return this._fetch{{pascal_case (plural referenceable.name)}}.render({ - pending: () => html`
- -
`, + pending: () => html``, complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]), - error: (e: any) => html`Error fetching the {{lower_case (plural referenceable.name)}}: ${e.message}.` + error: (e: any) => html`
Error fetching the {{lower_case (plural referenceable.name)}}: ${e.message}.
` }); } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs b/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs index e1b810614..04f613ed8 100644 --- a/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs +++ b/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs @@ -1,3 +1,2 @@ import { CallableCell } from '@holochain/tryorama'; import { NewEntryAction, ActionHash, Record, AppBundleSource, fakeActionHash, fakeAgentPubKey, fakeEntryHash, fakeDnaHash } from '@holochain/client'; - diff --git a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs index 6009ec1a2..404534844 100644 --- a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs +++ b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs @@ -50,4 +50,3 @@ export async function create{{pascal_case entry_type.name}}(cell: CallableCell, payload: {{camel_case entry_type.name}} || await sample{{pascal_case entry_type.name}}(cell), }); } - diff --git a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs index d9e4500d0..28b4d67d9 100644 --- a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs +++ b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs @@ -1,7 +1,19 @@ import { assert, test } from "vitest"; import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama'; -import { Link, NewEntryAction, ActionHash, Record, AppBundleSource, fakeDnaHash, fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client'; +import { + NewEntryAction, + ActionHash, + Record, + Link, + CreateLink, + DeleteLink, + SignedActionHashed, + AppBundleSource, + fakeActionHash, + fakeAgentPubKey, + fakeEntryHash +} from '@holochain/client'; import { decode } from '@msgpack/msgpack'; import { create{{pascal_case entry_type.name}}, sample{{pascal_case entry_type.name}} } from './common.js'; @@ -12,7 +24,7 @@ test('create {{pascal_case entry_type.name}}', async () => { // This assumes app bundle created by the `hc app pack` command. const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ'; - // Set up the app to be installed + // Set up the app to be installed const appSource = { appBundleSource: { path: testAppPath } }; // Add 2 players with the test app to the Scenario. The returned players @@ -35,7 +47,7 @@ test('create and read {{pascal_case entry_type.name}}', async () => { // This assumes app bundle created by the `hc app pack` command. const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ'; - // Set up the app to be installed + // Set up the app to be installed const appSource = { appBundleSource: { path: testAppPath } }; // Add 2 players with the test app to the Scenario. The returned players @@ -87,7 +99,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => { // This assumes app bundle created by the `hc app pack` command. const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ'; - // Set up the app to be installed + // Set up the app to be installed const appSource = { appBundleSource: { path: testAppPath } }; // Add 2 players with the test app to the Scenario. The returned players @@ -101,9 +113,9 @@ test('create and update {{pascal_case entry_type.name}}', async () => { // Alice creates a {{pascal_case entry_type.name}} const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0]); assert.ok(record); - + const originalActionHash = record.signed_action.hashed.hash; - + // Alice updates the {{pascal_case entry_type.name}} let contentUpdate: any = await sample{{pascal_case entry_type.name}}(alice.cells[0]); let updateInput = { @@ -123,7 +135,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => { // Wait for the updated entry to be propagated to the other node. await dhtSync([alice, bob], alice.cells[0].cell_id[0]); - + // Bob gets the updated {{pascal_case entry_type.name}} const readUpdatedOutput0: Record = await bob.cells[0].callZome({ zome_name: "{{coordinator_zome_manifest.name}}", @@ -134,7 +146,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => { // Alice updates the {{pascal_case entry_type.name}} again contentUpdate = await sample{{pascal_case entry_type.name}}(alice.cells[0]); - updateInput = { + updateInput = { {{#if link_from_original_to_each_update}} original_{{snake_case entry_type.name}}_hash: originalActionHash, {{/if}} @@ -151,7 +163,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => { // Wait for the updated entry to be propagated to the other node. await dhtSync([alice, bob], alice.cells[0].cell_id[0]); - + // Bob gets the updated {{pascal_case entry_type.name}} const readUpdatedOutput1: Record = await bob.cells[0].callZome({ zome_name: "{{coordinator_zome_manifest.name}}", @@ -179,7 +191,7 @@ test('create and delete {{pascal_case entry_type.name}}', async () => { // This assumes app bundle created by the `hc app pack` command. const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ'; - // Set up the app to be installed + // Set up the app to be installed const appSource = { appBundleSource: { path: testAppPath } }; // Add 2 players with the test app to the Scenario. The returned players @@ -223,17 +235,17 @@ test('create and delete {{pascal_case entry_type.name}}', async () => { // Wait for the entry deletion to be propagated to the other node. await dhtSync([alice, bob], alice.cells[0].cell_id[0]); - + // Bob gets the oldest delete for the {{pascal_case entry_type.name}} - const oldestDeleteFor{{pascal_case entry_type.name}} = await bob.cells[0].callZome({ + const oldestDeleteFor{{pascal_case entry_type.name}}: SignedActionHashed = await bob.cells[0].callZome({ zome_name: "{{coordinator_zome_manifest.name}}", fn_name: "get_oldest_delete_for_{{snake_case entry_type.name}}", payload: record.signed_action.hashed.hash, }); assert.ok(oldestDeleteFor{{pascal_case entry_type.name}}); - - // Bob gets the deletions for {{pascal_case entry_type.name}} - const deletesFor{{pascal_case entry_type.name}} = await bob.cells[0].callZome({ + + // Bob gets the deletions for the {{pascal_case entry_type.name}} + const deletesFor{{pascal_case entry_type.name}}: SignedActionHashed[] = await bob.cells[0].callZome({ zome_name: "{{coordinator_zome_manifest.name}}", fn_name: "get_all_deletes_for_{{snake_case entry_type.name}}", payload: record.signed_action.hashed.hash, @@ -251,8 +263,8 @@ test('create and delete {{pascal_case entry_type.name}}', async () => { }); assert.equal(linksTo{{pascal_case (plural linked_from.name)}}.length, 0); - // Bob gets the deleted {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}} - const deletedLinksTo{{pascal_case (plural linked_from.name)}} = await bob.cells[0].callZome({ + // Bob gets the deleted {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}} + const deletedLinksTo{{pascal_case (plural linked_from.name)}}: Array<[SignedActionHashed, SignedActionHashed[]]> = await bob.cells[0].callZome({ zome_name: "{{../coordinator_zome_manifest.name}}", fn_name: "get_deleted_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}", payload: {{#if (eq cardinality "vector")}}sample.{{field_name}}[0]{{else}}sample.{{field_name}}{{/if}} diff --git a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs index 03da7a895..36cfdf8fe 100644 --- a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs +++ b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs @@ -1,10 +1,7 @@ import { LitElement, html } from 'lit'; import { state, customElement, property } from 'lit/decorators.js'; -import { InstalledCell, ActionHash, Record, AgentPubKey, EntryHash, AppClient, DnaHash } from '@holochain/client'; +import { InstalledCell, ActionHash, Record, AgentPubKey, EntryHash, AppClient, DnaHash, HolochainError } from '@holochain/client'; import { consume } from '@lit-labs/context'; -import '@material/mwc-button'; -import '@material/mwc-snackbar'; -import { Snackbar } from '@material/mwc-snackbar'; {{#uniq_lines}} {{#each entry_type.fields}} {{#if widget}} @@ -14,6 +11,7 @@ import { Snackbar } from '@material/mwc-snackbar'; {{/each}} {{/uniq_lines}} +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types'; @@ -53,7 +51,7 @@ export class Create{{pascal_case entry_type.name}} extends LitElement { {{/if}} {{/if}} {{/each}} - + firstUpdated() { {{#each entry_type.fields}} {{#if (not widget) }} @@ -71,7 +69,7 @@ export class Create{{pascal_case entry_type.name}} extends LitElement { } async create{{pascal_case entry_type.name}}() { - const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { + const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { {{#each entry_type.fields}} {{#if widget}} {{snake_case field_name}}: this._{{camel_case field_name}}, @@ -97,41 +95,37 @@ export class Create{{pascal_case entry_type.name}} extends LitElement { {{camel_case entry_type.name}}Hash: record.signed_action.hashed.hash } })); - } catch (e: any) { - const errorSnackbar = this.shadowRoot?.getElementById('create-error') as Snackbar; - errorSnackbar.labelText = `Error creating the {{lower_case entry_type.name}}: ${e.message}`; - errorSnackbar.show(); + } catch (e) { + alert((e as HolochainError).message); } } render() { return html` - - - -
- Create {{title_case entry_type.name}} - +
+

Create {{pascal_case entry_type.name}}

{{#each entry_type.fields}} {{#if widget}} -
+
{{#if (not (eq cardinality "vector") )}} - {{> (concat field_type.type "/" widget "/edit/render") label=(title_case field_name) variable_to_read=(concat "this._" (camel_case field_name) ) variable_to_change=(concat "this._" (camel_case field_name) ) required=(eq cardinality "single") }} + {{> (concat field_type.type "/" widget "/edit/render") label=(title_case field_name) variable_to_read=(concat "this._" (camel_case field_name) ) variable_to_change=(concat "this._" (camel_case field_name) ) required=(eq cardinality "single") }} {{else}} - {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }} + {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }} {{/if}} - -
- + +
{{/if}} {{/each}} - this.create{{pascal_case entry_type.name}}()} - > -
`; + > + Create {{title_case entry_type.name}} + +
+ `; } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" index 2b2ae89c2..ee41415cf 100644 --- "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" +++ "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" @@ -4,7 +4,10 @@ import { InstalledCell, Record, Link, AppClient, EntryHash, ActionHash, AgentPub import { consume } from '@lit-labs/context'; import { Task } from '@lit-labs/task'; +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; +import { {{pascal_case ../coordinator_zome_manifest.name}}Signal } from './types'; + import './{{kebab_case ../entry_type.name}}-detail'; @customElement('{{kebab_case (plural ../entry_type.name)}}-for-{{kebab_case linked_from.name}}') @@ -13,11 +16,14 @@ export class {{pascal_case (plural ../entry_type.name)}}For{{pascal_case linked_ client!: AppClient; @property({ - hasChanged: (newVal: {{linked_from.hash_type}}, oldVal: {{linked_from.hash_type}}) => newVal.toString() !== oldVal.toString() + hasChanged: (newVal: {{linked_from.hash_type}}, oldVal: {{linked_from.hash_type}}) => newVal.toString() !== oldVal?.toString() }) {{camel_case linked_from.singular_arg}}!: {{linked_from.hash_type}}; - _fetch{{pascal_case (plural ../entry_type.name)}} = new Task(this, ([{{camel_case linked_from.singular_arg}}]) => this.client.callZome({ + @state() + hashes: Array = []; + + _fetch{{pascal_case (plural ../entry_type.name)}} = new Task(this, ([{{camel_case linked_from.singular_arg}}]: Array<{{linked_from.hash_type}}>) => this.client.callZome({ cap_secret: null, role_name: '{{../dna_role_name}}', zome_name: '{{../coordinator_zome_manifest.name}}', @@ -26,30 +32,33 @@ export class {{pascal_case (plural ../entry_type.name)}}For{{pascal_case linked_ }) as Promise>, () => [this.{{camel_case linked_from.singular_arg}}]); firstUpdated() { - if (this.{{camel_case linked_from.singular_arg}} === undefined) { + if (!this.{{camel_case linked_from.singular_arg}}) { throw new Error(`The {{camel_case linked_from.singular_arg}} property is required for the {{kebab_case (plural ../entry_type.name)}}-for-{{kebab_case linked_from.name}} element`); } } - renderList(links: Array) { - if (links.length === 0) return html`No {{lower_case (plural ../entry_type.name)}} found for this {{lower_case linked_from.name}}.`; + renderList(hashes: Array) { + if (!hashes.length) return html`
No {{lower_case (plural ../entry_type.name)}} found for this {{lower_case linked_from.name}}.
`; return html` -
- ${links.map(link => - html`<{{kebab_case ../entry_type.name}}-detail .{{camel_case ../entry_type.name}}Hash=${link.target}>` - )} +
+ ${hashes.map(hash => html` + <{{kebab_case ../entry_type.name}}-detail + .{{camel_case ../entry_type.name}}Hash=${hash} + @{{kebab_case ../entry_type.name}}-deleted=${() => { this._fetch{{pascal_case (plural ../entry_type.name)}}.run(); this.hashes = []; } } + > + `)}
`; } render() { return this._fetch{{pascal_case (plural ../entry_type.name)}}.render({ - pending: () => html`
- -
`, - complete: (links) => this.renderList(links), - error: (e: any) => html`Error fetching {{lower_case (plural ../entry_type.name)}}: ${e.message}.` + pending: () => html``, + complete: (links) => this.renderList([...this.hashes, ...links.map(l => l.target)]), + error: (e: any) => html`
Error fetching {{lower_case (plural ../entry_type.name)}}: ${e.message}.
` }); } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" index 3c1859aac..a4a1a7b01 100644 --- "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" +++ "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" @@ -1,11 +1,8 @@ import { LitElement, html } from 'lit'; import { state, customElement, property } from 'lit/decorators.js'; -import { ActionHash, EntryHash, AgentPubKey, Record, AppClient, DnaHash } from '@holochain/client'; +import { ActionHash, EntryHash, AgentPubKey, Record, AppClient, DnaHash, HolochainError } from '@holochain/client'; import { consume } from '@lit-labs/context'; import { decode } from '@msgpack/msgpack'; -import '@material/mwc-button'; -import '@material/mwc-snackbar'; -import { Snackbar } from '@material/mwc-snackbar'; {{#uniq_lines}} {{#each entry_type.fields}} {{#if widget}} @@ -15,6 +12,7 @@ import { Snackbar } from '@material/mwc-snackbar'; {{/each}} {{/uniq_lines}} +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types'; @@ -23,7 +21,7 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { @consume({ context: clientContext }) client!: AppClient; - + {{#if link_from_original_to_each_update}} @property({ hasChanged: (newVal: ActionHash, oldVal: ActionHash) => newVal?.toString() !== oldVal?.toString() @@ -31,14 +29,14 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { original{{pascal_case entry_type.name}}Hash!: ActionHash; {{/if}} - + @property() currentRecord!: Record; - + get current{{pascal_case entry_type.name}}() { return decode((this.currentRecord.entry as any).Present.entry) as {{pascal_case entry_type.name}}; } - + {{#each entry_type.fields}} {{#if widget }} {{#if (not (eq cardinality "vector" ) )}} @@ -56,19 +54,19 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { is{{pascal_case entry_type.name}}Valid() { return true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(concat "this._" (camel_case field_name)) }}{{/if}}{{#if (eq cardinality "vector")}} && this._{{camel_case field_name}}.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}}; } - + connectedCallback() { super.connectedCallback(); - if (this.currentRecord === undefined) { + if (!this.currentRecord) { throw new Error(`The currentRecord property is required for the edit-{{kebab_case entry_type.name}} element`); } {{#if link_from_original_to_each_update}} - if (this.original{{pascal_case entry_type.name}}Hash === undefined) { + if (!this.original{{pascal_case entry_type.name}}Hash) { throw new Error(`The original{{pascal_case entry_type.name}}Hash property is required for the edit-{{kebab_case entry_type.name}} element`); } {{/if}} - + {{#each entry_type.fields}} {{#if widget}} this._{{camel_case field_name}} = this.current{{pascal_case ../entry_type.name}}.{{snake_case field_name}}; @@ -77,7 +75,7 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { } async update{{pascal_case entry_type.name}}() { - const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { + const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { {{#each entry_type.fields}} {{#if widget}} {{#if (eq cardinality "single") }} @@ -108,7 +106,7 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { updated_{{snake_case entry_type.name}}: {{camel_case entry_type.name}} }, }); - + this.dispatchEvent(new CustomEvent('{{kebab_case entry_type.name}}-updated', { composed: true, bubbles: true, @@ -120,53 +118,43 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement { updated{{pascal_case entry_type.name}}Hash: updateRecord.signed_action.hashed.hash } })); - } catch (e: any) { - const errorSnackbar = this.shadowRoot?.getElementById('update-error') as Snackbar; - errorSnackbar.labelText = `Error updating the {{lower_case entry_type.name}}: ${e.message}`; - errorSnackbar.show(); + } catch (e) { + alert((e as HolochainError).message); } } render() { return html` - - - -
- Edit {{title_case entry_type.name}} +
{{#each entry_type.fields}} {{#if widget}} -
+
{{#if (not (eq cardinality "vector") )}} {{> (concat field_type.type "/" widget "/edit/render") label=(title_case field_name) variable_to_read=(concat "this._" (camel_case field_name) ) variable_to_change=(concat "this._" (camel_case field_name) ) required=(eq cardinality "single") }} {{else}} {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }} {{/if}} - -
+ +
{{/if}} {{/each}} - -
- this.dispatchEvent(new CustomEvent('edit-canceled', { +
+ +
-
`; +
+ `; } + + static styles = sharedStyles; } diff --git a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs index 4889e0111..d7eedc360 100644 --- a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs +++ b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs @@ -1,12 +1,9 @@ import { LitElement, html } from 'lit'; import { state, customElement, property } from 'lit/decorators.js'; -import { EntryHash, Record, ActionHash, AppClient, DnaHash } from '@holochain/client'; +import { EntryHash, Record, ActionHash, AppClient, DnaHash, HolochainError } from '@holochain/client'; import { consume } from '@lit-labs/context'; import { Task } from '@lit-labs/task'; import { decode } from '@msgpack/msgpack'; -import '@material/mwc-icon-button'; -import '@material/mwc-snackbar'; -import { Snackbar } from '@material/mwc-snackbar'; {{#uniq_lines}} {{#each entry_type.fields}} {{#if widget}} @@ -20,6 +17,7 @@ import { Snackbar } from '@material/mwc-snackbar'; import './edit-{{kebab_case entry_type.name}}'; {{/if}} +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types'; @@ -33,7 +31,7 @@ export class {{pascal_case entry_type.name}}Detail extends LitElement { }) {{camel_case entry_type.name}}Hash!: {{#if entry_type.reference_entry_hash}}EntryHash{{else}}ActionHash{{/if}}; - _fetchRecord = new Task(this, ([{{camel_case entry_type.name}}Hash]) => this.client.callZome({ + _fetchRecord = new Task(this, ([{{camel_case entry_type.name}}Hash]: Array<{{#if entry_type.reference_entry_hash}}EntryHash{{else}}ActionHash{{/if}}>) => this.client.callZome({ cap_secret: null, role_name: '{{dna_role_name}}', zome_name: '{{coordinator_zome_manifest.name}}', @@ -42,12 +40,11 @@ export class {{pascal_case entry_type.name}}Detail extends LitElement { }) as Promise, () => [this.{{camel_case entry_type.name}}Hash]); {{#if crud.update}} - @state() - _editing = false; + @state() _editing = false; {{/if}} firstUpdated() { - if (this.{{camel_case entry_type.name}}Hash === undefined) { + if (!this.{{camel_case entry_type.name}}Hash) { throw new Error(`The {{camel_case entry_type.name}}Hash property is required for the {{kebab_case entry_type.name}}-detail element`); } } @@ -70,10 +67,8 @@ export class {{pascal_case entry_type.name}}Detail extends LitElement { } })); this._fetchRecord.run(); - } catch (e: any) { - const errorSnackbar = this.shadowRoot?.getElementById('delete-error') as Snackbar; - errorSnackbar.labelText = `Error deleting the {{lower_case entry_type.name}}: ${e.message}`; - errorSnackbar.show(); + } catch (e) { + alert((e as HolochainError).message) } } {{/if}} @@ -81,70 +76,62 @@ export class {{pascal_case entry_type.name}}Detail extends LitElement { renderDetail(record: Record) { const {{camel_case entry_type.name}} = decode((record.entry as any).Present.entry) as {{pascal_case entry_type.name}}; - return html`{{#if crud.delete}} - - - {{/if}} - -
-
- - - {{#if crud.update}} - { this._editing = true; } }> - {{/if}} - {{#if crud.delete}} - this.delete{{pascal_case entry_type.name}}()}> - {{/if}} -
- + return html` +
{{#each entry_type.fields}} {{#if widget}} {{#if (not (eq cardinality "vector") )}} -
- {{title_case field_name}}: - {{> (concat field_type.type "/" widget "/detail/render") variable_to_read=(concat (camel_case ../entry_type.name) "." (snake_case field_name) ) }} +
+ {{title_case field_name}}: + {{> (concat field_type.type "/" widget "/detail/render") variable_to_read=(concat (camel_case ../entry_type.name) "." (snake_case field_name) ) }}
{{else}} {{> Vec/detail/render variable_to_read=(concat (camel_case ../entry_type.name) "." (snake_case field_name) ) field_name=field_name field_type=field_type widget=widget }} {{/if}} - {{/if}} {{/each}} -
+ +
+{{#if crud.update}} + +{{/if}} +{{#if crud.delete}} + +{{/if}} +
+
`; } render{{pascal_case entry_type.name}}(record: Record | undefined) { - if (!record) return html`The requested {{lower_case entry_type.name}} was not found.`; - + if (!record) return html`
The requested {{lower_case entry_type.name}} was not found.
`; {{#if crud.update}} if (this._editing) { - return html` { - this._editing = false; - await this._fetchRecord.run(); - } } - @edit-canceled=${() => { this._editing = false; } } - style="display: flex; flex: 1;" - >`; + return html` + { + this._editing = false; + await this._fetchRecord.run(); + } } + @edit-canceled=${() => { this._editing = false; } } + > + `; } - {{/if}} return this.renderDetail(record); } render() { return this._fetchRecord.render({ - pending: () => html`
- -
`, + pending: () => html``, complete: (record) => this.render{{pascal_case entry_type.name}}(record), - error: (e: any) => html`Error fetching the {{lower_case entry_type.name}}: ${e.message}` + error: (e: any) => html`
Error fetching the {{lower_case entry_type.name}}: ${e.message}
` }); } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/example.instructions.hbs b/templates/custom-template/custom-template/template/example.instructions.hbs index 3ac12f06d..cfdf10efd 100644 --- a/templates/custom-template/custom-template/template/example.instructions.hbs +++ b/templates/custom-template/custom-template/template/example.instructions.hbs @@ -1,6 +1,10 @@ Run the example app with: cd {{example}} - nix develop - npm install - npm start + nix develop + {{(package_manager_command package_manager "install" null)}} + {{(package_manager_command package_manager "start" null)}} + +Generated ui code might also need to be reformatted: + + {{(package_manager_command package_manager "format" "ui")}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs b/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs index fb9c9c9b4..58eee306c 100644 --- a/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs +++ b/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs @@ -1,75 +1,43 @@ -import { LitElement, css, html } from 'lit'; +import { LitElement, html, css, unsafeCSS } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { AppClient, AppWebsocket } from '@holochain/client'; import { provide } from '@lit-labs/context'; +import sharedStyles from './index.css'; import { clientContext } from './contexts'; import './forum/posts/all-posts'; -import { AllPosts } from './forum/posts/all-posts'; import './forum/posts/create-post'; @customElement('holochain-app') export class HolochainApp extends LitElement { - @state() loading = true; - - @state() result: string | undefined; + @state() loading = false; @provide({ context: clientContext }) @property({ type: Object }) client!: AppClient; async firstUpdated() { - this.client = await AppWebsocket.connect(); - - this.loading = false; + this.loading = true; + try { + this.client = await AppWebsocket.connect(); + } catch(e) { + console.error(e) + } finally { + this.loading = false; + } } render() { - if (this.loading) - return html` - - `; - + if (this.loading) return html``; return html` -
-

Forum

- -
-

All Posts

- - -
-
+
+

Welcome to the Forum hApp

+ + +
`; } - static styles = css` - :host { - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: flex-start; - font-size: calc(10px + 2vmin); - color: #1a2b42; - max-width: 960px; - margin: 0 auto; - text-align: center; - background-color: var(--lit-element-background-color); - } - - main { - flex-grow: 1; - } - - .app-footer { - font-size: calc(12px + 0.5vmin); - align-items: center; - } - - .app-footer a { - margin-left: 5px; - } - `; -} + static styles = css`${unsafeCSS(sharedStyles)}`; +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs index 62bb9db14..3d318bd7c 100644 --- a/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs @@ -1 +1 @@ -(await fakeActionHash()) +(await fakeActionHash()) \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs b/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs index a00d2d429..339425a42 100644 --- a/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs @@ -1 +1 @@ -ActionHash +ActionHash \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs b/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs index 98a2ed787..2ad640d28 100644 --- a/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs @@ -1 +1 @@ -(await fakeAgentPubKey()) +(await fakeAgentPubKey()) \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs b/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs index f25075ccb..fe408746c 100644 --- a/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs @@ -1 +1 @@ -AgentPubKey +AgentPubKey \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs index 9369d2e2b..19e7efd04 100644 --- a/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs @@ -1 +1 @@ -(await fakeDnaHash()) +(await fakeDnaHash()) \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs b/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs index c0e9d7168..3551c1f2c 100644 --- a/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs @@ -1 +1 @@ -DnaHash +DnaHash \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs index 5f7895b86..f1f27ff28 100644 --- a/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs @@ -1 +1 @@ -(await fakeEntryHash()) +(await fakeEntryHash()) \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs b/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs index b97d6b80e..9a4e496c5 100644 --- a/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs @@ -1 +1 @@ -EntryHash +EntryHash \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs index bfaf687c2..2bdebc1aa 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs @@ -1 +1 @@ -${ {{#each field_type.variants}}{{#unless @last}} {{../variable_to_read}}.type === '{{pascal_case this}}' ?{{/unless}} `{{title_case this}}`{{#unless @last}} :{{/unless}} {{/each}} } +${ {{#each field_type.variants}}{{#unless @last}} {{../variable_to_read}}.type === '{{pascal_case this}}' ?{{/unless}} `{{title_case this}}`{{#unless @last}} :{{/unless}} {{/each}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs deleted file mode 100644 index 171161339..000000000 --- a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-select'; diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs index c1f8d52f4..81534064b 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs @@ -1,5 +1,8 @@ - + + \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs index 560b9ff7e..214893c2e 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs @@ -1 +1 @@ -{ type: '{{lookup field_type.variants 0}}' } +{ type: '{{lookup field_type.variants 0}}' } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs index 27ba77dda..f32a5804e 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs @@ -1 +1 @@ -true +true \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/default.hbs b/templates/custom-template/custom-template/template/field-types/Enum/default.hbs new file mode 100644 index 000000000..214893c2e --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/Enum/default.hbs @@ -0,0 +1 @@ +{ type: '{{lookup field_type.variants 0}}' } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs b/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs index 560b9ff7e..214893c2e 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs @@ -1 +1 @@ -{ type: '{{lookup field_type.variants 0}}' } +{ type: '{{lookup field_type.variants 0}}' } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Enum/type.hbs b/templates/custom-template/custom-template/template/field-types/Enum/type.hbs index e9b80fff9..798c93ded 100644 --- a/templates/custom-template/custom-template/template/field-types/Enum/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/Enum/type.hbs @@ -1 +1 @@ -{{pascal_case field_type.label}} +{{pascal_case field_type.label}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs index 433f42b69..b82c4a0a1 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} } +${ {{variable_to_read}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs deleted file mode 100644 index 01d0786c1..000000000 --- a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-textarea'; diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs index cd25d12f4..5823114e1 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs @@ -1 +1,11 @@ - { {{variable_to_change}} = (e.target as any).value;} } {{#if required}}required{{/if}}> + + \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs index a614936fa..942309095 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs @@ -1 +1 @@ -'' +'' \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs index a9e6c9814..e3891233e 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs @@ -1 +1 @@ -{{variable_to_validate}} !== '' +{{variable_to_validate}} !== '' \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs index 433f42b69..b82c4a0a1 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} } +${ {{variable_to_read}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs deleted file mode 100644 index 0572528d4..000000000 --- a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-textfield'; diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs index 38869aa15..5311bf73b 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs @@ -1 +1,11 @@ - { {{variable_to_change}} = (e.target as any).value; } } {{#if required}}required{{/if}}> + + { {{variable_to_change}} = (e.target as any).value; } } + {{#if required}} + required + {{/if}} +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs index a614936fa..942309095 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs @@ -1 +1 @@ -'' +'' \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs index a9e6c9814..e3891233e 100644 --- a/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs @@ -1 +1 @@ -{{variable_to_validate}} !== '' +{{variable_to_validate}} !== '' \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/default.hbs b/templates/custom-template/custom-template/template/field-types/String/default.hbs new file mode 100644 index 000000000..5de6da439 --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/String/default.hbs @@ -0,0 +1 @@ +{{#if (eq cardinality "vector")}}[]{{else}}""{{/if}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/sample.hbs b/templates/custom-template/custom-template/template/field-types/String/sample.hbs index 56b4c51a6..f128f21fd 100644 --- a/templates/custom-template/custom-template/template/field-types/String/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/sample.hbs @@ -1 +1 @@ -"Lorem ipsum dolor sit amet, consectetur adipiscing elit." +"Lorem ipsum dolor sit amet, consectetur adipiscing elit." \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/String/type.hbs b/templates/custom-template/custom-template/template/field-types/String/type.hbs index ee8a39c38..ec186f1f3 100644 --- a/templates/custom-template/custom-template/template/field-types/String/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/String/type.hbs @@ -1 +1 @@ -string +string \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs index 537195405..322138be4 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs @@ -1 +1 @@ -${new Date({{variable_to_read}} / 1000).toLocaleString() } +${new Date({{variable_to_read}} / 1000).toLocaleString() } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs deleted file mode 100644 index f8705a0ed..000000000 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@vaadin/date-time-picker/theme/material/vaadin-date-time-picker.js'; diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs index 6197e2383..97e59e87e 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs @@ -1 +1,12 @@ - { {{variable_to_change}} = new Date((e.target as any).value).valueOf() * 1000;} } {{#if required}}required{{/if}}> \ No newline at end of file + + { {{variable_to_change}} = Math.floor(new Date(e.target.value).getTime() / 1000); } } + {{#if required}} + required + {{/if}} +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs index 56bfef5d4..e32bcd5fd 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs @@ -1 +1 @@ -Date.now() +Date.now() \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs index 27ba77dda..f32a5804e 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs @@ -1 +1 @@ -true +true \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/default.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/default.hbs new file mode 100644 index 000000000..1b4b0c67a --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/default.hbs @@ -0,0 +1 @@ +Date.now() * 1000 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs index ed20776b5..e82254249 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs @@ -1 +1 @@ -1674053334548000 +1674053334548000 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs index b67e17aeb..0dfad6f42 100644 --- a/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs @@ -1 +1 @@ -number +number \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Vec/default.hbs b/templates/custom-template/custom-template/template/field-types/Vec/default.hbs new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/Vec/default.hbs @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs deleted file mode 100644 index 6b1b24b2b..000000000 --- a/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs +++ /dev/null @@ -1,4 +0,0 @@ -
- {{title_case field_name}} - ${ {{variable_to_read}}.map(el => html`{{> (concat field_type.type "/" widget "/detail/render") variable_to_read="el"}}`)} -
diff --git a/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs deleted file mode 100644 index 96ec1f455..000000000 --- a/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs +++ /dev/null @@ -1,6 +0,0 @@ -
this.requestUpdate()} @change=${() => this.requestUpdate()}> - {{title_case field_name}} - - ${this._{{camel_case field_name}}.map((el, i) => html`{{> (concat field_type.type "/" widget "/edit/render") label="" variable_to_read="el" variable_to_change=(concat "this._" (camel_case field_name) "[i]" ) }} }`)} - { this._{{camel_case field_name}} = [...this._{{camel_case field_name}}, {{> (concat field_type.type "/" widget "/initial-value") field_type=field_type}}]; } }> -
\ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Vec/sample.hbs b/templates/custom-template/custom-template/template/field-types/Vec/sample.hbs new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/Vec/sample.hbs @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/Vec/type.hbs b/templates/custom-template/custom-template/template/field-types/Vec/type.hbs index 1f1899cec..44a00abfa 100644 --- a/templates/custom-template/custom-template/template/field-types/Vec/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/Vec/type.hbs @@ -1 +1 @@ -Array<{{field_type.type}}> +Array<{{field_type.type}}> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs index 725742854..dda2fe9b1 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} ? 'Yes' : 'No' } +${ {{variable_to_read}} ? 'Yes' : 'No' } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs deleted file mode 100644 index a8312f198..000000000 --- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs +++ /dev/null @@ -1,2 +0,0 @@ -import '@material/mwc-checkbox'; -import '@material/mwc-formfield'; diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs index c1a1625fe..3fb668d2b 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs @@ -1,3 +1,7 @@ - - { {{variable_to_change}} = (e.target as any).checked;} }> - \ No newline at end of file + + { {{variable_to_change}} = (e.target as any).checked;} } +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs index 27ba77dda..02e4a84d6 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs @@ -1 +1 @@ -true +false \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs index 27ba77dda..f32a5804e 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs @@ -1 +1 @@ -true +true \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/default.hbs b/templates/custom-template/custom-template/template/field-types/bool/default.hbs new file mode 100644 index 000000000..51b676e7a --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/bool/default.hbs @@ -0,0 +1 @@ +{{#if (eq cardinality "vector")}}[]{{else}}false{{/if}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/sample.hbs b/templates/custom-template/custom-template/template/field-types/bool/sample.hbs index 27ba77dda..02e4a84d6 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/sample.hbs @@ -1 +1 @@ -true +false \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/bool/type.hbs b/templates/custom-template/custom-template/template/field-types/bool/type.hbs index 7b19ee8df..535368032 100644 --- a/templates/custom-template/custom-template/template/field-types/bool/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/bool/type.hbs @@ -1 +1 @@ -boolean +boolean \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs index 433f42b69..b82c4a0a1 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} } +${ {{variable_to_read}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs deleted file mode 100644 index 9c37e9323..000000000 --- a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-slider'; diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs index 364300128..99547a15a 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs @@ -1,5 +1,8 @@ -
- {{label}} - - { {{variable_to_change}} = e.detail.value; } }> -
+ + { {{variable_to_change}} = e.detail.value; } } +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs index ba66466c2..171538eb0 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs @@ -1 +1 @@ -0.0 +0.0 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs index 27ba77dda..f32a5804e 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs @@ -1 +1 @@ -true +true \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/default.hbs b/templates/custom-template/custom-template/template/field-types/f32/default.hbs new file mode 100644 index 000000000..0039c80a1 --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/f32/default.hbs @@ -0,0 +1 @@ +{{#if (eq cardinality "vector")}}[]{{else}}0.0{{/if}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/sample.hbs b/templates/custom-template/custom-template/template/field-types/f32/sample.hbs index 2eb3c4fe4..ea2303bc0 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/sample.hbs @@ -1 +1 @@ -0.5 +0.5 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/f32/type.hbs b/templates/custom-template/custom-template/template/field-types/f32/type.hbs index b67e17aeb..0dfad6f42 100644 --- a/templates/custom-template/custom-template/template/field-types/f32/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/f32/type.hbs @@ -1 +1 @@ -number +number \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs index 433f42b69..b82c4a0a1 100644 --- a/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} } +${ {{variable_to_read}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs deleted file mode 100644 index 9c37e9323..000000000 --- a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-slider'; diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs index 136a70331..7ba55ca89 100644 --- a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs @@ -1,5 +1,7 @@ -
- {{label}} - - { {{variable_to_change}} = e.detail.value; } } discrete> -
+ + { {{variable_to_change}} = e.detail.value; } } +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/i32/default.hbs b/templates/custom-template/custom-template/template/field-types/i32/default.hbs new file mode 100644 index 000000000..16b2eb52b --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/i32/default.hbs @@ -0,0 +1 @@ +{{#if (eq cardinality "vector")}}[]{{else}}0{{/if}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/i32/sample.hbs b/templates/custom-template/custom-template/template/field-types/i32/sample.hbs index 291670352..46b71d470 100644 --- a/templates/custom-template/custom-template/template/field-types/i32/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/i32/sample.hbs @@ -1 +1 @@ --10 +-10 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/i32/type.hbs b/templates/custom-template/custom-template/template/field-types/i32/type.hbs index b67e17aeb..0dfad6f42 100644 --- a/templates/custom-template/custom-template/template/field-types/i32/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/i32/type.hbs @@ -1 +1 @@ -number +number \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs index 433f42b69..b82c4a0a1 100644 --- a/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs @@ -1 +1 @@ -${ {{variable_to_read}} } +${ {{variable_to_read}} } \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs deleted file mode 100644 index 9c37e9323..000000000 --- a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs +++ /dev/null @@ -1 +0,0 @@ -import '@material/mwc-slider'; diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs index 136a70331..99547a15a 100644 --- a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs +++ b/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs @@ -1,5 +1,8 @@ -
- {{label}} - - { {{variable_to_change}} = e.detail.value; } } discrete> -
+ + { {{variable_to_change}} = e.detail.value; } } +> \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs index 573541ac9..c22708346 100644 --- a/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs +++ b/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs @@ -1 +1 @@ -0 +0 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/default.hbs b/templates/custom-template/custom-template/template/field-types/u32/default.hbs new file mode 100644 index 000000000..16b2eb52b --- /dev/null +++ b/templates/custom-template/custom-template/template/field-types/u32/default.hbs @@ -0,0 +1 @@ +{{#if (eq cardinality "vector")}}[]{{else}}0{{/if}} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/sample.hbs b/templates/custom-template/custom-template/template/field-types/u32/sample.hbs index f599e28b8..9a037142a 100644 --- a/templates/custom-template/custom-template/template/field-types/u32/sample.hbs +++ b/templates/custom-template/custom-template/template/field-types/u32/sample.hbs @@ -1 +1 @@ -10 +10 \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/field-types/u32/type.hbs b/templates/custom-template/custom-template/template/field-types/u32/type.hbs index b67e17aeb..0dfad6f42 100644 --- a/templates/custom-template/custom-template/template/field-types/u32/type.hbs +++ b/templates/custom-template/custom-template/template/field-types/u32/type.hbs @@ -1 +1 @@ -number +number \ No newline at end of file diff --git "a/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs" index 33d8388a6..4d8314202 100644 --- "a/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs" +++ "b/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs" @@ -1,7 +1,19 @@ import { assert, test } from "vitest"; import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama'; -import { NewEntryAction, ActionHash, Record, Link, SignedActionHashed, CreateLink, DeleteLink, AppBundleSource, fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client'; +import { + NewEntryAction, + ActionHash, + Record, + Link, + CreateLink, + DeleteLink, + SignedActionHashed, + AppBundleSource, + fakeActionHash, + fakeAgentPubKey, + fakeEntryHash +} from '@holochain/client'; import { decode } from '@msgpack/msgpack'; {{#if (ne from_referenceable.hash_type "AgentPubKey")}} diff --git "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" index a5e6d8d31..6fefc859c 100644 --- "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" +++ "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" @@ -3,6 +3,8 @@ import { state, property, customElement } from 'lit/decorators.js'; import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction } from '@holochain/client'; import { consume } from '@lit-labs/context'; import { Task } from '@lit-labs/task'; + +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; @@ -12,13 +14,13 @@ import './{{kebab_case from_referenceable.name}}-detail'; export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}} extends LitElement { @consume({ context: clientContext }) client!: AppClient; - + @property({ hasChanged: (newVal: {{to_referenceable.hash_type}}, oldVal: {{to_referenceable.hash_type}}) => newVal?.toString() !== oldVal?.toString() }) - {{camel_case to_referenceable.singular_arg}}!: {{to_referenceable.hash_type}}; + {{camel_case to_referenceable.singular_arg}}!: {{to_referenceable.hash_type}}; - _fetch{{pascal_case (plural from_referenceable.name)}} = new Task(this, ([{{camel_case to_referenceable.singular_arg}}]) => this.client.callZome({ + _fetch{{pascal_case (plural from_referenceable.name)}} = new Task(this, ([{{camel_case to_referenceable.singular_arg}}]: Array<{{to_referenceable.hash_type}}>) => this.client.callZome({ cap_secret: null, role_name: '{{dna_role_name}}', zome_name: '{{coordinator_zome_manifest.name}}', @@ -30,7 +32,7 @@ export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to signaledHashes: Array<{{from_referenceable.hash_type}}> = []; firstUpdated() { - if (this.{{camel_case to_referenceable.singular_arg}} === undefined) { + if (!this.{{camel_case to_referenceable.singular_arg}}) { throw new Error(`The {{camel_case to_referenceable.singular_arg}} property is required for the {{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}} element`); } @@ -45,11 +47,11 @@ export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to } renderList(hashes: Array<{{to_referenceable.hash_type}}>) { - if (hashes.length === 0) return html`No {{lower_case (plural from_referenceable.name)}} found for this {{lower_case to_referenceable.name}}`; - + if (!hashes.length) return html`
No {{lower_case (plural from_referenceable.name)}} found for this {{lower_case to_referenceable.name}}
`; + return html` -
- ${hashes.map(hash => +
+ ${hashes.map(hash => html`<{{kebab_case from_referenceable.name}}-detail .{{camel_case from_referenceable.name}}Hash=${hash} style="margin-bottom: 16px;">` )}
@@ -58,11 +60,11 @@ export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to render() { return this._fetch{{pascal_case (plural from_referenceable.name)}}.render({ - pending: () => html`
- -
`, + pending: () => html``, complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]), - error: (e: any) => html`Error fetching the {{lower_case (plural from_referenceable.name)}}: ${e.message}.` + error: (e: any) => html`
Error fetching the {{lower_case (plural from_referenceable.name)}}: ${e.message}.
` }); } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" index 4a9abf455..1c48b7faf 100644 --- "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" +++ "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" @@ -4,24 +4,26 @@ import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAc import { consume } from '@lit-labs/context'; import { Task } from '@lit-labs/task'; +import { sharedStyles } from '../../shared-styles'; import { clientContext } from '../../contexts'; -import './{{kebab_case to_referenceable.name}}-detail'; import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; +import './{{kebab_case to_referenceable.name}}-detail'; + @customElement('{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}') export class {{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}} extends LitElement { @consume({ context: clientContext }) client!: AppClient; - + @property({ hasChanged: (newVal: {{from_referenceable.hash_type}}, oldVal: {{from_referenceable.hash_type}}) => newVal?.toString() !== oldVal?.toString() }) - {{camel_case from_referenceable.singular_arg}}!: {{from_referenceable.hash_type}}; + {{camel_case from_referenceable.singular_arg}}!: {{from_referenceable.hash_type}}; @state() signaledHashes: Array<{{to_referenceable.hash_type}}> = []; - _fetch{{pascal_case (plural to_referenceable.name)}} = new Task(this, ([{{camel_case from_referenceable.singular_arg}}]) => this.client.callZome({ + _fetch{{pascal_case (plural to_referenceable.name)}} = new Task(this, ([{{camel_case from_referenceable.singular_arg}}]: Array<{{from_referenceable.hash_type}}>) => this.client.callZome({ cap_secret: null, role_name: '{{dna_role_name}}', zome_name: '{{coordinator_zome_manifest.name}}', @@ -30,7 +32,7 @@ export class {{pascal_case (plural to_referenceable.name)}}For{{pascal_case from }) as Promise>, () => [this.{{camel_case from_referenceable.singular_arg}}]); firstUpdated() { - if (this.{{camel_case from_referenceable.singular_arg}} === undefined) { + if (!this.{{camel_case from_referenceable.singular_arg}}) { throw new Error(`The {{camel_case from_referenceable.singular_arg}} property is required for the {{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}} element`); } @@ -45,11 +47,11 @@ export class {{pascal_case (plural to_referenceable.name)}}For{{pascal_case from } renderList(hashes: Array<{{to_referenceable.hash_type}}>) { - if (hashes.length === 0) return html`No {{lower_case (plural to_referenceable.name)}} found for this {{lower_case from_referenceable.name}}`; - + if (!hashes.length) return html`
No {{lower_case (plural to_referenceable.name)}} found for this {{lower_case from_referenceable.name}}
`; + return html` -
- ${hashes.map(hash => +
+ ${hashes.map(hash => html`<{{kebab_case to_referenceable.name}}-detail .{{camel_case to_referenceable.name}}Hash=${hash} style="margin-bottom: 16px;">` )}
@@ -58,11 +60,11 @@ export class {{pascal_case (plural to_referenceable.name)}}For{{pascal_case from render() { return this._fetch{{pascal_case (plural to_referenceable.name)}}.render({ - pending: () => html`
- -
`, + pending: () => html``, complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]), - error: (e: any) => html`Error fetching the {{lower_case (plural to_referenceable.name)}}: ${e.message}.` + error: (e: any) => html`
Error fetching the {{lower_case (plural to_referenceable.name)}}: ${e.message}.
` }); } -} + + static styles = sharedStyles; +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs b/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs index 5c88e3c50..08bccaa26 100644 --- a/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs +++ b/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs @@ -1,6 +1,6 @@ name: "test" on: - push: + push: branches: [ main ] pull_request: branches: [ main ] @@ -22,4 +22,4 @@ jobs: - name: Install and test run: | - nix develop --command bash -c "npm i && npm t" + nix develop --command bash -c "{{(package_manager_command package_manager "install" null)}} && {{(package_manager_command package_manager "test" null)}}" diff --git a/templates/custom-template/custom-template/template/web-app/README.md.hbs b/templates/custom-template/custom-template/template/web-app/README.md.hbs index 5274b8049..0164034bc 100644 --- a/templates/custom-template/custom-template/template/web-app/README.md.hbs +++ b/templates/custom-template/custom-template/template/web-app/README.md.hbs @@ -8,7 +8,7 @@ Enter the nix shell by running this in the root folder of the repository: ```bash nix develop -npm install +{{(package_manager_command package_manager "install" null)}} ``` **Run all the other instructions in this README from inside this nix shell, otherwise they won't work**. @@ -16,7 +16,7 @@ npm install ## Running 2 agents ```bash -npm start +{{(package_manager_command package_manager "start" null)}} ``` This will create a network of 2 nodes connected to each other and their respective UIs. @@ -25,7 +25,7 @@ It will also bring up the Holochain Playground for advanced introspection of the ## Running the backend tests ```bash -npm test +{{(package_manager_command package_manager "test" null)}} ``` ## Bootstrapping a network @@ -33,7 +33,7 @@ npm test Create a custom network of nodes connected to each other and their respective UIs with: ```bash -AGENTS=3 npm run network +AGENTS=3 {{(package_manager_command package_manager "network" null)}} ``` Substitute the "3" for the number of nodes that you want to bootstrap in your network. @@ -43,7 +43,7 @@ This will also bring up the Holochain Playground for advanced introspection of t To package the web happ: ``` bash -npm run package +{{(package_manager_command package_manager "package" null)}} ``` You'll have the `{{app_name}}.webhapp` in `workdir`. This is what you should distribute so that the Holochain Launcher can install it. diff --git a/templates/custom-template/custom-template/template/web-app/flake.nix.hbs b/templates/custom-template/custom-template/template/web-app/flake.nix.hbs deleted file mode 100644 index 155c7c0ff..000000000 --- a/templates/custom-template/custom-template/template/web-app/flake.nix.hbs +++ /dev/null @@ -1,17 +0,0 @@ -{{#merge previous_file_content}} - {{#match_scope "inputs = {"}} - {{previous_scope_content}} - - scaffolding.url = "github:"; - {{/match_scope}} - {{#match_scope "devShells.default = pkgs.mkShell {"}} - - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; - - packages = with pkgs; [ - nodejs_20 - ] ++ [ - inputs'.scaffolding.packages.hc-scaffold-custom-template - ]; - {{/match_scope}} -{{/merge}} diff --git a/templates/custom-template/custom-template/template/web-app/package.json.hbs b/templates/custom-template/custom-template/template/web-app/package.json.hbs index 8503102b0..19ec6e52f 100644 --- a/templates/custom-template/custom-template/template/web-app/package.json.hbs +++ b/templates/custom-template/custom-template/template/web-app/package.json.hbs @@ -6,33 +6,35 @@ "tests" ], "scripts": { - "start": "AGENTS=2 BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) npm run network", - "network": "hc sandbox clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:happ\" \"holochain-playground\"", - "test": "npm run build:zomes && hc app pack workdir --recursive && npm t -w tests", + "start": "AGENTS=${AGENTS:-2} BOOTSTRAP_PORT=$(get-port) SIGNAL_PORT=$(get-port) {{(package_manager_command package_manager "network" null)}}", + "network": "hc sandbox clean && {{(package_manager_command package_manager "build:happ" null)}} && UI_PORT=$(get-port) concurrently \"{{(package_manager_command package_manager "start" "ui")}}\" \"{{(package_manager_command package_manager "launch:happ" null)}}\" \"holochain-playground\"", + "test": "{{(package_manager_command package_manager "build:zomes" null)}} && hc app pack workdir --recursive && {{(package_manager_command package_manager "test" "tests")}}", "launch:happ": "hc-spin -n $AGENTS --ui-port $UI_PORT workdir/{{app_name}}.happ", - "start:tauri": "AGENTS=2 BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) npm run network:tauri", - "network:tauri": "hc sandbox clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:tauri\" \"holochain-playground\"", + "start:tauri": "AGENTS=${AGENTS:-2} BOOTSTRAP_PORT=$(get-port) SIGNAL_PORT=$(get-port) {{(package_manager_command package_manager "network:tauri" null)}}", + "network:tauri": "hc sandbox clean && {{(package_manager_command package_manager "build:happ" null)}} && UI_PORT=$(get-port) concurrently \"{{(package_manager_command package_manager "start" "ui")}}\" \"{{(package_manager_command package_manager "launch:tauri" null)}}\" \"holochain-playground\"", "launch:tauri": "concurrently \"hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT\" \"echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/{{app_name}}.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:\"$BOOTSTRAP_PORT\" webrtc ws://127.0.0.1:\"$SIGNAL_PORT\"\"", {{#if holo_enabled}} - "start:holo": "AGENTS=2 npm run network:holo", - "network:holo": "npm run build:happ && UI_PORT=8888 concurrently \"npm run launch:holo-dev-server\" \"holochain-playground ws://localhost:4444\" \"concurrently-repeat 'VITE_APP_CHAPERONE_URL=http://localhost:24274 VITE_APP_IS_HOLO=true npm start -w ui' $AGENTS\"", + "start:holo": "AGENTS=${AGENTS:-2} {{(package_manager_command package_manager "network:holo" null)}}", + "network:holo": "{{(package_manager_command package_manager "build:happ" null)}} && UI_PORT=$(get-port) concurrently \"{{(package_manager_command package_manager "launch:holo-dev-server" null)}}\" \"holochain-playground ws://localhost:4444\" \"concurrently-repeat 'VITE_APP_CHAPERONE_URL=http://localhost:24274 VITE_APP_IS_HOLO=true {{(package_manager_command package_manager "start" "ui")}}' $AGENTS\"", "launch:holo-dev-server": "holo-dev-server workdir/{{app_name}}.happ", {{/if}} - "package": "npm run build:happ && npm run package -w ui && hc web-app pack workdir --recursive", - "build:happ": "npm run build:zomes && hc app pack workdir --recursive", - "build:zomes": "RUSTFLAGS='' CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown" + {{#if (eq package_manager "pnpm")}} + "postinstall": "node ./node_modules/.pnpm/node_modules/electron/install.js", + {{/if}} + "package": "{{(package_manager_command package_manager "build:happ" null)}} && {{(package_manager_command package_manager "package" "ui")}} && hc web-app pack workdir --recursive", + "build:happ": "{{(package_manager_command package_manager "build:zomes" null)}} && hc app pack workdir --recursive", + "build:zomes": "cargo build --release --target wasm32-unknown-unknown" }, "devDependencies": { "@holochain-playground/cli": "{{holochain_playground_cli_version}}", "@holochain/hc-spin": "{{hc_spin_version}}", "concurrently": "^6.2.1", - "rimraf": "^5.0.7", {{#if holo_enabled}} "concurrently-repeat": "^0.0.1", {{/if}} - "new-port-cli": "^1.0.0" + "get-port-cli": "^3.0.0" }, "engines": { - "npm": ">=7.0.0" + "node": ">=16.0.0" } } diff --git a/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs b/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs index 8821314bc..59bce775a 100644 --- a/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs +++ b/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs @@ -1,5 +1,6 @@ { "name": "tests", + "version": "0.1.0", "private": true, "scripts": { "test": "vitest run" diff --git a/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs b/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs index 7737dbd2a..ed926ca6b 100644 --- a/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs +++ b/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs @@ -6,4 +6,3 @@ export default defineConfig({ testTimeout: 60*1000*3 // 3 mins }, }) - diff --git a/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs b/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs index dc24b0de7..f38b7af12 100644 --- a/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs +++ b/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs @@ -8,30 +8,10 @@ /> - - - - {{title_case app_name}} - - diff --git a/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs b/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs index 4696d4658..61c0fcf8f 100644 --- a/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs +++ b/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs @@ -6,11 +6,11 @@ "build": "vite build", {{#if holo_enabled}} "build:holo": "VITE_APP_IS_HOLO=true vite build", - "package:holo": "npm run build:holo && rimraf dist.zip && cd dist && bestzip ../dist.zip *", + "package:holo": "{{(package_manager_command package_manager "build:holo" null)}} && rimraf dist.zip && cd dist && bestzip ../dist.zip *", {{/if}} "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore", "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore", - "package": "npm run build && rimraf dist.zip && cd dist && bestzip ../dist.zip *" + "package": "{{(package_manager_command package_manager "build" null)}} && rimraf dist.zip && cd dist && bestzip ../dist.zip *" }, "dependencies": { "@holochain/client": "{{holochain_client_version}}", @@ -19,18 +19,7 @@ {{/if}} "@lit-labs/context": "^0.2.0", "@lit-labs/task": "^2.0.0", - "@material/mwc-circular-progress": "^0.27.0", - "@material/mwc-button": "^0.27.0", - "@material/mwc-textfield": "^0.27.0", - "@material/mwc-textarea": "^0.27.0", - "@material/mwc-checkbox": "^0.27.0", - "@material/mwc-slider": "^0.27.0", - "@material/mwc-icon-button": "^0.27.0", - "@material/mwc-select": "^0.27.0", - "@material/mwc-snackbar": "^0.27.0", - "@material/mwc-formfield": "^0.27.0", "@msgpack/msgpack": "^2.8.0", - "@vaadin/date-time-picker": "^23.2.8", "lit": "^2.6.1" }, "devDependencies": { @@ -44,7 +33,8 @@ "rimraf": "^5.0.7", "vite": "^4.0.0", "vite-plugin-checker": "^0.5.3", - "typescript": "^4.5.5" + "typescript": "^4.5.5", + "tslib": "^2.6.3" }, "eslintConfig": { "parser": "@typescript-eslint/parser", @@ -60,7 +50,11 @@ "prefer-destructuring": "off", "no-useless-constructor": "off", "no-empty-function": "off", + "no-nested-ternary": "off", "no-empty-pattern": "off", + "no-console": "off", + "no-alert": "off", + "no-param-reassign": "off", "camelcase": "off", "import/no-duplicates": "off", "no-unused-vars": "off", diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/assets/holochainLogo.svg.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/assets/holochainLogo.svg.hbs new file mode 100644 index 000000000..d5b87c953 --- /dev/null +++ b/templates/custom-template/custom-template/template/web-app/ui/src/assets/holochainLogo.svg.hbs @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs index 1722ea941..e947aaaf0 100644 --- a/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs +++ b/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs @@ -1,5 +1,4 @@ import { createContext } from '@lit-labs/context'; import { AppClient } from '@holochain/client'; -export const clientContext = createContext('AppClient'); - +export const clientContext = createContext('AppClient'); \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/declarations.d.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/declarations.d.ts.hbs new file mode 100644 index 000000000..bf581f294 --- /dev/null +++ b/templates/custom-template/custom-template/template/web-app/ui/src/declarations.d.ts.hbs @@ -0,0 +1,9 @@ +declare module '*.svg' { + const content: string; + export default content; +} + +declare module '*.css' { + const content: string; + export default content; +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs index f49bf140e..59a6ffcba 100644 --- a/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs +++ b/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs @@ -1,19 +1,14 @@ -import { LitElement, css, html } from 'lit'; +import { LitElement, html, css } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { - AppWebsocket, - ActionHash, - AppClient, -} from '@holochain/client'; +import { AppWebsocket, ActionHash, AppClient, HolochainError } from '@holochain/client'; {{#if holo_enabled}} import WebSdk from '@holo-host/web-sdk' import type { AgentState } from '@holo-host/web-sdk'; {{/if}} import { provide } from '@lit-labs/context'; -{{#if holo_enabled}} -import '@material/mwc-button'; -{{/if}} +import { sharedStyles } from './shared-styles'; +import HolochainLogo from "./assets/holochainLogo.svg"; import { clientContext } from './contexts'; {{#if holo_enabled}} @@ -22,37 +17,50 @@ const IS_HOLO = ['true', '1', 't'].includes(import.meta.env.VITE_APP_IS_HOLO?.to @customElement('holochain-app') export class HolochainApp extends LitElement { - @state() loading = true; + @state() loading = false; + + @state() + error: HolochainError | undefined; @provide({ context: clientContext }) @property({ type: Object }) client!: AppClient; async firstUpdated() { - {{#if holo_enabled}} - if (IS_HOLO) { - const client = await WebSdk.connect({ - chaperoneUrl: import.meta.env.VITE_APP_CHAPERONE_URL, - authFormCustomization: { - appName: '{{app_name}}', - } - }); - - client.on('agent-state', (agent_state: AgentState) => { - this.loading = !agent_state.isAvailable || agent_state.isAnonymous; - }); - - client.signUp({ cancellable: false }); - this.client = client; - - } else { + this.loading = true; +{{#if holo_enabled}} + try { + if (IS_HOLO) { + const client = await WebSdk.connect({ + chaperoneUrl: import.meta.env.VITE_APP_CHAPERONE_URL, + authFormCustomization: { + appName: '{{app_name}}', + } + }); + + client.on('agent-state', (agent_state: AgentState) => { + this.loading = !agent_state.isAvailable || agent_state.isAnonymous; + }); + + client.signUp({ cancellable: false }); + this.client = client; + } else { + this.client = await AppWebsocket.connect(); + } + } catch(e) { + this.error = e as HolochainError; + } finally { + this.loading = false; + } +{{else}} + try { this.client = await AppWebsocket.connect(); + } catch(e) { + this.error = e as HolochainError; + } finally { this.loading = false; } - {{else}} - this.client = await AppWebsocket.connect(); - this.loading = false; - {{/if}} +{{/if}} } {{#if holo_enabled}} @@ -63,73 +71,55 @@ export class HolochainApp extends LitElement { {{/if}} render() { - if (this.loading) - return html` - - `; - + if (this.loading) return html``; return html` -
-

{{title_case app_name}}

- -
-

EDIT ME! Add the components of your app here.

- - Look in the ui/src/DNA/ZOME folders for UI elements that are generated with hc scaffold entry-type, hc scaffold collection and hc scaffold link-type and add them here as appropriate. - - For example, if you have scaffolded a "todos" dna, a "todos" zome, a "todo_item" entry type, and a collection called "all_todos", you might want to add an element here to create and list your todo items, with the generated ui/src/todos/todos/all-todos.ts and ui/src/todos/todos/create-todo.ts elements. - - So, to use those elements here: -
    -
  1. Import the elements with: -
    -import './todos/todos/all-todos';
    -import './todos/todos/create-todo';
    -              
    -
  2. -
  3. Replace this "EDIT ME!" section with <create-todo></create-todo><all-todos></all-todos>.
  4. -
+
+
+ + + +
+

Holochain Lit hApp

+
+
+ ${this.loading ? html`

connecting...

` : ''} + ${this.error ? html`

${this.error.message}

` : html`

Client is connected.

`} +
+

Import scaffolded components into src/holochain-app.ts to use your hApp

+

Click on the Holochain logo to learn more

- {{#if holo_enabled}} - ${IS_HOLO ? html` - this.logout()} - > - `: ''} - {{/if}} -
+{{#if holo_enabled}} + ${IS_HOLO ? html``: ''} +{{/if}} +
`; } static styles = css` - :host { - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: flex-start; - font-size: calc(10px + 2vmin); - color: #1a2b42; - max-width: 960px; - margin: 0 auto; - text-align: center; - background-color: var(--lit-element-background-color); + ${sharedStyles} + + .logo { + height: 15em; + padding: 1.5em; + will-change: filter; + transition: filter 300ms; + width: auto; + } + + .logo:hover { + filter: drop-shadow(0 0 2em #646cffaa); } - main { - flex-grow: 1; + .logo.holochain:hover { + filter: drop-shadow(0 0 2em #61dafbaa); } - .app-footer { - font-size: calc(12px + 0.5vmin); - align-items: center; + .card { + padding: 2em; } - .app-footer a { - margin-left: 5px; + .read-the-docs { + color: #888; } `; -} +} \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/index.css.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/index.css.hbs new file mode 100644 index 000000000..9cb3efd2c --- /dev/null +++ b/templates/custom-template/custom-template/template/web-app/ui/src/index.css.hbs @@ -0,0 +1,261 @@ +:root { + font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; + line-height: 1.5; + font-weight: 400; + + color-scheme: light dark; + color: rgba(255, 255, 255, 0.87); + background-color: #242424; + + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +a { + font-weight: 500; + color: #646cff; + text-decoration: inherit; +} +a:hover { + color: #535bf2; +} + +body { + margin: 0; + display: flex; + justify-content: center; + text-align: center; + align-items: center; + min-width: 320px; + min-height: 100vh; +} + +h1 { + font-size: 3.2em; + line-height: 1.1; +} + +button { + border-radius: 8px; + border: 1px solid transparent; + padding: 0.6em 1.2em; + font-size: 1em; + font-weight: 500; + font-family: inherit; + background-color: #1a1a1a; + cursor: pointer; + transition: border-color 0.25s; +} +button:hover { + border-color: #646cff; +} +button:focus, +button:focus-visible { + outline: 4px auto -webkit-focus-ring-color; +} + +@media (prefers-color-scheme: light) { + :root { + color: #213547; + background-color: #ffffff; + } + a:hover { + color: #747bff; + } + button { + background-color: #f9f9f9; + } +} + +label { + display: block; + margin-bottom: 0.5em; + font-weight: 500; +} + +input { + display: block; + width: 540px; + padding: 0.75em; + margin: 0.5em 0; + border: 1px solid #ccc; + border-radius: 4px; + font-family: inherit; + font-size: 1em; + color: inherit; + background-color: #2c2c2c; + transition: border-color 0.25s, box-shadow 0.25s; +} + +input[type="checkbox"] { + display: inline-block; + width: auto; + margin-bottom: 1em; + transform: scale(1.5); + margin-right: 0.5em; + vertical-align: middle; +} + +input:focus { + outline: none; + border-color: #646cff; + box-shadow: 0 0 0 4px rgba(100, 108, 255, 0.2); +} + +textarea { + display: block; + width: 540px; + height: 150px; + padding: 0.75em; + margin: 0.5em 0; + border: 1px solid #ccc; + border-radius: 4px; + font-family: inherit; + font-size: 1em; + color: inherit; + background-color: #2c2c2c; + transition: border-color 0.25s, box-shadow 0.25s; + resize: none; +} + +textarea:focus { + outline: none; + border-color: #646cff; + box-shadow: 0 0 0 4px rgba(100, 108, 255, 0.2); +} + +@media (prefers-color-scheme: light) { + input, + textarea { + background-color: #ffffff; + border-color: #ccc; + } + + input:focus, + textarea:focus { + border-color: #646cff; + box-shadow: 0 0 0 4px rgba(100, 108, 255, 0.2); + } +} + +select { + display: block; + width: 566px; + padding: 0.75em; + margin: 1em 0; + border: 1px solid #ccc; + border-radius: 4px; + font-family: inherit; + font-size: 1em; + color: inherit; + background-color: #2c2c2c; + transition: border-color 0.25s, box-shadow 0.25s; +} + +select:focus { + outline: none; + border-color: #646cff; + box-shadow: 0 0 0 4px rgba(100, 108, 255, 0.2); +} + +@media (prefers-color-scheme: light) { + select { + background-color: #ffffff; + border-color: #ccc; + } + + select:focus { + border-color: #646cff; + box-shadow: 0 0 0 4px rgba(100, 108, 255, 0.2); + } +} + +.alert { + font-size: 1.2em; + font-weight: bold; + color: rgba(255, 255, 255, 0.87); + text-align: center; + padding: 2rem; + background-color: #333333; + border: 1px solid #555555; + border-radius: 8px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + margin: 1rem auto; + max-width: 500px; +} + +section { + padding: 2rem; + margin: 1rem 0; + background-color: #333333; + border: 1px solid #555555; + border-radius: 8px; + box-shadow: 0 8px 16px rgba(0, 0, 0, 0.3); + transition: transform 0.3s, box-shadow 0.3s; + max-width: 500px; +} + +section:hover { + transform: translateY(-5px); + box-shadow: 0 12px 24px rgba(0, 0, 0, 0.4); +} + +section div { + margin-bottom: 1.5rem; + padding: 1rem; + background-color: #444444; + border: 1px solid #666666; + border-radius: 4px; +} + +section input { + width: 440px; +} + +section select { + width: 464px; +} + +section textarea { + width: 440px; +} + +section div:last-child { + margin-bottom: 0; +} + +section p, +section span { + margin: 0; + font-size: 1em; + line-height: 1.6; + color: rgba(255, 255, 255, 0.87); +} + +section div:has(button) { + display: flex; + justify-content: space-between; + align-items: center; +} + +progress { + width: 100%; + height: 1.5em; +} + +progress::-webkit-progress-bar { + background-color: #444444; + border-radius: 8px; +} + +progress::-webkit-progress-value { + background-color: #646cff; + border-radius: 8px; +} + +progress::-moz-progress-bar { + background-color: #646cff; + border-radius: 8px; +} diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/shared-styles.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/shared-styles.ts.hbs new file mode 100644 index 000000000..5080ba072 --- /dev/null +++ b/templates/custom-template/custom-template/template/web-app/ui/src/shared-styles.ts.hbs @@ -0,0 +1,4 @@ +import { css, unsafeCSS } from 'lit'; +import styles from './index.css'; + +export const sharedStyles = css`${unsafeCSS(styles)}`; \ No newline at end of file diff --git a/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs index 51c6f7ccc..b8181d30d 100644 --- a/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs +++ b/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs @@ -1,7 +1,6 @@ import { defineConfig } from 'vite'; import checker from 'vite-plugin-checker'; -// https://vitejs.dev/config/ export default defineConfig({ plugins: [ checker({ diff --git a/templates/ui-frameworks/svelte/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.svelte.hbs b/templates/ui-frameworks/svelte/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.svelte.hbs index 2f615f45e..56a099e95 100644 --- a/templates/ui-frameworks/svelte/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.svelte.hbs +++ b/templates/ui-frameworks/svelte/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.svelte.hbs @@ -10,7 +10,6 @@ import type { NewEntryAction, HolochainError, } from '@holochain/client'; -import { SignalType } from '@holochain/client' import { clientContext } from '../../contexts'; import {{pascal_case referenceable.name}}Detail from './{{pascal_case referenceable.name}}Detail.svelte'; import type { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; diff --git "a/templates/ui-frameworks/svelte/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.svelte{{\302\241if}}{{\302\241each}}.hbs" "b/templates/ui-frameworks/svelte/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.svelte{{\302\241if}}{{\302\241each}}.hbs" index 9f3456d06..77ec8bb56 100644 --- "a/templates/ui-frameworks/svelte/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.svelte{{\302\241if}}{{\302\241each}}.hbs" +++ "b/templates/ui-frameworks/svelte/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.svelte{{\302\241if}}{{\302\241each}}.hbs" @@ -9,9 +9,7 @@ import type { AgentPubKey, NewEntryAction, HolochainError, - SignalType, } from '@holochain/client'; -import { SignalType } from '@holochain/client'; import { clientContext } from '../../contexts'; import type { {{pascal_case ../entry_type.name}}, {{pascal_case ../coordinator_zome_manifest.name}}Signal } from './types'; import {{pascal_case ../entry_type.name}}Detail from './{{pascal_case ../entry_type.name}}Detail.svelte'; diff --git "a/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.svelte{{\302\241if}}.hbs" "b/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.svelte{{\302\241if}}.hbs" index 31267c35c..6489b3217 100644 --- "a/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.svelte{{\302\241if}}.hbs" +++ "b/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.svelte{{\302\241if}}.hbs" @@ -10,7 +10,6 @@ import type { NewEntryAction, HolochainError, } from '@holochain/client'; -import { SignalType } from '@holochain/client'; import { clientContext } from '../../contexts'; import {{pascal_case from_referenceable.name}}Detail from './{{pascal_case from_referenceable.name}}Detail.svelte'; import type { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; diff --git "a/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.svelte{{\302\241if}}.hbs" "b/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.svelte{{\302\241if}}.hbs" index 66dc83078..7f8792a7c 100644 --- "a/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.svelte{{\302\241if}}.hbs" +++ "b/templates/ui-frameworks/svelte/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.svelte{{\302\241if}}.hbs" @@ -10,7 +10,6 @@ import type { NewEntryAction, HolochainError, } from '@holochain/client'; -import { SignalType } from '@holochain/client'; import { clientContext } from '../../contexts'; import {{pascal_case to_referenceable.name}}Detail from './{{pascal_case to_referenceable.name}}Detail.svelte'; import type { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types'; diff --git a/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs b/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs index 45e599f15..05d29bae1 100644 --- a/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs +++ b/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs @@ -18,7 +18,7 @@ + \ No newline at end of file diff --git "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs" "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs" index 2fa547b21..1520df771 100644 --- "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs" +++ "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs" @@ -16,7 +16,7 @@ + \ No newline at end of file diff --git "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs" "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs" index 2030777e0..a53d47914 100644 --- "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs" +++ "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs" @@ -17,7 +17,7 @@ + \ No newline at end of file diff --git "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs" "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs" index 34e0d7731..a24690663 100644 --- "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs" +++ "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs" @@ -17,7 +17,7 @@ + \ No newline at end of file