Skip to content

Commit

Permalink
merge coonflicts solved
Browse files Browse the repository at this point in the history
  • Loading branch information
sstraatemans committed Oct 11, 2023
2 parents 529581f + 3fd3013 commit 12fc208
Show file tree
Hide file tree
Showing 732 changed files with 7,092 additions and 3,277 deletions.
2 changes: 2 additions & 0 deletions .changeset/brown-experts-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/chilly-peas-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/clever-crabs-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
27 changes: 27 additions & 0 deletions .changeset/curvy-beers-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
'@kadena/chainweb-stream-client': none
'@kadena/chainweb-node-client': none
'@kadena/cryptography-utils': none
'@kadena/immutable-records': none
'@kadena/pactjs-generator': none
'@kadena/react-components': none
'@kadena/client-examples': none
'@kadena-dev/markdown': none
'@kadena-dev/eslint-config': none
'@kadena-dev/eslint-plugin': none
'@kadena-dev/lint-package': none
'@kadena/graph-client': none
'@kadena/pactjs-cli': none
'@kadena/chainwebjs': none
'kadena.js': none
'@kadena/cookbook': none
'@kadena/react-ui': none
'@kadena/kda-cli': none
'@kadena/client': none
'@kadena/pactjs': none
'@kadena/graph': none
'@kadena/types': none
'@kadena/docs': none
---

Improve tooling config
2 changes: 2 additions & 0 deletions .changeset/eighty-colts-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/empty-roses-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/giant-lizards-push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
4 changes: 4 additions & 0 deletions .changeset/gold-poets-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

Add requested 128 fav icon size
2 changes: 2 additions & 0 deletions .changeset/great-berries-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/healthy-insects-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/hip-crews-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/hungry-eels-tie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/kind-books-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/kind-pears-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/docs': minor
---

check for links to old docs websites
2 changes: 2 additions & 0 deletions .changeset/kind-snails-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/lovely-boxes-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/lucky-flies-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/nasty-dancers-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/nine-berries-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/nine-fireants-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Added variant and inline props to Notification component
5 changes: 5 additions & 0 deletions .changeset/old-trains-pretend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/docs': minor
---

fix the render of sidemenu with hydration issues
2 changes: 2 additions & 0 deletions .changeset/rude-apes-battle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/short-clouds-clap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/silver-falcons-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
13 changes: 13 additions & 0 deletions .changeset/small-singers-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'@kadena/chainweb-stream-client': minor
'@kadena/chainweb-node-client': minor
'@kadena/cryptography-utils': minor
'@kadena/pactjs-generator': minor
'@kadena/chainwebjs': minor
'@kadena/client': minor
'@kadena/pactjs': minor
'@kadena/types': minor
'@kadena/docs': minor
---

Generate provenance statement during npm publish
2 changes: 2 additions & 0 deletions .changeset/smart-readers-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/soft-jokes-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/tasty-emus-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
4 changes: 4 additions & 0 deletions .changeset/tender-mice-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

Added K icons to be used in the applications
5 changes: 5 additions & 0 deletions .changeset/tender-suits-punch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Added responsiveStyle and mapToProperty styling utility functions
2 changes: 2 additions & 0 deletions .changeset/thin-rabbits-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/three-shrimps-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Add max-width to notification content
2 changes: 2 additions & 0 deletions .changeset/tough-trainers-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/unlucky-sheep-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/docs': minor
---

add a 404 page
2 changes: 2 additions & 0 deletions .changeset/wicked-deers-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/packages/apps/kadena-docs @sstraatemans @eileenmguo @realdreamer
/packages/libs/chainweb-stream-client @Takadenoshi
/packages/libs/bootstrap-lib @alber70g
/packages/libs/client @alber70g @javadkh2 @webpro
/packages/libs/client @alber70g @javadkh2
/packages/libs/kadena.js @alber70g
/packages/libs/pactjs-generator @alber70g
/packages/libs/react-ui @eileenmguo @sstraatemans @timoheddes
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/chromatic-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ jobs:
projectToken: ${{ secrets.DOCS_CHROMATIC_TOKEN }}
workingDir: /packages/apps/docs
autoAcceptChanges: 'main'
onlyChanged: true # 👈 Required option to enable TurboSnap
1 change: 1 addition & 0 deletions .github/workflows/chromatic-react-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ jobs:
projectToken: ${{ secrets.REACT_UI_CHROMATIC_TOKEN }}
workingDir: /packages/libs/react-ui
autoAcceptChanges: 'main'
onlyChanged: true # 👈 Required option to enable TurboSnap
36 changes: 36 additions & 0 deletions .github/workflows/docs-ingestion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Docs website data ingestion to Algolia for semantic search

on:
push:
branches:
- main
paths:
- packages/apps/docs/**

jobs:
ingestion:
name: Ingestion docs website data to Algolia
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
show-progress: false

- uses: actions/setup-node@v3
with:
node-version: 20

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

- name: pnpm install
run: pnpm install

- name: Ingest docs to Algolia
run: pnpm run 7d:ingest-algolia-prod
working-directory: packages/apps/docs
env:
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
ALGOLIA_INDEX_NAME: docs_website_prod
44 changes: 44 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Integration Tests
on:
pull_request:
workflow_dispatch:
push:
branches:
- main

jobs:
kadena-client:
runs-on: ubuntu-latest

services:
devnet:
image: kadena/devnet
options: >-
--memory 7g
--cpus 2
--health-cmd "curl --verbose --fail http://localhost:8080/info || exit 1"
ports:
- 8080:8080

steps:
- uses: actions/checkout@v4
with:
show-progress: false

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

- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Build client and dependencies
run: pnpm run build --filter @kadena/client

- name: run integration tests
run: pnpm run test:integration --filter @kadena/client
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
name: Changelog PR or Release
if: ${{ github.repository_owner == 'kadena-community' }}
runs-on: ubuntu-latest
permissions:
id-token: write
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
Expand Down Expand Up @@ -56,6 +58,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.RELEASE_ACTION_GITHUB_TOKEN }}
# Needs r+w access for packages of both orgs to publish to npm
NPM_TOKEN: ${{ secrets.RELEASE_ACTION_NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true

- name: Output (debug)
if: steps.changesets.outputs.published == 'true'
Expand Down
22 changes: 13 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,18 @@ to coding standards. We try to automate and auto-fix as much as possible using
the following commands:

```sh
pnpm build # Compile & build (using TypeScript)
pnpm lint # Lint
pnpm format # Format
pnpm build
pnpm lint
pnpm format
```

Note that lint and format are separated tasks (read more at [linting vs
formatting][10]).

Run from root to apply to all packages, use `--filter` for a selection, and run
from any package folder to apply it only there.

See [Filters][10] for more details.
See [Filters][11] for more details.

For everything else, please discuss.

Expand All @@ -145,8 +148,8 @@ To publish a new version of updated packages, please make sure you:
- have push rights to this repository's `main` branch
- are on a clean `main` branch

We're using [Changesets][11] for our release process. The manual process in [How
do I run the version and publish commands?][12] is what we use and repeat here:
We're using [Changesets][12] for our release process. The manual process in [How
do I run the version and publish commands?][13] is what we use and repeat here:

1. Check out and pull `main`
2. Update changelogs and bump versions
Expand Down Expand Up @@ -185,7 +188,8 @@ git push --tags
https://lirantal.com/blog/introducing-changesets-simplify-project-versioning-with-semantic-releases/
[8]: https://rushjs.io/pages/best_practices/change_logs
[9]: .changeset/config.json
[10]: ./docs/pnpm-turbo-filter.md
[11]: https://github.com/changesets/changesets
[12]:
[10]: ./docs/lint-vs-format.md
[11]: ./docs/pnpm-turbo-filter.md
[12]: https://github.com/changesets/changesets
[13]:
https://github.com/changesets/changesets/blob/main/docs/automating-changesets.md#how-do-i-run-the-version-and-publish-commands
Binary file added common/images/icons/community/icon@128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@168.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/community/icon@96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@168.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/dark/icon@96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/light/icon@128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added common/images/icons/internal/light/icon@144.png
Binary file added common/images/icons/internal/light/icon@16.png
Binary file added common/images/icons/internal/light/icon@168.png
Binary file added common/images/icons/internal/light/icon@192.png
Binary file added common/images/icons/internal/light/icon@24.png
Binary file added common/images/icons/internal/light/icon@32.png
Binary file added common/images/icons/internal/light/icon@40.png
Binary file added common/images/icons/internal/light/icon@48.png
Binary file added common/images/icons/internal/light/icon@512.png
Binary file added common/images/icons/internal/light/icon@72.png
Binary file added common/images/icons/internal/light/icon@96.png
Loading

0 comments on commit 12fc208

Please sign in to comment.