chore: bump weekly to holochain 0.5.0 dev.20 (#455)

* Bump versions * nix flake update * Bump holochain_types * Pin holo-server-bin version to most recent working version * Unpin holo-dev-server-bin * Update ci workflow * Bump to 0.5.0-dev.17 * Nix flake update * ci: Add `ci_pass` job (#454) * ci: Add `ci_pass` job * ci: Rename develop to main * Fix lit template ts error (#448) * fix: wrongly used v-if directive (#457) * Fix incorrect usage of v-if directive * Fix vue-ts type error on current record prop * Check both editing and record * Bump to dev.18 * Nix flake update * Remove test retries * Bump versions * Nix flake update * Fix signal usage * Bump tryorama * Bump dep versions * Nix flake update * Update enum usage in tests * Fix slow tests * Update app bundle sources --------- Co-authored-by: ThetaSinner <[email protected]>
holochain · Mar 3, 2025 · d35cdaf · d35cdaf
1 parent c276d08
commit d35cdaf
Show file tree

Hide file tree

Showing 28 changed files with 461 additions and 500 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "holochain_scaffolding_cli"
-version = "0.500.0-dev.5"
+version = "0.500.0-dev.6"
 description = "CLI to easily generate and modify holochain apps"
 license = "CAL-1.0"
 homepage = "https://developer.holochain.org"
@@ -18,8 +18,8 @@ name = "holochain_scaffolding_cli"
 path = "src/lib.rs"
 
 [dependencies]
-holochain_types = "0.5.0-dev.13"
-mr_bundle = "0.5.0-dev.1"
+holochain_types = "0.5.0-dev.20"
+mr_bundle = "0.5.0-dev.5"
 
 dirs = "5.0.1"
 ignore = "0.4"

diff --git a/flake.lock b/flake.lock
diff --git a/src/versions.rs b/src/versions.rs
@@ -1,8 +1,8 @@
 /// npm: <https://www.npmjs.com/package/@holochain/tryorama>
-pub const TRYORAMA_VERSION: &str = "^0.18.0-dev.3";
+pub const TRYORAMA_VERSION: &str = "^0.18.0-dev.5";
 
 /// npm: <https://www.npmjs.com/package/@holochain/client>
-pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.19.0-dev.6";
+pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.19.0-dev.7";
 
 /// npm: <https://www.npmjs.com/package/@holochain/hc-spin>
 pub const HC_SPIN_VERSION: &str = "^0.500.0-dev.0";
@@ -11,13 +11,13 @@ pub const HC_SPIN_VERSION: &str = "^0.500.0-dev.0";
 pub const WEB_SDK_VERSION: &str = "^0.6.20-prerelease";
 
 /// crates.io <https://crates.io/crates/hdi/versions>
-pub const HDI_VERSION: &str = "0.6.0-dev.9";
+pub const HDI_VERSION: &str = "0.6.0-dev.15";
 
 /// crates.io <https://crates.io/crates/hdk/versions>
-pub const HDK_VERSION: &str = "0.5.0-dev.12";
+pub const HDK_VERSION: &str = "0.5.0-dev.19";
 
 /// crates.io <https://crates.io/crates/holochain/versions>
-pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.13";
+pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.20";
 
 /// source: <https://github.com/darksoil-studio/holochain-playground/tree/main/packages/cli/server>
 ///

diff --git a/...role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs b/...role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs
@@ -22,7 +22,8 @@ test('create a {{pascal_case referenceable.name}} and get {{lower_case collectio
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
     // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.

diff --git a/...role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs b/...role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs
@@ -24,8 +24,9 @@ test('create {{pascal_case entry_type.name}}', async () => {
     // This assumes app bundle created by the `hc app pack` command.
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
-    // Set up the app to be installed 
-    const appSource = { appBundleSource: { path: testAppPath } };
+    // Set up the app to be installed
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.
@@ -47,8 +48,9 @@ test('create and read {{pascal_case entry_type.name}}', async () => {
     // This assumes app bundle created by the `hc app pack` command.
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
-    // Set up the app to be installed 
-    const appSource = { appBundleSource: { path: testAppPath } };
+    // Set up the app to be installed
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.
@@ -99,8 +101,9 @@ test('create and update {{pascal_case entry_type.name}}', async () => {
     // This assumes app bundle created by the `hc app pack` command.
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
-    // Set up the app to be installed 
-    const appSource = { appBundleSource: { path: testAppPath } };
+    // Set up the app to be installed
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.
@@ -113,9 +116,9 @@ test('create and update {{pascal_case entry_type.name}}', async () => {
     // Alice creates a {{pascal_case entry_type.name}}
     const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0]);
     assert.ok(record);
-        
+
     const originalActionHash = record.signed_action.hashed.hash;
- 
+
     // Alice updates the {{pascal_case entry_type.name}}
     let contentUpdate: any = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
     let updateInput = {
@@ -135,7 +138,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => {
 
     // Wait for the updated entry to be propagated to the other node.
     await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-        
+
     // Bob gets the updated {{pascal_case entry_type.name}}
     const readUpdatedOutput0: Record = await bob.cells[0].callZome({
       zome_name: "{{coordinator_zome_manifest.name}}",
@@ -146,7 +149,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => {
 
     // Alice updates the {{pascal_case entry_type.name}} again
     contentUpdate = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
-    updateInput = { 
+    updateInput = {
 {{#if link_from_original_to_each_update}}
       original_{{snake_case entry_type.name}}_hash: originalActionHash,
 {{/if}}
@@ -163,7 +166,7 @@ test('create and update {{pascal_case entry_type.name}}', async () => {
 
     // Wait for the updated entry to be propagated to the other node.
     await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-        
+
     // Bob gets the updated {{pascal_case entry_type.name}}
     const readUpdatedOutput1: Record = await bob.cells[0].callZome({
       zome_name: "{{coordinator_zome_manifest.name}}",
@@ -191,8 +194,9 @@ test('create and delete {{pascal_case entry_type.name}}', async () => {
     // This assumes app bundle created by the `hc app pack` command.
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
-    // Set up the app to be installed 
-    const appSource = { appBundleSource: { path: testAppPath } };
+    // Set up the app to be installed
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.
@@ -235,15 +239,15 @@ test('create and delete {{pascal_case entry_type.name}}', async () => {
 
     // Wait for the entry deletion to be propagated to the other node.
     await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-        
+
     // Bob gets the oldest delete for the {{pascal_case entry_type.name}}
     const oldestDeleteFor{{pascal_case entry_type.name}}: SignedActionHashed = await bob.cells[0].callZome({
       zome_name: "{{coordinator_zome_manifest.name}}",
       fn_name: "get_oldest_delete_for_{{snake_case entry_type.name}}",
       payload: record.signed_action.hashed.hash,
     });
     assert.ok(oldestDeleteFor{{pascal_case entry_type.name}});
-        
+
     // Bob gets the deletions for the {{pascal_case entry_type.name}}
     const deletesFor{{pascal_case entry_type.name}}: SignedActionHashed[] = await bob.cells[0].callZome({
       zome_name: "{{coordinator_zome_manifest.name}}",
@@ -263,7 +267,7 @@ test('create and delete {{pascal_case entry_type.name}}', async () => {
     });
     assert.equal(linksTo{{pascal_case (plural linked_from.name)}}.length, 0);
 
-    // Bob gets the deleted {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}} 
+    // Bob gets the deleted {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}}
     const deletedLinksTo{{pascal_case (plural linked_from.name)}}: Array<[SignedActionHashed<CreateLink>, SignedActionHashed<DeleteLink>[]]> = await bob.cells[0].callZome({
       zome_name: "{{../coordinator_zome_manifest.name}}",
       fn_name: "get_deleted_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}",
@@ -276,4 +280,4 @@ test('create and delete {{pascal_case entry_type.name}}', async () => {
 
   });
 });
-{{/if}}
+{{/if}}
diff --git a/..._referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{¡if}}.hbs b/..._referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{¡if}}.hbs
@@ -35,7 +35,8 @@ test('link a {{pascal_case from_referenceable.name}} to a {{pascal_case to_refer
     const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
 
     // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
+    const appBundleSource: AppBundleSource = { type: "path", value: testAppPath };
+    const appSource = { appBundleSource };
 
     // Add 2 players with the test app to the Scenario. The returned players
     // can be destructured.

diff --git a/templates/generic/web-app/tests/package.json.hbs b/templates/generic/web-app/tests/package.json.hbs
@@ -10,7 +10,7 @@
     "@holochain/client": "{{holochain_client_version}}",
     "@holochain/tryorama": "{{tryorama_version}}",
     "typescript": "^4.9.4",
-    "vitest": "^3.0.5"
+    "vitest": "^3.0.7"
   },
   "type": "module"
 }
diff --git a/templates/generic/web-app/tests/vitest.config.ts.hbs b/templates/generic/web-app/tests/vitest.config.ts.hbs
@@ -2,10 +2,9 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
-    retry: 3,
-    testTimeout: 60*1000*6, // 6 mins
+    testTimeout: 60*1000*4, // 4 mins
     poolOptions: {
-      threads: { singleThread: true },
+      forks: { singleFork: true }, 
     },
   },
 })
diff --git a/...{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs b/...{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs
@@ -1,6 +1,6 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
-import { AppClient, AgentPubKey, Link, EntryHash, ActionHash, Record, NewEntryAction, SignalType } from '@holochain/client';
+import { AppClient, AgentPubKey, Link, EntryHash, ActionHash, Record, NewEntryAction } from '@holochain/client';
 import { consume } from '@lit/context';
 import { Task } from '@lit/task';
 
@@ -40,9 +40,9 @@ export class {{pascal_case collection_name}} extends LitElement {
 {{/if}}
 
     this.client?.on('signal', signal => {
-      if (!(SignalType.App in signal)) return;
-      if (signal.App.zome_name !== '{{coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
+      if (signal.type !== "app") return;
+      if (signal.value.zome_name !== '{{coordinator_zome_manifest.name}}') return;
+      const payload = signal.value.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
       if (payload.type !== 'EntryCreated') return;
       if (payload.app_entry.type !== '{{pascal_case referenceable.name}}') return;
 {{#if (eq collection_type.type "ByAuthor")}}

diff --git a/... (plural ..¡entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{¡if}}{{¡each}}.hbs b/... (plural ..¡entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{¡if}}{{¡each}}.hbs
@@ -1,6 +1,6 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
-import { InstalledCell, Record, Link, AppClient, EntryHash, ActionHash, AgentPubKey, SignalType } from '@holochain/client';
+import { InstalledCell, Record, Link, AppClient, EntryHash, ActionHash, AgentPubKey } from '@holochain/client';
 import { consume } from '@lit/context';
 import { Task } from '@lit/task';
 
@@ -36,9 +36,9 @@ export class {{pascal_case (plural ../entry_type.name)}}For{{pascal_case linked_
     }
 
     this.client?.on('signal', signal => {
-      if (!(SignalType.App in signal)) return;
-      if (signal.App.zome_name !== '{{../coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case ../coordinator_zome_manifest.name}}Signal;
+      if (signal.type !== "app") return;
+      if (signal.value.zome_name !== '{{../coordinator_zome_manifest.name}}') return;
+      const payload = signal.value.payload as {{pascal_case ../coordinator_zome_manifest.name}}Signal;
       if (!(payload.type === 'EntryCreated' && payload.app_entry.type === '{{pascal_case ../entry_type.name}}')) return;
       this._fetch{{pascal_case (plural ../entry_type.name)}}.run();
     })

diff --git a/...(plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{¡if}}.hbs b/...(plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{¡if}}.hbs
@@ -1,6 +1,6 @@
 import { LitElement, html } from 'lit';
 import { state, property, customElement } from 'lit/decorators.js';
-import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction, SignalType } from '@holochain/client';
+import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction } from '@holochain/client';
 import { consume } from '@lit/context';
 import { Task } from '@lit/task';
 
@@ -36,9 +36,9 @@ export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to
     }
 
     this.client?.on('signal', signal => {
-      if (!(SignalType.App in signal)) return;
-      if (signal.App.zome_name !== '{{coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
+      if (signal.type !== "app") return;
+      if (signal.value.zome_name !== '{{coordinator_zome_manifest.name}}') return;
+      const payload = signal.value.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
       if (payload.type !== 'LinkCreated') return;
       if (payload.link_type !== '{{pascal_case bidirectional}}') return;