Skip to content

Commit

Permalink
Updates for 0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillemcordoba
guillemcordoba committed Jun 20, 2024
1 parent 889c984 commit f6948cf
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 54 deletions.
28 changes: 14 additions & 14 deletions flake.lock
View file

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
inputs = {
holochain = {
url = "github:holochain/holochain";
inputs.versions.url = "github:holochain/holochain?dir=versions/0_3_rc";
inputs.versions.url = "github:holochain/holochain?dir=versions/0_3";
};

nixpkgs.follows = "holochain/nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion ...nator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/Cargo.toml.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{previous_file_content}}

[dev-dependencies]
fixt = "0.3.1-rc"
fixt = "0.3.1"
futures = { version = "0.3.1", default-features = false }
hdk = { workspace = true, features = ["encoding", "test_utils"] }
holochain = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion templates/app/web-app/package.json.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"package": "nix build -L .#{{app_name}}.meta.release -o workdir/{{app_name}}.happ && pnpm -F ui package && hc web-app pack workdir"
},
"devDependencies": {
"@holochain-playground/cli": "^0.300.0-rc",
"@holochain-playground/cli": "^0.300.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@eslint/js": "^8.0.0",
"concurrently": "^6.2.1",
Expand Down
6 changes: 3 additions & 3 deletions templates/app/web-app/tests/package.json.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
},
"dependencies": {
"@msgpack/msgpack": "^2.8.0",
"@holochain/client": "^0.17.0-rc",
"@holochain/client": "^0.17.0",
"@holochain/tryorama": "{{tryorama_version}}",
"@holochain-open-dev/signals": "^0.300.0-rc",
"@holochain-open-dev/utils": "^0.300.0-rc",
"@holochain-open-dev/signals": "^0.300.0",
"@holochain-open-dev/utils": "^0.300.0",
"typescript": "^5.4.5",
"vitest": "^1.4.0"
},
Expand Down
10 changes: 5 additions & 5 deletions templates/app/web-app/ui/package.json.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "ui",
"version": "0.0.0",
"type": "module",
"scripts": {
"start": "vite --port $UI_PORT --clearScreen false",
"build": "vite build",
Expand All @@ -11,10 +12,10 @@
"localize:build": "lit-localize build"
},
"dependencies": {
"@holochain/client": "^0.17.0-rc",
"@holochain-open-dev/elements": "^0.300.0-rc.3",
"@holochain-open-dev/signals": "^0.300.0-rc",
"@holochain-open-dev/utils": "^0.300.0-rc",
"@holochain/client": "^0.17.0",
"@holochain-open-dev/elements": "^0.300.0",
"@holochain-open-dev/signals": "^0.300.0",
"@holochain-open-dev/utils": "^0.300.0",
"@lit/context": "^1.0.0",
"@lit/localize": "^0.12.0",
"@mdi/js": "^7.2.0",
Expand All @@ -30,7 +31,6 @@
"typescript": "^5.4.5",
"tslib": "^2.6.2",
"vite": "^4.0.0",
"vite-plugin-checker": "^0.5.3",
"vite-plugin-static-copy": "^0.13.0"
}
}
1 change: 1 addition & 0 deletions templates/app/web-app/ui/src/app-styles.ts.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { css } from 'lit';
import { sharedStyles } from '@holochain-open-dev/elements';

export const appStyles = [
css`
Expand Down
2 changes: 1 addition & 1 deletion templates/app/web-app/ui/src/holochain-app.ts.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import '@shoelace-style/shoelace/dist/components/icon-button/icon-button.js';

import { rootRouterContext } from './context.js';
import { appStyles } from './app-styles.js';
import './home-page.ts';
import './home-page.js';

@localized()
@customElement('holochain-app')
Expand Down
6 changes: 3 additions & 3 deletions templates/app/web-app/ui/src/home-page.ts.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Router, Routes } from "@holochain-open-dev/elements";
import { AsyncResult, SignalWatcher } from "@holochain-open-dev/signals";
import { ProfilesStore, profilesStoreContext } from "@holochain-open-dev/profiles";
import { LitElement, css, html } from "lit";
import { customElement } from "lit/decorators.js";
import { customElement, property } from "lit/decorators.js";
import { EntryRecord } from "@holochain-open-dev/utils";
import { consume } from "@lit/context";
import { msg } from "@lit/localize";
Expand All @@ -21,7 +21,7 @@ export class HomePage extends SignalWatcher(LitElement) {
/**
* @internal
*/
@consume({ context: routerContext, subscribe: true })
@consume({ context: rootRouterContext, subscribe: true })
rootRouter!: Router;

/**
Expand Down Expand Up @@ -71,7 +71,7 @@ export class HomePage extends SignalWatcher(LitElement) {
style="align-items: center;"
slot="actionItems"
>
<agent-avatar .agentPubKey=${this._client.myPubKey}></agent-avatar>
<agent-avatar .agentPubKey=${this._profilesStore.client.client.myPubKey}></agent-avatar>
<span style="margin: 0 16px;">${myProfile.value?.entry.nickname}</span>
</div>`;
}
Expand Down
7 changes: 0 additions & 7 deletions templates/app/web-app/ui/vite.config.ts.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
import { defineConfig } from "vite";
import checker from "vite-plugin-checker";
import path from "path";
import { viteStaticCopy } from "vite-plugin-static-copy";

export default defineConfig({
plugins: [
checker({
typescript: true,
eslint: {
lintCommand: "eslint src",
},
}),
viteStaticCopy({
targets: [
{
Expand Down
2 changes: 1 addition & 1 deletion ...nator-zome/dnas/{{dna_role_name}}/zomes/coordinator/{{zome_manifest.name}}/Cargo.toml.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{previous_file_content}}

[dev-dependencies]
fixt = "0.3.1-rc"
fixt = "0.3.1"
futures = { version = "0.3.1", default-features = false }
hdk = { workspace = true, features = ["encoding", "test_utils"] }
holochain = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion templates/zome/web-app/docs/package.json.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"devDependencies": {
"@api-viewer/demo": "1.0.0-pre.10",
"@api-viewer/docs": "1.0.0-pre.10",
"@holochain/client": "^0.17.0-rc",
"@holochain/client": "^0.17.0",
"@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#nixify&path:ui",
"@holochain-open-dev/{{kebab_case app_name}}": "workspace:*",
"@shoelace-style/shoelace": "^2.11.0",
Expand Down
6 changes: 3 additions & 3 deletions templates/zome/web-app/tests/package.json.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
},
"dependencies": {
"@msgpack/msgpack": "^2.8.0",
"@holochain/client": "^0.17.0-rc",
"@holochain/client": "^0.17.0",
"@holochain/tryorama": "{{tryorama_version}}",
"@holochain-open-dev/signals": "^0.300.0-rc",
"@holochain-open-dev/utils": "^0.300.0-rc",
"@holochain-open-dev/signals": "^0.300.0",
"@holochain-open-dev/utils": "^0.300.0",
"typescript": "^5.4.5",
"vitest": "^1.4.0"
},
Expand Down
11 changes: 5 additions & 6 deletions templates/zome/web-app/ui/package.json.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"./locales/*": "./locales/*"
},
"dependencies": {
"@holochain/client": "^0.17.0-rc",
"@holochain-open-dev/elements": "^0.300.0-rc.2",
"@holochain/client": "^0.17.0",
"@holochain-open-dev/elements": "^0.300.0",
"@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#nixify&path:ui",
"@holochain-open-dev/signals": "^0.300.0-rc",
"@holochain-open-dev/utils": "^0.300.0-rc",
"@holochain-open-dev/signals": "^0.300.0",
"@holochain-open-dev/utils": "^0.300.0",
"@lit/context": "^1.0.0",
"@lit/localize": "^0.12.0",
"@mdi/js": "^7.2.0",
Expand All @@ -42,8 +42,7 @@
"@lit/localize-tools": "^0.6.3",
"typescript": "^5.4.5",
"tslib": "^2.6.2",
"vite": "^4.0.0",
"vite-plugin-checker": "^0.5.3"
"vite": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 0 additions & 6 deletions templates/zome/web-app/ui/vite.config.ts.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
// vite.config.js
import checker from "vite-plugin-checker";
import { defineConfig } from "vite";

export default defineConfig({
root: './demo',
plugins: [
checker({
typescript: true,
}),
],
});

2 changes: 1 addition & 1 deletion templates/zome/web-app/zomes/coordinator/{{snake_case app_name}}/Cargo.toml.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ serde = { workspace = true }
{{snake_case app_name}}_integrity = { path = "../../integrity/{{snake_case app_name}}", package = "{{snake_case app_name}}_integrity" }

[dev-dependencies]
fixt = "0.3.1-rc"
fixt = "0.3.1"
futures = { version = "0.3.1", default-features = false }
hdk = { workspace = true, features = ["encoding", "test_utils"] }
holochain = { workspace = true }
Expand Down

0 comments on commit f6948cf

Please sign in to comment.