Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 29 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ name = "holochain_scaffolding_cli"
path = "src/lib.rs"

[dependencies]
holochain_types = "0.6.0"
mr_bundle = "0.6.0"
holochain_types = "0.7.0-dev.11"
mr_bundle = "0.7.0-dev.0"

dirs = "6.0"
ignore = "0.4"
Expand Down
40 changes: 11 additions & 29 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/versions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.21.0-dev.2";

/// npm: <https://www.npmjs.com/package/@holochain/hc-spin>
pub const HC_SPIN_VERSION: &str = "^0.700.0-dev.0";
pub const HC_SPIN_VERSION: &str = "^0.700.0-dev.1";

/// crates.io <https://crates.io/crates/hdi/versions>
pub const HDI_VERSION: &str = "0.8.0-dev.4";
Expand All @@ -11,4 +11,4 @@ pub const HDI_VERSION: &str = "0.8.0-dev.4";
pub const HDK_VERSION: &str = "0.7.0-dev.6";

/// crates.io <https://crates.io/crates/holochain/versions>
pub const HOLOCHAIN_VERSION: &str = "0.7.0-dev.9";
pub const HOLOCHAIN_VERSION: &str = "0.7.0-dev.12";
3 changes: 0 additions & 3 deletions templates/generic/web-app/README.md.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ nix develop
```

This will create a network of 2 nodes connected to each other and their respective UIs.
It will also bring up the Holochain Playground for advanced introspection of the conductors.

## Running the backend tests

Expand All @@ -37,7 +36,6 @@ AGENTS=3 {{(package_manager_command "network" null)}}
```

Substitute the "3" for the number of nodes that you want to bootstrap in your network.
This will also bring up the Holochain Playground for advanced introspection of the conductors.

## Packaging

Expand All @@ -55,4 +53,3 @@ This repository is using these tools:
- [NPM Workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces/): npm v7's built-in monorepo capabilities.
- [hc](https://github.com/holochain/holochain/tree/develop/crates/hc): Holochain CLI to easily manage Holochain development instances.
- [@holochain/client](https://www.npmjs.com/package/@holochain/client): client library to connect to Holochain from the UI.
- [hc playground](https://github.com/darksoil-studio/holochain-playground): introspection tooling to understand what's going on in the Holochain nodes.
4 changes: 2 additions & 2 deletions templates/generic/web-app/package.json.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"private": true,
"workspaces": ["ui"],
"scripts": {
"start": "AGENTS=${AGENTS:-2} BOOTSTRAP_PORT=$(get-port) {{(package_manager_command "network" null)}}",
"network": "hc sandbox clean && {{(package_manager_command "build:happ" null)}} && UI_PORT=$(get-port) concurrently \"{{(package_manager_command "start" "ui")}}\" \"{{(package_manager_command "launch:happ" null)}}\" \"hc playground\"",
"start": "AGENTS=${AGENTS:-2} {{(package_manager_command "network" null)}}",
"network": "hc sandbox clean && {{(package_manager_command "build:happ" null)}} && UI_PORT=$(get-port) concurrently \"{{(package_manager_command "start" "ui")}}\" \"{{(package_manager_command "launch:happ" null)}}\"",
"test": "{{(package_manager_command "build:happ" null)}} && cargo test",
"launch:happ": "hc-spin -n $AGENTS --ui-port $UI_PORT workdir/{{app_name}}.happ",
"package": "{{(package_manager_command "build:happ" null)}} && {{(package_manager_command "package" "ui")}} && hc web-app pack workdir --recursive",
Expand Down