From ef44aa9471e5faa9989455d59a3edc18c009ef88 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Tue, 21 May 2024 13:21:16 +0200 Subject: [PATCH] Reorganized repository --- Cargo.lock | 121 +++-- Cargo.toml | 7 +- README.md | 14 +- .../templates/holochain-runtime/flake.nix.hbs | 6 +- .../src-tauri/Cargo.toml.hbs | 2 +- crates/scaffold-tauri-app/run_test.sh | 2 +- crates/scaffold-tauri-app/src/lib.rs | 32 +- .../Cargo.toml.hbs | 0 .../src-tauri/Cargo.toml.hbs | 2 +- .../src-tauri/build.rs.hbs | 0 .../src-tauri/capabilities/main.json.hbs | 0 .../src-tauri/src/lib.rs.hbs | 0 .../src-tauri/src/main.rs.hbs | 0 .../src-tauri/tauri.conf.json.hbs | 0 .../ui/vite.config.ts.hbs | 0 .../tauri-plugin-holochain}/Cargo.toml | 0 .../android/.tauri/tauri-api/.gitignore | 0 .../android/.tauri/tauri-api/build.gradle.kts | 0 .../.tauri/tauri-api/proguard-rules.pro | 0 .../java/app/tauri/ExampleInstrumentedTest.kt | 0 .../tauri-api/src/main/AndroidManifest.xml | 0 .../src/main/java/app/tauri/FsUtils.kt | 0 .../src/main/java/app/tauri/JniMethod.kt | 0 .../src/main/java/app/tauri/Logger.kt | 0 .../src/main/java/app/tauri/PathPlugin.kt | 0 .../main/java/app/tauri/PermissionHelper.kt | 0 .../main/java/app/tauri/PermissionState.kt | 0 .../app/tauri/annotation/ActivityCallback.kt | 0 .../java/app/tauri/annotation/InvokeArg.kt | 0 .../java/app/tauri/annotation/Permission.kt | 0 .../tauri/annotation/PermissionCallback.kt | 0 .../java/app/tauri/annotation/PluginMethod.kt | 0 .../java/app/tauri/annotation/TauriPlugin.kt | 0 .../src/main/java/app/tauri/plugin/Channel.kt | 0 .../plugin/InvalidPluginMethodException.kt | 0 .../src/main/java/app/tauri/plugin/Invoke.kt | 0 .../src/main/java/app/tauri/plugin/JSArray.kt | 0 .../main/java/app/tauri/plugin/JSObject.kt | 0 .../src/main/java/app/tauri/plugin/Plugin.kt | 0 .../java/app/tauri/plugin/PluginHandle.kt | 0 .../java/app/tauri/plugin/PluginManager.kt | 0 .../java/app/tauri/plugin/PluginMethodData.kt | 0 .../java/app/tauri/plugin/PluginResult.kt | 0 .../test/java/app/tauri/ExampleUnitTest.kt | 0 .../tauri-plugin-holochain}/build.rs | 0 .../autogenerated/commands/get_locales.toml | 0 .../commands/get_runtime_info.toml | 0 .../commands/is_holochain_ready.toml | 0 .../autogenerated/commands/list_apps.toml | 0 .../autogenerated/commands/open_app.toml | 0 .../commands/sign_zome_call.toml | 0 .../permissions/autogenerated/reference.md | 0 .../permissions/schemas/schema.json | 0 .../tauri-plugin-holochain}/src/commands.rs | 0 .../src/commands/get_runtime_info.rs | 0 .../src/commands/install_web_app.rs | 0 .../src/commands/list_apps.rs | 0 .../src/commands/open_app.rs | 0 .../src/commands/sign_zome_call.rs | 0 .../tauri-plugin-holochain}/src/config.rs | 0 .../tauri-plugin-holochain}/src/error.rs | 0 .../tauri-plugin-holochain}/src/filesystem.rs | 0 .../src/http_server.rs | 0 .../tauri-plugin-holochain}/src/launch.rs | 0 .../tauri-plugin-holochain}/src/lib.rs | 7 +- docs/.vitepress/config.mts | 14 +- docs/documentation/android/developing.md | 2 +- docs/documentation/android/project-setup.md | 2 +- docs/documentation/faqs.md | 2 +- ...p.md => how-to-create-an-end-user-happ.md} | 8 +- docs/index.md | 14 +- docs/license/license.md | 2 +- examples/executable-happ/src-tauri/Cargo.toml | 2 +- examples/holochain-runtime/flake.nix | 11 +- .../holochain-runtime/src-tauri/Cargo.toml | 2 +- flake.lock | 428 +----------------- flake.nix | 6 +- package.json | 4 +- packages/frame/dist/index.html | 2 +- packages/signer/package.json | 2 +- pnpm-lock.yaml | 42 +- 81 files changed, 169 insertions(+), 567 deletions(-) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/Cargo.toml.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/Cargo.toml.hbs (95%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/build.rs.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/capabilities/main.json.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/src/lib.rs.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/src/main.rs.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/src-tauri/tauri.conf.json.hbs (100%) rename crates/scaffold-tauri-app/templates/{executable-happ => end-user-happ}/ui/vite.config.ts.hbs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/Cargo.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/.gitignore (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/build.gradle.kts (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/proguard-rules.pro (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/androidTest/java/app/tauri/ExampleInstrumentedTest.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/AndroidManifest.xml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/FsUtils.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/JniMethod.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/Logger.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/PathPlugin.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionHelper.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionState.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/ActivityCallback.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/InvokeArg.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/Permission.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PermissionCallback.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PluginMethod.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/TauriPlugin.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Channel.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/InvalidPluginMethodException.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Invoke.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSArray.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSObject.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Plugin.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginHandle.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginManager.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginMethodData.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginResult.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/android/.tauri/tauri-api/src/test/java/app/tauri/ExampleUnitTest.kt (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/build.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/get_locales.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/get_runtime_info.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/is_holochain_ready.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/list_apps.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/open_app.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/commands/sign_zome_call.toml (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/autogenerated/reference.md (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/permissions/schemas/schema.json (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands/get_runtime_info.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands/install_web_app.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands/list_apps.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands/open_app.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/commands/sign_zome_call.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/config.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/error.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/filesystem.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/http_server.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/launch.rs (100%) rename {tauri-plugin-holochain => crates/tauri-plugin-holochain}/src/lib.rs (98%) rename docs/documentation/{how-to-create-an-executable-happ.md => how-to-create-an-end-user-happ.md} (94%) diff --git a/Cargo.lock b/Cargo.lock index 831e3760..59f2a4e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "block2" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ "objc2", ] @@ -1365,9 +1365,9 @@ checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" [[package]] name = "crc32fast" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ebf8d6963185c7625d2c3c3962d99eb8936637b1427536d21dc36ae402ebad" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -2159,7 +2159,7 @@ dependencies = [ [[package]] name = "file_tree_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "build-fs-tree", "ignore", @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "holochain_scaffolding_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "dialoguer", "file_tree_utils", @@ -4893,9 +4893,9 @@ dependencies = [ [[package]] name = "libsodium-sys-stable" -version = "1.20.7" +version = "1.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55e94ce32b48f061dcef1c7272d63b855c2e8c11b5d461029320b741f266c5" +checksum = "ef8e78c2da1deb8356ea2c0998be1249d897ccae4791d2335e2e6b11aa79115f" dependencies = [ "cc", "libc", @@ -5394,7 +5394,7 @@ dependencies = [ [[package]] name = "nix_scaffolding_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "anyhow", "build-fs-tree", @@ -5449,7 +5449,7 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "npm_scaffolding_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "anyhow", "build-fs-tree", @@ -5595,15 +5595,15 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", @@ -5611,51 +5611,85 @@ dependencies = [ [[package]] name = "objc2-app-kit" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ + "bitflags 2.5.0", "block2", + "libc", "objc2", "objc2-core-data", + "objc2-core-image", "objc2-foundation", + "objc2-quartz-core", ] [[package]] name = "objc2-core-data" -version = "0.2.0" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ "block2", "objc2", "objc2-foundation", + "objc2-metal", ] [[package]] name = "objc2-encode" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc2-foundation" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ + "bitflags 2.5.0", "block2", + "libc", "objc2", ] +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + [[package]] name = "objc2-quartz-core" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "153140331e87b21327f0be072ac7108e67b43986f64098e937077b1eed6e3191" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ + "bitflags 2.5.0", + "block2", "objc2", "objc2-foundation", + "objc2-metal", ] [[package]] @@ -7234,7 +7268,7 @@ dependencies = [ [[package]] name = "rust_scaffolding_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "anyhow", "build-fs-tree", @@ -8717,7 +8751,7 @@ dependencies = [ [[package]] name = "templates_scaffolding_utils" version = "0.1.0" -source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#8b14b15141b54cbacb83242bc4f1dcd819cee6b8" +source = "git+https://github.com/holochain-open-dev/infrastructure?branch=main#bd05714adf6b5e16d306fd6daa657dc69803ac34" dependencies = [ "anyhow", "build-fs-tree", @@ -9350,7 +9384,7 @@ dependencies = [ "serde_json", "tokio", "tracing", - "tx5-core", + "tx5-core 0.0.9-alpha (registry+https://github.com/rust-lang/crates.io-index)", "tx5-go-pion", "tx5-signal", "url", @@ -9361,6 +9395,21 @@ name = "tx5-core" version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a45e91402a7c17bda8835acb47c7460dc3880dc067235d324401a7359857a75" +dependencies = [ + "base64 0.13.1", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "tx5-core" +version = "0.0.9-alpha" +source = "git+https://github.com/guillemcordoba/tx5?branch=custom-go#9e0d775cfe2c166ee58d07b884d20d186c580aaa" dependencies = [ "app_dirs2", "base64 0.13.1", @@ -9392,8 +9441,7 @@ dependencies = [ [[package]] name = "tx5-go-pion-sys" version = "0.0.9-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f42f441e7c186c5aa846618144d1e041215b7d68ecd747aec1e5478c06fccb" +source = "git+https://github.com/guillemcordoba/tx5?branch=custom-go#9e0d775cfe2c166ee58d07b884d20d186c580aaa" dependencies = [ "Inflector", "base64 0.13.1", @@ -9404,15 +9452,14 @@ dependencies = [ "ouroboros", "sha2", "tracing", - "tx5-core", + "tx5-core 0.0.9-alpha (git+https://github.com/guillemcordoba/tx5?branch=custom-go)", "zip 0.6.6", ] [[package]] name = "tx5-go-pion-turn" version = "0.0.9-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393e40552c56e0333a2e2e08090869f2494417c25d0168b8366caf4c9ae52391" +source = "git+https://github.com/guillemcordoba/tx5?branch=custom-go#9e0d775cfe2c166ee58d07b884d20d186c580aaa" dependencies = [ "base64 0.13.1", "dirs", @@ -9422,7 +9469,7 @@ dependencies = [ "sha2", "tokio", "tracing", - "tx5-core", + "tx5-core 0.0.9-alpha (git+https://github.com/guillemcordoba/tx5?branch=custom-go)", "zip 0.6.6", ] @@ -9450,7 +9497,7 @@ dependencies = [ "tokio-rustls 0.23.4", "tokio-tungstenite 0.18.0", "tracing", - "tx5-core", + "tx5-core 0.0.9-alpha (registry+https://github.com/rust-lang/crates.io-index)", "url", "webpki-roots 0.23.1", ] @@ -9472,7 +9519,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "tx5-core", + "tx5-core 0.0.9-alpha (registry+https://github.com/rust-lang/crates.io-index)", "warp", ] @@ -10223,9 +10270,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab6594190de06d718a5dbc5fa781ab62f8903797056480e549ca74add6b7065" +checksum = "21e005a4cc35784183a9e39cb22e9a9c46353ef6a7f113fd8d36ddc58c15ef3c" dependencies = [ "bytemuck", "safe_arch", diff --git a/Cargo.toml b/Cargo.toml index 86c35f50..07a734dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,8 @@ [workspace] -members = ["tauri-plugin-holochain", "crates/*"] +members = ["crates/*"] resolver = "2" + +[patch.crates-io] +# TODO: remove these patches once https://github.com/holochain/tx5/issues/87 is resolved +tx5-go-pion-sys = { git = "https://github.com/guillemcordoba/tx5", branch = "custom-go" } +tx5-go-pion-turn = { git = "https://github.com/guillemcordoba/tx5", branch = "custom-go" } diff --git a/README.md b/README.md index f8bd9e54..8a67be7e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ -# Tauri Plugin holochain +# p2p-shipyard -Tauri Plugin Holochain is [Source-Available](https://en.wikipedia.org/wiki/Source-available_software), you can see its source code [here](https://github.com/darksoil-studio/tauri-plugin-holochain). We are raising funds to make it Open Source. +Build cross-platform holochain apps and runtimes. -If you'd like to contribute to `tauri-plugin-holochain` being open-source and free to use by everyone, please go to our open-collective page to contribute! +--- -https://opencollective.com/darksoil/projects/tauri-plugin-holochain +`p2p-shipyard` is [Source-Available](https://en.wikipedia.org/wiki/Source-available_software), you can see its source code [here](https://github.com/darksoil-studio/p2p-shipyard). We are raising funds to make it Open Source. + +If you'd like to contribute to `p2p-shipyard` being open-source and free to use by everyone, please go to our open-collective page to contribute! + +https://opencollective.com/darksoil/projects/p2p-shipyard Learn more in the main documentation page: -https://darksoil.studio/tauri-plugin-holochain +https://darksoil.studio/p2p-shipyard diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs index c9fbd9a0..8b8fdf05 100644 --- a/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs +++ b/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs @@ -10,7 +10,7 @@ nixpkgs.follows = "holochain/nixpkgs"; flake-parts.follows = "holochain/flake-parts"; - tauri-plugin-holochain.url = "github:darksoil-studio/tauri-plugin-holochain"; + p2p-shipyard.url = "github:darksoil-studio/p2p-shipyard"; }; outputs = inputs: @@ -18,10 +18,10 @@ systems = builtins.attrNames inputs.holochain.devShells; perSystem = { inputs', config, pkgs, system, ... }: { devShells.default = pkgs.mkShell { - inputsFrom = [ inputs'.tauri-plugin-holochain.devShells.holochainTauriDev ]; + inputsFrom = [ inputs'.p2p-shipyard.devShells.holochainTauriDev ]; }; devShells.androidDev = pkgs.mkShell { - inputsFrom = [ inputs'.tauri-plugin-holochain.devShells.holochainTauriAndroidDev]; + inputsFrom = [ inputs'.p2p-shipyard.devShells.holochainTauriAndroidDev]; }; }; }; diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs index d0ae30d0..72ff7776 100644 --- a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs +++ b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs @@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta", default-features = false , features = [] [dependencies] tauri = { version = "2.0.0-beta", features = [] } -tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" } +tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" } holochain_types = { version = "0.3.1-rc" } lair_keystore = { version = "0.4.0" } holochain_client = { version = "0.5.0-dev" } diff --git a/crates/scaffold-tauri-app/run_test.sh b/crates/scaffold-tauri-app/run_test.sh index 3bb9a45f..0273fd03 100644 --- a/crates/scaffold-tauri-app/run_test.sh +++ b/crates/scaffold-tauri-app/run_test.sh @@ -17,7 +17,7 @@ nix run .#scaffold-tauri-app -- --path /tmp/forum-scaffold-tauri-app --ui-packag cd /tmp/forum-scaffold-tauri-app -nix develop --override-input tauri-plugin-holochain $DIR --command bash -c " +nix develop --override-input p2p-shipyard $DIR --command bash -c " set -e npm i diff --git a/crates/scaffold-tauri-app/src/lib.rs b/crates/scaffold-tauri-app/src/lib.rs index 6d2db08b..f62c7230 100644 --- a/crates/scaffold-tauri-app/src/lib.rs +++ b/crates/scaffold-tauri-app/src/lib.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use dialoguer::Input; +use dialoguer::{theme::ColorfulTheme, Input}; use file_tree_utils::{dir_to_file_tree, map_file, FileTree, FileTreeError}; use handlebars::{no_escape, RenderErrorReason}; use holochain_scaffolding_utils::GetOrChooseWebAppManifestError; @@ -18,10 +18,10 @@ use templates_scaffolding_utils::{ }; use thiserror::Error; -static TEMPLATE: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/templates/executable-happ"); +static TEMPLATE: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/templates/end-user-happ"); #[derive(Error, Debug)] -pub enum ScaffoldExecutableHappError { +pub enum ScaffoldEndUserHappError { #[error(transparent)] NpmScaffoldingUtilsError(#[from] NpmScaffoldingUtilsError), @@ -60,7 +60,7 @@ pub enum ScaffoldExecutableHappError { } #[derive(Serialize, Deserialize, Debug)] -struct ScaffoldExecutableHappData { +struct ScaffoldEndUserHappData { app_name: String, identifier: String, } @@ -69,7 +69,7 @@ pub fn scaffold_tauri_app( file_tree: FileTree, ui_package: Option, bundle_identifier: Option, -) -> Result { +) -> Result { // - Detect npm package manager let package_manager = guess_or_choose_package_manager(&file_tree)?; @@ -89,7 +89,7 @@ pub fn scaffold_tauri_app( let identifier: String = match bundle_identifier { Some(i) => i, - None => Input::with_theme(&ColorfulTheme::default()).with_prompt(format!("Input the bundle identifier for your app (eg: org.myorg.{app_name}): ")).validate_with(|input| { + None => Input::with_theme(&ColorfulTheme::default()).with_prompt(format!("Input the bundle identifier for your app (eg: org.myorg.{app_name}): ")).validate_with(|input: &String| { if input.contains("-") || input.contains("_") { Err(String::from("The bundle identifier can only contain alphanumerical characters.")) } else { @@ -102,7 +102,7 @@ pub fn scaffold_tauri_app( file_tree, &h, &template_file_tree, - &ScaffoldExecutableHappData { + &ScaffoldEndUserHappData { identifier, app_name: app_name.clone(), }, @@ -271,11 +271,11 @@ pub fn scaffold_tauri_app( .to_string(), }; - // - Add the `tauri-plugin-holochain` as input to the flake + // - Add the `p2p-shipyard` as input to the flake let flake_nix_content = add_flake_input_to_flake_file( flake_nix_content, - String::from("tauri-plugin-holochain"), - String::from("github:darksoil-studio/tauri-plugin-holochain"), + String::from("p2p-shipyard"), + String::from("github:darksoil-studio/p2p-shipyard"), )?; let scope_opener = String::from("devShells.default = pkgs.mkShell {"); @@ -299,14 +299,14 @@ pub fn scaffold_tauri_app( .replace( "inputsFrom = [", r#"inputsFrom = [ - inputs'.tauri-plugin-holochain.devShells.holochainTauriAndroidDev"#, + inputs'.p2p-shipyard.devShells.holochainTauriAndroidDev"#, ); // - Add the holochainTauriDev to the default devShell let default_dev_shell = flake_nix_content[open..close].to_string().replace( "inputsFrom = [", r#"inputsFrom = [ - inputs'.tauri-plugin-holochain.devShells.holochainTauriDev"#, + inputs'.p2p-shipyard.devShells.holochainTauriDev"#, ); let flake_nix_content = format!( @@ -317,7 +317,7 @@ pub fn scaffold_tauri_app( &flake_nix_content[close..] ); - let result: Result = Ok(flake_nix_content); + let result: Result = Ok(flake_nix_content); result }, )?; @@ -427,7 +427,7 @@ mod tests { description = "Template for Holochain app development"; inputs = { - tauri-plugin-holochain.url = "github:darksoil-studio/tauri-plugin-holochain"; + p2p-shipyard.url = "github:darksoil-studio/p2p-shipyard"; nixpkgs.follows = "holochain/nixpkgs"; versions.url = "github:holochain/holochain?dir=versions/weekly"; @@ -462,14 +462,14 @@ mod tests { }: { devShells.default = pkgs.mkShell { inputsFrom = [ - inputs'.tauri-plugin-holochain.devShells.holochainTauriDev + inputs'.p2p-shipyard.devShells.holochainTauriDev inputs'.hc-infra.devShells.synchronized-pnpm inputs'.holochain.devShells.holonix ]; }; devShells.androidDev = pkgs.mkShell { inputsFrom = [ - inputs'.tauri-plugin-holochain.devShells.holochainTauriAndroidDev + inputs'.p2p-shipyard.devShells.holochainTauriAndroidDev inputs'.hc-infra.devShells.synchronized-pnpm inputs'.holochain.devShells.holonix ]; diff --git a/crates/scaffold-tauri-app/templates/executable-happ/Cargo.toml.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/Cargo.toml.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/Cargo.toml.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/Cargo.toml.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/Cargo.toml.hbs similarity index 95% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/Cargo.toml.hbs index 77849d22..07f487f6 100644 --- a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs +++ b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/Cargo.toml.hbs @@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta", default-features = false , features = [] [dependencies] tauri = { version = "2.0.0-beta", features = [] } -tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" } +tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" } holochain_types = { version = "0.3.1-rc" } lair_keystore = { version = "0.4.0" } diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/build.rs.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/build.rs.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/build.rs.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/build.rs.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/capabilities/main.json.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/capabilities/main.json.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/capabilities/main.json.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/capabilities/main.json.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/src/lib.rs.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/src/lib.rs.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/main.rs.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/src/main.rs.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/main.rs.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/src/main.rs.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/tauri.conf.json.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/src-tauri/tauri.conf.json.hbs diff --git a/crates/scaffold-tauri-app/templates/executable-happ/ui/vite.config.ts.hbs b/crates/scaffold-tauri-app/templates/end-user-happ/ui/vite.config.ts.hbs similarity index 100% rename from crates/scaffold-tauri-app/templates/executable-happ/ui/vite.config.ts.hbs rename to crates/scaffold-tauri-app/templates/end-user-happ/ui/vite.config.ts.hbs diff --git a/tauri-plugin-holochain/Cargo.toml b/crates/tauri-plugin-holochain/Cargo.toml similarity index 100% rename from tauri-plugin-holochain/Cargo.toml rename to crates/tauri-plugin-holochain/Cargo.toml diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/.gitignore b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/.gitignore similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/.gitignore rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/.gitignore diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/build.gradle.kts b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/build.gradle.kts similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/build.gradle.kts rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/build.gradle.kts diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/proguard-rules.pro b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/proguard-rules.pro similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/proguard-rules.pro rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/proguard-rules.pro diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/androidTest/java/app/tauri/ExampleInstrumentedTest.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/androidTest/java/app/tauri/ExampleInstrumentedTest.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/androidTest/java/app/tauri/ExampleInstrumentedTest.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/androidTest/java/app/tauri/ExampleInstrumentedTest.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/AndroidManifest.xml b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/AndroidManifest.xml similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/AndroidManifest.xml rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/AndroidManifest.xml diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/FsUtils.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/FsUtils.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/FsUtils.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/FsUtils.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/JniMethod.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/JniMethod.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/JniMethod.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/JniMethod.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/Logger.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/Logger.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/Logger.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/Logger.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PathPlugin.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PathPlugin.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PathPlugin.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PathPlugin.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionHelper.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionHelper.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionHelper.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionHelper.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionState.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionState.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionState.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/PermissionState.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/ActivityCallback.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/ActivityCallback.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/ActivityCallback.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/ActivityCallback.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/InvokeArg.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/InvokeArg.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/InvokeArg.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/InvokeArg.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/Permission.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/Permission.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/Permission.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/Permission.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PermissionCallback.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PermissionCallback.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PermissionCallback.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PermissionCallback.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PluginMethod.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PluginMethod.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PluginMethod.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/PluginMethod.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/TauriPlugin.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/TauriPlugin.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/TauriPlugin.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/annotation/TauriPlugin.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Channel.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Channel.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Channel.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Channel.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/InvalidPluginMethodException.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/InvalidPluginMethodException.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/InvalidPluginMethodException.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/InvalidPluginMethodException.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Invoke.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Invoke.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Invoke.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Invoke.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSArray.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSArray.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSArray.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSArray.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSObject.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSObject.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSObject.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/JSObject.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Plugin.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Plugin.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Plugin.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/Plugin.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginHandle.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginHandle.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginHandle.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginHandle.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginManager.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginManager.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginManager.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginManager.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginMethodData.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginMethodData.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginMethodData.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginMethodData.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginResult.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginResult.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginResult.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/main/java/app/tauri/plugin/PluginResult.kt diff --git a/tauri-plugin-holochain/android/.tauri/tauri-api/src/test/java/app/tauri/ExampleUnitTest.kt b/crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/test/java/app/tauri/ExampleUnitTest.kt similarity index 100% rename from tauri-plugin-holochain/android/.tauri/tauri-api/src/test/java/app/tauri/ExampleUnitTest.kt rename to crates/tauri-plugin-holochain/android/.tauri/tauri-api/src/test/java/app/tauri/ExampleUnitTest.kt diff --git a/tauri-plugin-holochain/build.rs b/crates/tauri-plugin-holochain/build.rs similarity index 100% rename from tauri-plugin-holochain/build.rs rename to crates/tauri-plugin-holochain/build.rs diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/get_locales.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/get_locales.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/get_locales.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/get_locales.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/get_runtime_info.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/get_runtime_info.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/get_runtime_info.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/get_runtime_info.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/is_holochain_ready.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/is_holochain_ready.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/is_holochain_ready.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/is_holochain_ready.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/list_apps.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/list_apps.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/list_apps.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/list_apps.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/open_app.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/open_app.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/open_app.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/open_app.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/commands/sign_zome_call.toml b/crates/tauri-plugin-holochain/permissions/autogenerated/commands/sign_zome_call.toml similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/commands/sign_zome_call.toml rename to crates/tauri-plugin-holochain/permissions/autogenerated/commands/sign_zome_call.toml diff --git a/tauri-plugin-holochain/permissions/autogenerated/reference.md b/crates/tauri-plugin-holochain/permissions/autogenerated/reference.md similarity index 100% rename from tauri-plugin-holochain/permissions/autogenerated/reference.md rename to crates/tauri-plugin-holochain/permissions/autogenerated/reference.md diff --git a/tauri-plugin-holochain/permissions/schemas/schema.json b/crates/tauri-plugin-holochain/permissions/schemas/schema.json similarity index 100% rename from tauri-plugin-holochain/permissions/schemas/schema.json rename to crates/tauri-plugin-holochain/permissions/schemas/schema.json diff --git a/tauri-plugin-holochain/src/commands.rs b/crates/tauri-plugin-holochain/src/commands.rs similarity index 100% rename from tauri-plugin-holochain/src/commands.rs rename to crates/tauri-plugin-holochain/src/commands.rs diff --git a/tauri-plugin-holochain/src/commands/get_runtime_info.rs b/crates/tauri-plugin-holochain/src/commands/get_runtime_info.rs similarity index 100% rename from tauri-plugin-holochain/src/commands/get_runtime_info.rs rename to crates/tauri-plugin-holochain/src/commands/get_runtime_info.rs diff --git a/tauri-plugin-holochain/src/commands/install_web_app.rs b/crates/tauri-plugin-holochain/src/commands/install_web_app.rs similarity index 100% rename from tauri-plugin-holochain/src/commands/install_web_app.rs rename to crates/tauri-plugin-holochain/src/commands/install_web_app.rs diff --git a/tauri-plugin-holochain/src/commands/list_apps.rs b/crates/tauri-plugin-holochain/src/commands/list_apps.rs similarity index 100% rename from tauri-plugin-holochain/src/commands/list_apps.rs rename to crates/tauri-plugin-holochain/src/commands/list_apps.rs diff --git a/tauri-plugin-holochain/src/commands/open_app.rs b/crates/tauri-plugin-holochain/src/commands/open_app.rs similarity index 100% rename from tauri-plugin-holochain/src/commands/open_app.rs rename to crates/tauri-plugin-holochain/src/commands/open_app.rs diff --git a/tauri-plugin-holochain/src/commands/sign_zome_call.rs b/crates/tauri-plugin-holochain/src/commands/sign_zome_call.rs similarity index 100% rename from tauri-plugin-holochain/src/commands/sign_zome_call.rs rename to crates/tauri-plugin-holochain/src/commands/sign_zome_call.rs diff --git a/tauri-plugin-holochain/src/config.rs b/crates/tauri-plugin-holochain/src/config.rs similarity index 100% rename from tauri-plugin-holochain/src/config.rs rename to crates/tauri-plugin-holochain/src/config.rs diff --git a/tauri-plugin-holochain/src/error.rs b/crates/tauri-plugin-holochain/src/error.rs similarity index 100% rename from tauri-plugin-holochain/src/error.rs rename to crates/tauri-plugin-holochain/src/error.rs diff --git a/tauri-plugin-holochain/src/filesystem.rs b/crates/tauri-plugin-holochain/src/filesystem.rs similarity index 100% rename from tauri-plugin-holochain/src/filesystem.rs rename to crates/tauri-plugin-holochain/src/filesystem.rs diff --git a/tauri-plugin-holochain/src/http_server.rs b/crates/tauri-plugin-holochain/src/http_server.rs similarity index 100% rename from tauri-plugin-holochain/src/http_server.rs rename to crates/tauri-plugin-holochain/src/http_server.rs diff --git a/tauri-plugin-holochain/src/launch.rs b/crates/tauri-plugin-holochain/src/launch.rs similarity index 100% rename from tauri-plugin-holochain/src/launch.rs rename to crates/tauri-plugin-holochain/src/launch.rs diff --git a/tauri-plugin-holochain/src/lib.rs b/crates/tauri-plugin-holochain/src/lib.rs similarity index 98% rename from tauri-plugin-holochain/src/lib.rs rename to crates/tauri-plugin-holochain/src/lib.rs index 0510f977..fce9df76 100644 --- a/tauri-plugin-holochain/src/lib.rs +++ b/crates/tauri-plugin-holochain/src/lib.rs @@ -34,6 +34,9 @@ use filesystem::{AppBundleStore, BundleStore, FileSystem}; pub use launch::launch; use url2::Url2; +const ZOME_CALL_SIGNER_INITIALIZATION_SCRIPT: &'static str = + include_str!("../../../packages/signer/dist/index.js"); + /// Access to the holochain APIs. pub struct HolochainPlugin { pub app_handle: AppHandle, @@ -94,7 +97,7 @@ impl HolochainPlugin { ) .as_str(), ) - .initialization_script(include_str!("../../packages/signer/dist/index.js")); + .initialization_script(ZOME_CALL_SIGNER_INITIALIZATION_SCRIPT); let mut capability_builder = CapabilityBuilder::new("sign-zome-call").permission("holochain:allow-sign-zome-call"); @@ -166,7 +169,7 @@ impl HolochainPlugin { ) .as_str(), ) - .initialization_script(include_str!("../../packages/signer/dist/index.js")); + .initialization_script(ZOME_CALL_SIGNER_INITIALIZATION_SCRIPT); let mut capability_builder = CapabilityBuilder::new("sign-zome-call") .permission("holochain:allow-sign-zome-call"); diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 0cb0e479..66131cc1 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -2,15 +2,15 @@ import { defineConfig } from "vitepress"; // https://vitepress.dev/reference/site-config export default defineConfig({ - title: "Tauri Plugin Holochain", - description: "Cross-platform holochain runtimes and apps", - base: "/tauri-plugin-holochain", + title: "p2p-shipyard", + description: "Build cross-platform holochain apps and runtimes", + base: "/p2p-shipyard", themeConfig: { // https://vitepress.dev/reference/default-theme-config nav: [ { text: "Documentation", - link: "/documentation/how-to-create-an-executable-happ", + link: "/documentation/how-to-create-an-end-user-happ", }, { text: "License", link: "/license/license" }, ], @@ -21,8 +21,8 @@ export default defineConfig({ text: "Guides", items: [ { - text: "How to create an executable hApp ", - link: "/documentation/how-to-create-an-executable-happ", + text: "How to create an end-user hApp", + link: "/documentation/how-to-create-an-end-user-happ", }, { text: "How to create a holochain runtime", @@ -70,7 +70,7 @@ export default defineConfig({ socialLinks: [ { icon: "github", - link: "https://github.com/darksoil-studio/tauri-plugin-holochain", + link: "https://github.com/darksoil-studio/p2p-shipyard", }, ], }, diff --git a/docs/documentation/android/developing.md b/docs/documentation/android/developing.md index 4a58fd29..8ad05259 100644 --- a/docs/documentation/android/developing.md +++ b/docs/documentation/android/developing.md @@ -2,7 +2,7 @@ While developing a hApp, it's not that useful to just have one agent to test your hApp with. Instead, you usually need a couple of peers to be able to interact with one another. -The scaffolding setup steps in [how to create an executable hApp](../how-to-create-an-executable-happ) and [how to create a holochain runtime](../how-to-create-a-holochain-runtime) create a new script in the top level `package.json` file called `android:network`. This script runs an agent in your local computer and another in an Android device, and enables communication between them. +The scaffolding setup steps in [how to create an end-user hApp](../how-to-create-an-end-user-happ) and [how to create a holochain runtime](../how-to-create-a-holochain-runtime) create a new script in the top level `package.json` file called `android:network`. This script runs an agent in your local computer and another in an Android device, and enables communication between them. Since we want to develop for the Android platform, we need to be inside the `androidDev` devShell: diff --git a/docs/documentation/android/project-setup.md b/docs/documentation/android/project-setup.md index 7fb12e88..d6247ed4 100644 --- a/docs/documentation/android/project-setup.md +++ b/docs/documentation/android/project-setup.md @@ -1,7 +1,7 @@ # Project Setup for Android Development > [!NOTE] -> This guide assumes that you have already gone through either [how to create an executable hApp](./how-to-create-an-executable-happ.md) or [how to create a holochain runtime](./how-to-create-a-holochain-runtime.md). +> This guide assumes that you have already gone through either [how to create an end-user hApp](./how-to-create-an-end-user.md) or [how to create a holochain runtime](./how-to-create-a-holochain-runtime.md). 1. In the root folder of your repository, run: diff --git a/docs/documentation/faqs.md b/docs/documentation/faqs.md index 101b9366..6ecc0c16 100644 --- a/docs/documentation/faqs.md +++ b/docs/documentation/faqs.md @@ -19,6 +19,6 @@ In development, holochain works as expected in iOS. But Apple prevents JIT compi ## Well, okey... Then how does `tauri-plugin-holochain` help me now? -For now, you can build a desktop executable hApp that your users can download and use, as all macOS, Linux and Windows are well supported. Furthermore, you can start experimenting with Android support, which has some UX downsides but is workable. After the issues with holochain mobile outlined above are resolved, you will be able to upgrade to a new version of the plugin to automatically get full mobile support in your hApp. +For now, you can build a desktop end-user hApp that your users can download and use, as all macOS, Linux and Windows are well supported. Furthermore, you can start experimenting with Android support, which has some UX downsides but is workable. After the issues with holochain mobile outlined above are resolved, you will be able to upgrade to a new version of the plugin to automatically get full mobile support in your hApp. This is the way ourselves at darskoil.studio are building hApps right now. We are monitoring the issues at the core holochain infrastructure level, and in constant communication with the core holochain development team to help get them fixed. We hope that the remaining issues that prevent holochain to work on mobile outlined above get resolved soon, so that we can start deploying our holochain apps to end users. diff --git a/docs/documentation/how-to-create-an-executable-happ.md b/docs/documentation/how-to-create-an-end-user-happ.md similarity index 94% rename from docs/documentation/how-to-create-an-executable-happ.md rename to docs/documentation/how-to-create-an-end-user-happ.md index caf5367a..9e1e1d37 100644 --- a/docs/documentation/how-to-create-an-executable-happ.md +++ b/docs/documentation/how-to-create-an-end-user-happ.md @@ -1,4 +1,4 @@ -# How to create an executable hApp +# How to create an end-user hApp This guide describes how to create a hApp that can be directly installed and executed by the end users, for **both desktop and mobile platforms**. @@ -16,7 +16,7 @@ We need a way to create end-users applications for mobile platforms to create si 0. [Scaffold your hApp using the scaffolding tool](https://developer.holochain.org/get-started/3-forum-app-tutorial/). > [!NOTE] -> If you already have a hApp that you want to convert to a tauri executable app, you can skip this step. +> If you already have a hApp that you want to convert to a tauri end-user app, you can skip this step. 1. Run this command inside the repository of your web-hApp: @@ -26,7 +26,7 @@ nix run github:darksoil-studio/tauri-plugin-holochain#scaffold-tauri-app And follow along to answer all the necessary prompts. -This will execute all the required steps to convert your previously scaffolded hApp to an end-user executable tauri app. +This will execute all the required steps to convert your previously scaffolded hApp to an end-user tauri app. 2. Take a look into the files that the scaffold command edited, and adapt them if necessary: @@ -41,7 +41,7 @@ This will execute all the required steps to convert your previously scaffolded h > > It also tries to make smart guesses about the structure of your project, but it can be tricky to support every repository structure. Please open an issue in the github repository if you find any bugs in it! -That's it! We now have a fully functional end-user executable hApp. +That's it! We now have a fully functional end-user, cross-platform hApp. > [!WARNING] > The scaffolded tauri app is missing icons, which are needed for the app to compile. Run through the rest of this guide and the following one ("Getting to know Tauri") to be able to generate the icons for your Tauri app. diff --git a/docs/index.md b/docs/index.md index b2b3c4fc..9e3c2ecc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,30 +3,30 @@ layout: home hero: - name: "tauri-plugin-holochain" - text: "Create cross-platform holochain apps and runtimes" + name: "p2p-shipyard" + text: "Build cross-platform holochain apps and runtimes" tagline: Ship holochain to Android, Linux, MacOS and Windows actions: - theme: brand text: Contribute to making it Open-Source! link: /license/license - theme: alt - text: Create an end-user executable hApp - link: /documentation/how-to-create-an-executable-happ + text: Create an end-user hApp + link: /documentation/how-to-create-an-end-user-happ - theme: alt text: Create a holochain runtime link: /documentation/how-to-create-a-holochain-runtime features: - title: Contribute to make it open-source! - details: Tauri Plugin Holochain is Source-Available. We are raising funds to make it Open Source. + details: p2p-shipyard is Source-Available. We are raising funds to make it Open Source. link: /license/license - title: Experimental mobile support details: Android has experimental support (see FAQs for more details), iOS support coming soon link: /documentation/faqs - title: Works on desktop as well details: Maintain one codebase, ship to all platforms - - title: Just another tauri plugin - details: Integrate with all the existing tauri plugins (camera, notification, NFC...) to create great applications + - title: tauri-plugin-holochain, just another tauri plugin + details: Integrate with all the existing tauri plugins (camera, notification, NFC...) to create great cross-platform apps --- diff --git a/docs/license/license.md b/docs/license/license.md index 11175f8b..cba82218 100644 --- a/docs/license/license.md +++ b/docs/license/license.md @@ -2,7 +2,7 @@ Tauri Plugin Holochain is [Source-Available](https://en.wikipedia.org/wiki/Source-available_software), you can see its source code [here](https://github.com/darksoil-studio/tauri-plugin-holochain). We are raising funds to make it Open Source. -If you'd like to contribute to `tauri-plugin-holochain` being open-source and free to use by everyone, please go to our open-collective page to contribute! +If you'd like to contribute to `p2p-shipyard` being open-source and free to use by everyone, please go to our open-collective page to contribute! https://opencollective.com/darksoil/projects/tauri-plugin-holochain diff --git a/examples/executable-happ/src-tauri/Cargo.toml b/examples/executable-happ/src-tauri/Cargo.toml index 8e464fff..4ffd01c9 100644 --- a/examples/executable-happ/src-tauri/Cargo.toml +++ b/examples/executable-happ/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta.10", default-features = false , features = [dependencies] tauri = { version = "2.0.0-beta.13", features = [] } -tauri-plugin-holochain = { path = "../../../tauri-plugin-holochain" } +tauri-plugin-holochain = { path = "../../../crates/tauri-plugin-holochain" } holochain_types = { version = "0.3.1-rc" } lair_keystore = { version = "0.4.0" } holochain_client = { git="https://github.com/guillemcordoba/holochain-client-rust", branch = "main" } diff --git a/examples/holochain-runtime/flake.nix b/examples/holochain-runtime/flake.nix index 83e90a77..9865a85d 100644 --- a/examples/holochain-runtime/flake.nix +++ b/examples/holochain-runtime/flake.nix @@ -10,8 +10,7 @@ nixpkgs.follows = "holochain/nixpkgs"; flake-parts.follows = "holochain/flake-parts"; - tauri-plugin-holochain.url = - "/home/guillem/projects/darksoil/tauri-plugin-holochain"; + p2p-shipyard.url = "/home/guillem/projects/darksoil/p2p-shipyard"; }; outputs = inputs: @@ -19,13 +18,11 @@ systems = builtins.attrNames inputs.holochain.devShells; perSystem = { inputs', config, pkgs, system, ... }: { devShells.default = pkgs.mkShell { - inputsFrom = - [ inputs'.tauri-plugin-holochain.devShells.holochainTauriDev ]; + inputsFrom = [ inputs'.p2p-shipyard.devShells.holochainTauriDev ]; }; devShells.androidDev = pkgs.mkShell { - inputsFrom = [ - inputs'.tauri-plugin-holochain.devShells.holochainTauriAndroidDev - ]; + inputsFrom = + [ inputs'.p2p-shipyard.devShells.holochainTauriAndroidDev ]; }; }; }; diff --git a/examples/holochain-runtime/src-tauri/Cargo.toml b/examples/holochain-runtime/src-tauri/Cargo.toml index 76c5e957..8ac55656 100644 --- a/examples/holochain-runtime/src-tauri/Cargo.toml +++ b/examples/holochain-runtime/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta", default-features = false , features = [] [dependencies] tauri = { version = "2.0.0-beta", features = [] } -tauri-plugin-holochain = { path = "../../tauri-plugin-holochain/tauri-plugin-holochain" } +tauri-plugin-holochain = { path = "../../../crates/tauri-plugin-holochain" } holochain_types = { version = "0.3.0-beta-dev" } lair_keystore = { version = "0.4.0" } holochain_client = { version = "0.5.0-dev" } diff --git a/flake.lock b/flake.lock index f0f8ab98..e1e4ea98 100644 --- a/flake.lock +++ b/flake.lock @@ -57,23 +57,6 @@ "type": "github" } }, - "cargo-chef_3": { - "flake": false, - "locked": { - "lastModified": 1695999026, - "narHash": "sha256-UtLoZd7YBRSF9uXStfC3geEFqSqZXFh1rLHaP8hre0Y=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "6e96ae5cd023b718ae40d608981e50a6e7d7facf", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, "cargo-rdme": { "flake": false, "locked": { @@ -108,23 +91,6 @@ "type": "github" } }, - "cargo-rdme_3": { - "flake": false, - "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.1.0", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": "nixpkgs" @@ -204,28 +170,6 @@ "type": "github" } }, - "crane_5": { - "inputs": { - "nixpkgs": [ - "scaffolding", - "holochain", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707363936, - "narHash": "sha256-QbqyvGFYt84QNOQLOOTWplZZkzkyDhYrAl/N/9H0vFM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "9107434eda6991e9388ad87b815dafa337446d16", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "crate2nix": { "flake": false, "locked": { @@ -258,22 +202,6 @@ "type": "github" } }, - "crate2nix_3": { - "flake": false, - "locked": { - "lastModified": 1706909251, - "narHash": "sha256-T7G9Uhh77P0kKri/u+Mwa/4YnXwdPsJSwYCiJCCW+fs=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "15656bb6cb15f55ee3344bf4362e6489feb93db6", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils", @@ -328,22 +256,6 @@ "type": "github" } }, - "empty_3": { - "flake": false, - "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", - "type": "github" - }, - "original": { - "owner": "steveej", - "repo": "empty", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -376,22 +288,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -426,23 +322,6 @@ "type": "indirect" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -551,24 +430,6 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "hc-infra": { "inputs": { "crane": "crane_2", @@ -714,76 +575,6 @@ } }, "holochain_4": { - "inputs": { - "cargo-chef": "cargo-chef_3", - "cargo-rdme": "cargo-rdme_3", - "crane": "crane_5", - "crate2nix": "crate2nix_3", - "empty": "empty_3", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "holochain": [ - "scaffolding", - "holochain", - "empty" - ], - "lair": [ - "scaffolding", - "holochain", - "empty" - ], - "launcher": [ - "scaffolding", - "holochain", - "empty" - ], - "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", - "repo-git": "repo-git_3", - "rust-overlay": "rust-overlay_5", - "scaffolding": [ - "scaffolding", - "holochain", - "empty" - ], - "versions": [ - "scaffolding", - "versions" - ] - }, - "locked": { - "lastModified": 1715075584, - "narHash": "sha256-AZbckXdtu526rjCP+CNhLBmPFs2tKVwfvhvmKBDuH4c=", - "owner": "holochain", - "repo": "holochain", - "rev": "de729662e1d0812ef008bf56fde2c0cfcc3c5232", - "type": "github" - }, - "original": { - "owner": "holochain", - "repo": "holochain", - "type": "github" - } - }, - "holochain_5": { - "flake": false, - "locked": { - "lastModified": 1714578487, - "narHash": "sha256-R0nmeZEEkHBCPmLiuWpx54qjGrrbay4b0QxxIJXsn2o=", - "owner": "holochain", - "repo": "holochain", - "rev": "f64ad12ccb5e3c872f5588a32437f03fef0b154b", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.4.0-dev.1", - "repo": "holochain", - "type": "github" - } - }, - "holochain_6": { "flake": false, "locked": { "lastModified": 1715896367, @@ -834,23 +625,6 @@ "type": "github" } }, - "lair_3": { - "flake": false, - "locked": { - "lastModified": 1709335027, - "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", - "owner": "holochain", - "repo": "lair", - "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "lair_keystore-v0.4.4", - "repo": "lair", - "type": "github" - } - }, "launcher": { "flake": false, "locked": { @@ -869,23 +643,6 @@ } }, "launcher_2": { - "flake": false, - "locked": { - "lastModified": 1714396970, - "narHash": "sha256-I/Vpxtg8cwhrrD5JugEgE4Qk8fZR6VewGm5FX69vbm0=", - "owner": "holochain", - "repo": "launcher", - "rev": "b96d5aa790bf0da0a8f0c44741276f7f9c4b6b41", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "launcher", - "type": "github" - } - }, - "launcher_3": { "flake": false, "locked": { "lastModified": 1714396970, @@ -932,21 +689,6 @@ "type": "github" } }, - "nix-filter_3": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1714656196, @@ -999,24 +741,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1714656196, @@ -1079,21 +803,6 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pre-commit-hooks-nix": { "flake": false, "locked": { @@ -1126,22 +835,6 @@ "type": "github" } }, - "pre-commit-hooks-nix_3": { - "flake": false, - "locked": { - "lastModified": 1707297608, - "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "repo-git": { "flake": false, "locked": { @@ -1166,18 +859,6 @@ "url": "file:/dev/null" } }, - "repo-git_3": { - "flake": false, - "locked": { - "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", - "type": "file", - "url": "file:/dev/null" - }, - "original": { - "type": "file", - "url": "file:/dev/null" - } - }, "root": { "inputs": { "android-nixpkgs": "android-nixpkgs", @@ -1189,8 +870,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_4", - "scaffolding": "scaffolding_2", - "versions": "versions_3" + "versions": "versions_2" } }, "rust-overlay": { @@ -1279,29 +959,6 @@ "type": "github" } }, - "rust-overlay_5": { - "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": [ - "scaffolding", - "holochain", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715048276, - "narHash": "sha256-SqWSTvCjNBBnV/WIQdaxVi5V9H3VJ7cOJAxPQdR1TBY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b037d65c988421b54024e62691eace4f2fe623bc", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "scaffolding": { "flake": false, "locked": { @@ -1320,47 +977,6 @@ } }, "scaffolding_2": { - "inputs": { - "holochain": "holochain_4", - "nixpkgs": [ - "scaffolding", - "holochain", - "nixpkgs" - ], - "versions": "versions_2" - }, - "locked": { - "lastModified": 1715861319, - "narHash": "sha256-9CZj1p5uma28962vMC4NlBrcfbl+qnwWZx+16Ao54VY=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "a6a57b5befa3382091fce874339e277aec7bfc33", - "type": "github" - }, - "original": { - "owner": "holochain", - "repo": "scaffolding", - "type": "github" - } - }, - "scaffolding_3": { - "flake": false, - "locked": { - "lastModified": 1713363855, - "narHash": "sha256-Y9KsDAjlZZab07NL7pI1izxLOYT4BWYTx1h9DilW8Fk=", - "owner": "holochain", - "repo": "scaffolding", - "rev": "9ac485d52122b92bd2988a8fea1a8e4d9a18c3a1", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "scaffolding", - "type": "github" - } - }, - "scaffolding_4": { "flake": false, "locked": { "lastModified": 1715862126, @@ -1467,21 +1083,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "versions": { "inputs": { "holochain": "holochain_2", @@ -1507,33 +1108,10 @@ }, "versions_2": { "inputs": { - "holochain": "holochain_5", + "holochain": "holochain_4", "lair": "lair_2", "launcher": "launcher_2", - "scaffolding": "scaffolding_3" - }, - "locked": { - "dir": "versions/weekly", - "lastModified": 1715075584, - "narHash": "sha256-AZbckXdtu526rjCP+CNhLBmPFs2tKVwfvhvmKBDuH4c=", - "owner": "holochain", - "repo": "holochain", - "rev": "de729662e1d0812ef008bf56fde2c0cfcc3c5232", - "type": "github" - }, - "original": { - "dir": "versions/weekly", - "owner": "holochain", - "repo": "holochain", - "type": "github" - } - }, - "versions_3": { - "inputs": { - "holochain": "holochain_6", - "lair": "lair_3", - "launcher": "launcher_3", - "scaffolding": "scaffolding_4" + "scaffolding": "scaffolding_2" }, "locked": { "dir": "versions/0_3_rc", diff --git a/flake.nix b/flake.nix index ecf8ad4d..1ba98038 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Holochain"; + description = "Build cross-platform holochain apps and runtimes"; inputs = { crane.url = "github:ipetkov/crane"; @@ -19,10 +19,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hc-infra.url = "github:holochain-open-dev/infrastructure"; - scaffolding = { - url = "github:holochain/scaffolding"; - # inputs.holochain.follows = "holochain"; - }; }; outputs = inputs@{ ... }: diff --git a/package.json b/package.json index 6b57bfd3..1cafe581 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "tauri-plugin-holochain-dev", + "name": "p2p-shipyard-dev", "version": "0.0.0", "author": "guillem@darksoil.studio", "description": "", "scripts": { "start": "cd examples/tauri-app && nix develop --command bash -c \"npm run tauri dev\"", - "android:start": "cd examples/tauri-app && nix develop .#androidDev --command bash -c \"npm run tauri android dev -- --release --no-watch\"" + "android:start": "cd examples/tauri-app && nix develop .#androidDev --command bash -c \"npm run tauri android dev\"" }, "devDependencies": {}, "dependencies": { diff --git a/packages/frame/dist/index.html b/packages/frame/dist/index.html index 94babac0..0f998f4b 100644 --- a/packages/frame/dist/index.html +++ b/packages/frame/dist/index.html @@ -18,7 +18,7 @@ } diff --git a/packages/signer/package.json b/packages/signer/package.json index e3be86c3..281600bf 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -8,7 +8,7 @@ "prepare": "pnpm build" }, "dependencies": { - "@holochain/client": "^0.17.0-dev.12", + "@holochain/client": "^0.18.0-dev.1", "@msgpack/msgpack": "^3.0.0-beta2", "@tauri-apps/api": "^2.0.0-beta.6", "@tauri-apps/plugin-log": "2.0.0-beta.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4657cbb9..eaab5ddf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: packages/frame: dependencies: '@holochain/client': - specifier: ^0.17.0-dev.7 - version: 0.17.0-dev.7 + specifier: ^0.18.0-dev.1 + version: 0.18.0-dev.1 '@msgpack/msgpack': specifier: ^3.0.0-beta2 version: 3.0.0-beta2 @@ -55,8 +55,8 @@ importers: packages/signer: dependencies: '@holochain/client': - specifier: ^0.17.0-dev.12 - version: 0.17.0-dev.12 + specifier: ^0.18.0-dev.1 + version: 0.18.0-dev.1 '@msgpack/msgpack': specifier: ^3.0.0-beta2 version: 3.0.0-beta2 @@ -479,12 +479,8 @@ packages: cpu: [x64] os: [win32] - /@holochain/client@0.17.0-dev.12: - resolution: {integrity: sha512-aEOkD4wtFeHAv5AiEkBfsiGeAujCyQf1yfvmtcdERnv73zgZhxCiZ0ZrEi46kdJhRHMXX/1Qkqo6VY8afrepfQ==} - engines: {node: '>=18.0.0 || >=20.0.0'} - - /@holochain/client@0.17.0-dev.7: - resolution: {integrity: sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==} + /@holochain/client@0.18.0-dev.1: + resolution: {integrity: sha512-5BW+kG/VoB+AhrzquoZ1QHbc1fGwujLs2o6Ct+aOkqXATjQNFif6auX50cagZSaq9hWX5VuZLcqdDTXLWKhNrw==} engines: {node: '>=18.0.0 || >=20.0.0'} /@holochain/serialization@0.1.0-beta-rc.3: @@ -639,10 +635,6 @@ packages: /@shikijs/transformers@1.2.4: resolution: {integrity: sha512-ysGkpsHxRxLmz8nGKeFdV+gKj1NXt+88sM/34kfKVWTWIXg5gsFOJxJBbG7k+fUR5JlD6sNh65W9qPXrbVE1wQ==} - /@tauri-apps/api@1.5.3: - resolution: {integrity: sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==} - engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - /@tauri-apps/api@2.0.0-beta.4: resolution: {integrity: sha512-Nxtj28NYUo5iwYkpYslxmOPkdI2WkELU2e3UH9nbJm9Ydki2CQwJVGQxx4EANtdZcMNsEsUzRqaDTvEUYH1l6w==} engines: {node: '>= 18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} @@ -1679,28 +1671,11 @@ snapshots: dev: true optional: true - /@holochain/client@0.17.0-dev.12: - dependencies: - '@bitgo/blake2b': 3.2.4 - '@holochain/serialization': 0.1.0-beta-rc.3 - '@msgpack/msgpack': 2.8.0 - emittery: 1.0.3 - isomorphic-ws: 5.0.0(ws@8.16.0) - js-base64: 3.7.7 - libsodium-wrappers: 0.7.13 - lodash-es: 4.17.21 - ws: 8.16.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: false - - /@holochain/client@0.17.0-dev.7: + /@holochain/client@0.18.0-dev.1: dependencies: '@bitgo/blake2b': 3.2.4 '@holochain/serialization': 0.1.0-beta-rc.3 '@msgpack/msgpack': 2.8.0 - '@tauri-apps/api': 1.5.3 emittery: 1.0.3 isomorphic-ws: 5.0.0(ws@8.16.0) js-base64: 3.7.7 @@ -1856,9 +1831,6 @@ snapshots: shiki: 1.2.4 dev: true - /@tauri-apps/api@1.5.3: - dev: false - /@tauri-apps/api@2.0.0-beta.4: dev: false