diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs index 860b3bd2..25644598 100644 --- a/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs +++ b/crates/scaffold-holochain-runtime/templates/holochain-runtime/package.json.hbs @@ -4,10 +4,15 @@ "version": "0.0.0", "type": "module", "scripts": { + "start": "AGENTS=2 npm run network", + "network": "npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm start -w ui\" \"npm run launch\"", + "android:network": "BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm start -w ui\" \"npm run tauri dev\" \"npm run tauri android dev\"", + "local-services": "hc run-local-services --bootstrap-interface $INTERNAL_IP --bootstrap-port $BOOTSTRAP_PORT --signal-interfaces $INTERNAL_IP --signal-port $SIGNAL_PORT", + "launch": "concurrently-repeat \"npm run tauri dev\" $AGENTS", "dev": "vite", "build": "tsc && vite build", "preview": "vite preview", - "tauri": "BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) tauri" + "tauri": "tauri" }, "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.0", diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs index c07ab466..92128dfb 100644 --- a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs +++ b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/src/lib.rs.hbs @@ -35,13 +35,9 @@ pub fn run() { } fn internal_ip() -> String { - if cfg!(mobile) { - std::option_env!("INTERNAL_IP") - .expect("Environment variable INTERNAL_IP was not set") - .to_string() - } else { - String::from("localhost") - } + std::option_env!("INTERNAL_IP") + .expect("Environment variable INTERNAL_IP was not set") + .to_string() } fn bootstrap_url() -> Url2 { diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs index 5352e0e5..fc1fc10f 100644 --- a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs +++ b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/tauri.conf.json.hbs @@ -17,6 +17,13 @@ }, "bundle": { "active": true, - "targets": "all" + "targets": "all", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] } } diff --git a/crates/scaffold-tauri-app/run_test.sh b/crates/scaffold-tauri-app/run_test.sh index 9990c7ed..3bb9a45f 100644 --- a/crates/scaffold-tauri-app/run_test.sh +++ b/crates/scaffold-tauri-app/run_test.sh @@ -3,17 +3,17 @@ set -e DIR=$(pwd) -nix shell github:holochain/holochain#hc-scaffold --command bash -c " +nix shell --override-input versions "github:holochain/holochain?dir=versions/0_3_rc" github:holochain/holochain#hc-scaffold --command bash -c " cd /tmp rm -rf forum-scaffold-tauri-app -hc-scaffold web-app --template lit forum-scaffold-tauri-app --setup-nix true +hc-scaffold --template lit web-app forum-scaffold-tauri-app --setup-nix true -F cd /tmp/forum-scaffold-tauri-app nix flake update nix develop --command bash -c \"npm i && hc scaffold dna forum && hc scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/\" " -nix run .#scaffold-tauri-app -- --path /tmp/forum-scaffold-tauri-app --ui-package ui +nix run .#scaffold-tauri-app -- --path /tmp/forum-scaffold-tauri-app --ui-package ui --bundle-identifier org.myorg.myapp cd /tmp/forum-scaffold-tauri-app diff --git a/crates/scaffold-tauri-app/src/bin/main.rs b/crates/scaffold-tauri-app/src/bin/main.rs index 92e24a5f..fedcd797 100644 --- a/crates/scaffold-tauri-app/src/bin/main.rs +++ b/crates/scaffold-tauri-app/src/bin/main.rs @@ -16,6 +16,10 @@ struct Args { #[clap(long)] pub ui_package: Option, + /// The bundle identifier for the Tauri app + #[clap(long)] + pub bundle_identifier: Option, + /// The path of the file tree to modify. #[clap(long, default_value = "./.")] pub path: PathBuf, @@ -34,7 +38,7 @@ fn internal_main() -> Result<()> { let file_tree = file_tree_utils::load_directory_into_memory(&args.path)?; - let file_tree = scaffold_tauri_app(file_tree, args.ui_package)?; + let file_tree = scaffold_tauri_app(file_tree, args.ui_package, args.bundle_identifier)?; let file_tree = MergeableFileSystemTree::::from(file_tree); diff --git a/crates/scaffold-tauri-app/src/lib.rs b/crates/scaffold-tauri-app/src/lib.rs index b5157047..6d2db08b 100644 --- a/crates/scaffold-tauri-app/src/lib.rs +++ b/crates/scaffold-tauri-app/src/lib.rs @@ -1,4 +1,5 @@ use anyhow::Result; +use dialoguer::Input; use file_tree_utils::{dir_to_file_tree, map_file, FileTree, FileTreeError}; use handlebars::{no_escape, RenderErrorReason}; use holochain_scaffolding_utils::GetOrChooseWebAppManifestError; @@ -8,6 +9,7 @@ use npm_scaffolding_utils::{ add_npm_dev_dependency_to_package, add_npm_script_to_package, choose_npm_package, guess_or_choose_package_manager, NpmScaffoldingUtilsError, }; +use rust_scaffolding_utils::{add_member_to_workspace, RustScaffoldingUtilsError}; use regex::{Captures, Regex}; use serde::{Deserialize, Serialize}; use std::path::PathBuf; @@ -41,6 +43,9 @@ pub enum ScaffoldExecutableHappError { #[error(transparent)] NixScaffoldingUtilsError(#[from] NixScaffoldingUtilsError), + #[error(transparent)] + RustScaffoldingUtilsError(#[from] RustScaffoldingUtilsError), + #[error(transparent)] DialoguerError(#[from] dialoguer::Error), @@ -57,11 +62,13 @@ pub enum ScaffoldExecutableHappError { #[derive(Serialize, Deserialize, Debug)] struct ScaffoldExecutableHappData { app_name: String, + identifier: String, } pub fn scaffold_tauri_app( file_tree: FileTree, ui_package: Option, + bundle_identifier: Option, ) -> Result { // - Detect npm package manager let package_manager = guess_or_choose_package_manager(&file_tree)?; @@ -80,11 +87,23 @@ pub fn scaffold_tauri_app( let h = register_case_helpers(h); let h = register_merge(h); + 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| { + if input.contains("-") || input.contains("_") { + Err(String::from("The bundle identifier can only contain alphanumerical characters.")) + } else { + Ok(()) + } + }).interact_text()? + }; + let mut file_tree = render_template_file_tree_and_merge_with_existing( file_tree, &h, &template_file_tree, &ScaffoldExecutableHappData { + identifier, app_name: app_name.clone(), }, )?; @@ -99,9 +118,9 @@ pub fn scaffold_tauri_app( map_file( &mut file_tree, - &workspace_cargo_toml_path .as_path(), + &workspace_cargo_toml_path.clone().as_path(), |cargo_toml_content| { - add_member_to_workspace(&(workspace_cargo_toml_path, cargo_toml_content), String::from("src-tauri")) + add_member_to_workspace(&(workspace_cargo_toml_path.clone(), cargo_toml_content), String::from("src-tauri")) }, )?; @@ -377,7 +396,7 @@ mod tests { } }; - let repo = scaffold_tauri_app(repo, Some(String::from("package1"))).unwrap(); + let repo = scaffold_tauri_app(repo, Some(String::from("package1")), Some(String::from("studio.darksoil.myapp"))).unwrap(); assert_eq!( file_content(&repo, PathBuf::from("package.json").as_path()).unwrap(), diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs index cf445d87..77849d22 100644 --- a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs +++ b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/Cargo.toml.hbs @@ -22,15 +22,16 @@ tauri = { version = "2.0.0-beta", features = [] } tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" } holochain_types = { version = "0.3.1-rc" } lair_keystore = { version = "0.4.0" } -holochain_client = { version = "0.5.0-dev" } + +# Uncomment this crates dependency and add the appropriate holochain_client version +# compatible with holochain 0.3.x-rc when it's released to crates.io... +# holochain_client = { version = "0.5.0-dev" } +# ... and remove these git dependency +holochain_client = { git="https://github.com/guillemcordoba/holochain-client-rust", branch = "main" } + log = "0.4" tauri-plugin-log = "2.0.0-beta" url2 = "0.0.6" app_dirs2 = "2.5.5" tempdir = "0.3.7" anyhow = "1" - -[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/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs index 7ea333d3..33f78f97 100644 --- a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs +++ b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/src/lib.rs.hbs @@ -4,6 +4,7 @@ use std::collections::HashMap; use std::path::PathBuf; use tauri_plugin_holochain::{HolochainPluginConfig, HolochainExt}; use url2::Url2; +use tauri::AppHandle; const APP_ID: &'static str = "{{app_name}}"; const PRODUCTION_SIGNAL_URL: &'static str = "wss://signal.holo.host"; @@ -38,7 +39,7 @@ pub fn run() { // After set up we can be sure our app is installed and up to date, so we can just open it app.holochain()? - .main_window_builder("main", false, Some(String::from("{{app_name}}")), None)? + .main_window_builder(String::from("main"), false, Some(String::from("{{app_name}}")), None)? .build()?; Ok(()) @@ -68,7 +69,7 @@ async fn setup(handle: AppHandle) -> anyhow::Result<()> { .holochain()? .install_app( String::from(APP_ID), - happ_bundle() + happ_bundle(), HashMap::new(), None, ) diff --git a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs index c51c1846..f7e57db1 100644 --- a/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs +++ b/crates/scaffold-tauri-app/templates/executable-happ/src-tauri/tauri.conf.json.hbs @@ -1,9 +1,9 @@ { "productName": "{{app_name}}", "version": "0.0.0", - "identifier": "{{app_name}}", + "identifier": "{{identifier}}", "build": { - "beforeBuildCommand": "pnpm -F ui build && pnpm happ:build", + "beforeBuildCommand": "npm run build && npm run build:happ", "devUrl": "http://localhost:1420", "frontendDist": "../ui/dist" }, @@ -16,6 +16,13 @@ }, "bundle": { "active": true, - "targets": "all" + "targets": "all", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] } } diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 3739d9f4..0cb0e479 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -36,16 +36,20 @@ export default defineConfig({ text: "Android", items: [ { - text: "Setup", - link: "/documentation/android/setup", + text: "Project Setup", + link: "/documentation/android/project-setup", + }, + { + text: "Device Setup", + link: "/documentation/android/device-setup", }, { text: "Developing", link: "/documentation/android/developing", }, { - text: "Publishing", - link: "/documentation/android/publishing", + text: "Building for Production", + link: "/documentation/android/building-for-production", }, ], }, diff --git a/docs/documentation/android/building-for-production.md b/docs/documentation/android/building-for-production.md new file mode 100644 index 00000000..a9b3e19a --- /dev/null +++ b/docs/documentation/android/building-for-production.md @@ -0,0 +1,21 @@ +# Building for Production + +To build a production version of your app, you just need to run this very simple command: + +::: code-group +```bash [npm] +npm run tauri android build +``` + +```bash [yarn] +yarn tauri android build +``` + +```bash [pnpm] +pnpm tauri android build +``` +::: + +Take into account that this will compile your app for all the different Android target architectures: it will take a long time. + +That's it! When the command finishes, you can copy the resulting `Android App Bundle` and [publish it on the `Google Play Store`](https://developer.android.com/studio/publish), or the release method of your choosing. diff --git a/docs/documentation/android/developing.md b/docs/documentation/android/developing.md index 461cd3d0..4a58fd29 100644 --- a/docs/documentation/android/developing.md +++ b/docs/documentation/android/developing.md @@ -2,7 +2,30 @@ 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 +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. + +Since we want to develop for the Android platform, we need to be inside the `androidDev` devShell: + +```bash +nix develop .#androidDev +``` + +Run all the following commands inside this terminal shell. + +Before running the `android:network` command, make sure your Android device is connected to your computer via a USB cable and accessible to the tauri tooling by running: + +```bash +adb devices +``` + +You should see your device listed in the output of that command. + +**Also make sure that your Android device is in the same wifi network as your computer**. This is necessary for them to see each other and connect in a small holochain network. + +> [!NOTE] +> If you haven't setup your Android device yet, head over to [Android device setup](./device-setup) to do so. + +We are now ready to run the command: ::: code-group ```bash [npm] @@ -18,6 +41,12 @@ pnpm android:network ``` ::: +If you want to see logs coming from your rust backend, you can run this command: + ```bash -adb devices +adb logcat ``` + +--- + +That's it! Have fun while building your hApp. When you are satisfied with what you have and want to release a new production version of your app, go to [Building for Production](./building-for-production). diff --git a/docs/documentation/android/device-setup.md b/docs/documentation/android/device-setup.md new file mode 100644 index 00000000..973ed3a8 --- /dev/null +++ b/docs/documentation/android/device-setup.md @@ -0,0 +1,30 @@ +# Device Setup + +1. In your Android device, enable the [developer options](https://developer.android.com/studio/debug/dev-options). + +2. After you have enabled the developer options, [enable USB debbuging](https://developer.android.com/studio/debug/dev-options#Enable-debugging). + +3. Connect your Android device to your computer with a USB cable, and confirm in your Android device that you allow USB debugging from this computer. + +4. In the root folder of your repository, run: + +```bash +nix develop .#androidDev +``` + +This is a replacement command for the usual `nix develop`, which includes `Android Studio`, and all the necessary tooling that you need for Android development. Every time you want to test or build for the Android platform, you will need to enter the nix devShell this way and then your command from inside of it. + +> [!WARNING] +> The first time this is run, it will take some time. This is because nix has to download and build all the necessary Android tooling. After the first time, it will be almost instant. + +5. Inside your `androidDev` devShell, run: + +```bash +adb devices +``` + +If all the previous steps were successful, you should see your device in the list of devices. + +--- + +That's it! You can now take a look at [developing for Android](./developing) to know what commands to use when targeting Android. diff --git a/docs/documentation/android/setup.md b/docs/documentation/android/project-setup.md similarity index 61% rename from docs/documentation/android/setup.md rename to docs/documentation/android/project-setup.md index a5d6ba92..7fb12e88 100644 --- a/docs/documentation/android/setup.md +++ b/docs/documentation/android/project-setup.md @@ -1,4 +1,4 @@ -# Android Setup +# 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). @@ -87,49 +87,8 @@ dependencies { apply(from = "tauri.build.gradle.kts") ``` -3. In your Android device, enable the [developer options](https://developer.android.com/studio/debug/dev-options). - -4. After you have enabled the developer options, [enable USB debbuging](https://developer.android.com/studio/debug/dev-options#Enable-debugging). - -5. Connect your Android device to your computer with a USB cable, and confirm in your Android device that you allow USB debugging from this computer. - -6. In the root folder of your repository, run: - -```bash -nix develop .#androidDev -``` - -This is a replacement command for the usual `nix develop`, which includes `Android Studio`, and all the necessary tooling that you need for Android development. Every time you want to test or build for the Android platform, you will need to enter the nix devShell this way and then your command from inside of it. - -> [!WARNING] -> The first time this is run, it will take some time. This is because nix has to download and build all the necessary Android tooling. After the first time, it will be almost instant. - -7. Inside your `androidDev` devShell, run: - -```bash -adb devices -``` - -If all the previous steps were successful, you should see your device in the list of devices. - -8. Verify that everything is working by running the app for android with: - -::: code-group -```bash [npm] -npm run tauri android dev -``` - -```bash [yarn] -yarn tauri android dev -``` - -```bash [pnpm] -pnpm tauri android dev -``` -::: - --- -That's it! You have completed the setup for the Android platform. +That's it! Your project is now ready to develop for the Android platform. -Continue to [Android developing](./developing) to learn how to develop your app while targeting the Android platform. +Continue to [Device Setup](./device-setup) to learn how to setup an Android device for testing your hApp. diff --git a/docs/documentation/android/publishing.md b/docs/documentation/android/publishing.md deleted file mode 100644 index b3c38cf4..00000000 --- a/docs/documentation/android/publishing.md +++ /dev/null @@ -1,15 +0,0 @@ -# Publishing - -::: code-group -```bash [npm] -npm run tauri android build -``` - -```bash [yarn] -yarn tauri android build -``` - -```bash [pnpm] -pnpm tauri android build -``` -::: diff --git a/docs/documentation/getting-to-know-tauri.md b/docs/documentation/getting-to-know-tauri.md index 7bd9efae..962832c9 100644 --- a/docs/documentation/getting-to-know-tauri.md +++ b/docs/documentation/getting-to-know-tauri.md @@ -73,6 +73,9 @@ pnpm tauri icon ``` ::: +> [!WARNING] +> Until you run this command with your icon, your app won't compile. + - See all the available CLI commands with: ::: code-group @@ -97,7 +100,7 @@ After the initial set up and scaffolding, our tauri app can only be built for de ### Android Setup -Continue to the [Android setup](./android/setup). +Continue to the [Android setup](./android/project-setup). ### iOS Setup diff --git a/docs/documentation/how-to-create-a-holochain-runtime.md b/docs/documentation/how-to-create-a-holochain-runtime.md index 4e2e035f..d4a1038b 100644 --- a/docs/documentation/how-to-create-a-holochain-runtime.md +++ b/docs/documentation/how-to-create-a-holochain-runtime.md @@ -23,6 +23,9 @@ And follow along its instructions and prompts. That's it! We now have a working skeleton for a holochain runtime. +> [!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. + ## Development Environment The `scaffold-holochain-apps` has added the necessary nix `devShells` to your `flake.nix` file so that you don't need to follow install anything to get the tauri or Android development environment. diff --git a/docs/documentation/how-to-create-an-executable-happ.md b/docs/documentation/how-to-create-an-executable-happ.md index 528c8bf3..caf5367a 100644 --- a/docs/documentation/how-to-create-an-executable-happ.md +++ b/docs/documentation/how-to-create-an-executable-happ.md @@ -32,6 +32,7 @@ This will execute all the required steps to convert your previously scaffolded h - `flake.nix`: added the `tauri-plugin-holochain` input and its `devShells`. - `package.json`: added set up scripts and some `devDependencies`. +- `ui/vite.config.ts`: set the server configuration necessary for tauri. - `src-tauri`: here is where the code for the backend of the tauri app lives. - The tauri app will just use the UI that the scaffolding tool produced as its own UI. @@ -42,6 +43,9 @@ This will execute all the required steps to convert your previously scaffolded h That's it! We now have a fully functional end-user executable 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. + ## Development Environment The `scaffold-tauri-app` has added the necessary nix `devShells` to your `flake.nix` file so that you don't need to follow install anything to get the tauri or Android development environment. diff --git a/docs/documentation/troubleshooting.md b/docs/documentation/troubleshooting.md index 6f2fa7d0..7ee38d73 100644 --- a/docs/documentation/troubleshooting.md +++ b/docs/documentation/troubleshooting.md @@ -1,3 +1,5 @@ +# OS + ## NixOS ### Connect to devices diff --git a/examples/holochain-runtime/package.json b/examples/holochain-runtime/package.json index 92a06c7a..51610f28 100644 --- a/examples/holochain-runtime/package.json +++ b/examples/holochain-runtime/package.json @@ -4,10 +4,15 @@ "version": "0.0.0", "type": "module", "scripts": { + "start": "AGENTS=2 npm run network", + "network": "npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm start -w ui\" \"npm run launch\"", + "launch": "concurrently-repeat \"npm run tauri dev\" $AGENTS", + "android:network": "BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm start -w ui\" \"npm run tauri dev\" \"npm run tauri android dev\"", + "local-services": "hc run-local-services --bootstrap-interface $INTERNAL_IP --bootstrap-port $BOOTSTRAP_PORT --signal-interfaces $INTERNAL_IP --signal-port $SIGNAL_PORT", "dev": "vite", "build": "tsc && vite build", "preview": "vite preview", - "tauri": "BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) tauri" + "tauri": "tauri" }, "dependencies": { "@holochain/client": "^0.17.0-dev.12", @@ -22,4 +27,4 @@ "vite": "^5.0.0", "typescript": "^5.0.2" } -} \ No newline at end of file +} diff --git a/flake.lock b/flake.lock index dbe72038..f0f8ab98 100644 --- a/flake.lock +++ b/flake.lock @@ -582,11 +582,11 @@ "versions": "versions" }, "locked": { - "lastModified": 1716216524, - "narHash": "sha256-st6pM1riAHQHZ2LP3XSe+n4zXC2UuQYBm6sGn7wi2WU=", + "lastModified": 1716218653, + "narHash": "sha256-ME/CDiknkZ7Fm8cWI+SZiEn6s32Vpmibe9TBXwwsQRc=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "ff063754bffdbd1cae9466514008b48f90e909c9", + "rev": "8b14b15141b54cbacb83242bc4f1dcd819cee6b8", "type": "github" }, "original": {