Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DApp UI & Server #421

Merged
merged 34 commits into from
Dec 6, 2023
Merged

Fix DApp UI & Server #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ca6f8b9
add new dapp logic
jdeepee Nov 21, 2023
007c64f
set run dapp server to true in ad4m launcher
jdeepee Nov 21, 2023
dcd02e9
switch to pnpm
jdeepee Nov 22, 2023
c6c2270
Add nohoist for core & dapp
fayeed Nov 22, 2023
c486dd5
Added patches through pnpm
fayeed Nov 22, 2023
69f5584
removed safe-buffer & safer-buffer patch
fayeed Nov 23, 2023
d30aa7a
Removed workspace key from core package.json
fayeed Nov 23, 2023
dd7fab0
Added new script to patch safe-buffer & saffer-buffer
fayeed Nov 23, 2023
d259dfd
switch dapp to use vite for build process and delete dead files
jdeepee Nov 23, 2023
ed20137
remove old rollup
jdeepee Nov 23, 2023
b92d983
replace all uses of yarn with pnpm
jdeepee Nov 23, 2023
08cdbf4
fix up dapp server file serving
jdeepee Nov 24, 2023
83e9339
use coasys import for holochain client
jdeepee Nov 24, 2023
0a8fc01
changelog
jdeepee Nov 24, 2023
2d6b291
remove prepare from ad4m-connect scripts
jdeepee Nov 24, 2023
47c80c2
fix typos in executor
jdeepee Nov 24, 2023
bac34dd
add ts-node to executor dev deps
jdeepee Nov 24, 2023
99d103b
add lodash to dev deps in executor
jdeepee Nov 24, 2023
7de6585
add missing lock changes
jdeepee Nov 24, 2023
e413d2f
Improve dapp UI to be more automatic
leifriksheim Nov 28, 2023
137adb7
Merge branch 'fix-dapp' of https://github.com/coasys/ad4m into fix-dapp
leifriksheim Nov 28, 2023
ceeed80
use core to handle auth
leifriksheim Nov 28, 2023
31f0756
add updated proofs in state
leifriksheim Nov 28, 2023
e5215e0
show existing proofs
leifriksheim Nov 29, 2023
db414ba
add eas language to bootstrap languages
jdeepee Nov 29, 2023
e8e8a62
Merge branch 'fix-dapp' of github.com:perspect3vism/ad4m-executor int…
jdeepee Nov 29, 2023
9e2416f
add button in launcher to open dapp server
jdeepee Nov 29, 2023
92620da
update lock file
jdeepee Nov 29, 2023
6e55f55
fix ts
leifriksheim Nov 30, 2023
e04a146
Merge branch 'fix-dapp' of https://github.com/coasys/ad4m into fix-dapp
leifriksheim Nov 30, 2023
849e129
fix build?
leifriksheim Nov 30, 2023
abb84a4
refactor and add to profile option
leifriksheim Dec 4, 2023
fbef155
add new build-dapp command
jdeepee Dec 5, 2023
fdd0c6f
Merge branch 'dev' into fix-dapp
jdeepee Dec 6, 2023
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
10 changes: 7 additions & 3 deletions .github/workflows/agent-language-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,17 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/agent-language/hc-dna/zomes/tests && yarn install && yarn run test
- run: pnpm run build-languages
- run: cd bootstrap-languages/agent-language/hc-dna/zomes/tests && pnpm install && pnpm run test
10 changes: 7 additions & 3 deletions .github/workflows/direct-message-language-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,17 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/direct-message-language/hc-dna/tests && yarn install && yarn run test
- run: pnpm run build-languages
- run: cd bootstrap-languages/direct-message-language/hc-dna/tests && pnpm install && pnpm run test
16 changes: 10 additions & 6 deletions .github/workflows/file-storage-language-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/file-storage/hc-dna/tests && yarn install && yarn run test
- run: pnpm run build-languages
- run: cd bootstrap-languages/file-storage/hc-dna/tests && pnpm install && pnpm run test

integration:
name: Integration Test
Expand Down Expand Up @@ -92,13 +92,17 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build
- run: cd bootstrap-languages/file-storage && yarn run integration-test
- run: pnpm run build
- run: cd bootstrap-languages/file-storage && pnpm run integration-test
12 changes: 8 additions & 4 deletions .github/workflows/integration_cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
Expand All @@ -62,11 +66,11 @@ jobs:
- name: Install HC
run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"

- name: Yarn Install
run: yarn install
- name: pnpm Install
run: pnpm install

- name: Yarn Build (builds entire workspace)
run: yarn build
- name: pnpm Build (builds entire workspace)
run: pnpm build

- name: Run binaries test script
run: ./tests/bats/bin/bats tests/binaries.bats || cat ~/Library/Logs/DiagnosticReports/*
Expand Down
29 changes: 16 additions & 13 deletions .github/workflows/integration_js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -66,10 +69,10 @@ jobs:
run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"

- name: Install dependencies
run: yarn install
run: pnpm install

- name: Build the workspace
run: yarn run build
run: pnpm run build

- uses: actions/cache/save@v3
if: always()
Expand All @@ -83,10 +86,10 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}

- name: Run the tests
run: yarn test
run: pnpm test

# - name: Run integration tests
# run: cd ./tests/js && yarn run test-main
# run: cd ./tests/js && pnpm run test-main

# test-windows:
# name: JS Ad4mClient <> AD4M Executor - Windows
Expand Down Expand Up @@ -120,18 +123,18 @@ jobs:
# uses: actions/setup-node@v2
# with:
# node-version: ${{ matrix.node-version }}
# cache: 'yarn'
# cache: 'pnpm'

# - name: Install Deno
# uses: denoland/setup-deno@v1
# with:
# deno-version: v1.32.4

# - name: Install dependencies
# run: yarn install
# run: pnpm install

# - name: Build the workspace
# run: yarn run build
# run: pnpm run build

# - uses: actions/cache/save@v3
# if: always()
Expand All @@ -148,7 +151,7 @@ jobs:
# run: |
# choco install swi-prolog
# $env:path += ";C:\Program Files\swipl\bin"
# yarn run test:windows
# pnpm run test:windows

# test-macos:
# name: JS Ad4mClient <> AD4M Executor - MacOS
Expand All @@ -166,7 +169,7 @@ jobs:
# uses: actions/setup-node@v2
# with:
# node-version: ${{ matrix.node-version }}
# cache: 'yarn'
# cache: 'pnpm'

# - name: Cache cargo
# id: cache-cargo
Expand All @@ -190,10 +193,10 @@ jobs:
# deno-version: v1.32.4

# - name: Install dependencies
# run: yarn install
# run: pnpm install

# - name: Build the workspace
# run: yarn run build
# run: pnpm run build

# - uses: actions/cache/save@v3
# if: always()
Expand All @@ -207,4 +210,4 @@ jobs:
# key: $${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}

# - name: Run the tests
# run: yarn test
# run: pnpm test
72 changes: 45 additions & 27 deletions .github/workflows/p-diff-sync-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-pull
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-pull

render:
name: Render Test
Expand Down Expand Up @@ -118,18 +121,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-render
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-render

revisions:
name: Revisions Test
Expand Down Expand Up @@ -164,18 +170,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-revisions
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-revisions

signals:
name: Signals Test
Expand Down Expand Up @@ -210,18 +219,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-signals
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-signals


stress:
Expand Down Expand Up @@ -257,18 +269,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-stress
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-stress

telepresence:
name: Telepresence
Expand Down Expand Up @@ -303,18 +318,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4

- run: rustup target add wasm32-unknown-unknown
- run: yarn install
- run: pnpm install
- run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
- run: yarn run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-telepresence
- run: pnpm run build-languages
- run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-telepresence

# integration:
# name: Integration Test
Expand Down Expand Up @@ -357,7 +375,7 @@ jobs:
# deno-version: v1.32.4

# - run: rustup target add wasm32-unknown-unknown
# - run: yarn install
# - run: pnpm install
# - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
# - run: yarn run build
# - run: cd bootstrap-languages/p-diff-sync && yarn run integration-test
# - run: pnpm run build
# - run: cd bootstrap-languages/p-diff-sync && pnpm run integration-test
Loading
Loading