Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
@arietrouw
arietrouw committed Dec 23, 2024
2 parents df02499 + ad3ea03 commit c471b0f
Show file tree
Hide file tree
Showing 119 changed files with 3,738 additions and 4,366 deletions.
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs
View file

Large diffs are not rendered by default.

89 changes: 89 additions & 0 deletions .yarn/versions/06a57a44.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
releases:
"@xyo-network/react-access-gate": minor
"@xyo-network/react-address": minor
"@xyo-network/react-address-history": minor
"@xyo-network/react-address-plugin": minor
"@xyo-network/react-address-render": minor
"@xyo-network/react-advertising": minor
"@xyo-network/react-aggregate-price-plugin": minor
"@xyo-network/react-app-settings": minor
"@xyo-network/react-appbar": minor
"@xyo-network/react-archivist": minor
"@xyo-network/react-block": minor
"@xyo-network/react-boundwitness-plugin": minor
"@xyo-network/react-card": minor
"@xyo-network/react-coin-gecko-prices-plugin": minor
"@xyo-network/react-connected-accounts": minor
"@xyo-network/react-crypto-market-uniswap-plugin": minor
"@xyo-network/react-crypto-prices-plugin": minor
"@xyo-network/react-default-plugin": minor
"@xyo-network/react-details-plugin": minor
"@xyo-network/react-diviner": minor
"@xyo-network/react-drawer": minor
"@xyo-network/react-elevation-map-quadkey-plugin": minor
"@xyo-network/react-embed": minor
"@xyo-network/react-error": minor
"@xyo-network/react-ethereum-gas-price-blocknative-plugin": minor
"@xyo-network/react-ethereum-gas-price-etherchain-plugins": minor
"@xyo-network/react-ethereum-gas-price-etherchain-v2-plugin": minor
"@xyo-network/react-ethereum-gas-price-ethers-plugin": minor
"@xyo-network/react-ethereum-gas-price-etherscan-plugin": minor
"@xyo-network/react-ethereum-gas-price-ethgasstation-plugin": minor
"@xyo-network/react-ethereum-gas-price-payload-plugins": minor
"@xyo-network/react-ethereum-gas-price-plugin": minor
"@xyo-network/react-event": minor
"@xyo-network/react-footer": minor
"@xyo-network/react-form": minor
"@xyo-network/react-form-credit-card": minor
"@xyo-network/react-form-group": minor
"@xyo-network/react-gas-price": minor
"@xyo-network/react-indexed-results": minor
"@xyo-network/react-location-heatmap-quadkey-plugin": minor
"@xyo-network/react-location-point-map-plugin": minor
"@xyo-network/react-location-points-map-plugin": minor
"@xyo-network/react-manifest": minor
"@xyo-network/react-map": minor
"@xyo-network/react-map-model": minor
"@xyo-network/react-module": minor
"@xyo-network/react-modules": minor
"@xyo-network/react-network": minor
"@xyo-network/react-nft-score-plugin": minor
"@xyo-network/react-node": minor
"@xyo-network/react-node-context": minor
"@xyo-network/react-node-provider": minor
"@xyo-network/react-node-renderer": minor
"@xyo-network/react-os": minor
"@xyo-network/react-payload": minor
"@xyo-network/react-payload-context": minor
"@xyo-network/react-payload-details": minor
"@xyo-network/react-payload-diviner": minor
"@xyo-network/react-payload-huri": minor
"@xyo-network/react-payload-plugin": minor
"@xyo-network/react-payload-plugin-resolver": minor
"@xyo-network/react-payload-raw-info": minor
"@xyo-network/react-payload-table": minor
"@xyo-network/react-pixel": minor
"@xyo-network/react-plugins": minor
"@xyo-network/react-pointer-plugin": minor
"@xyo-network/react-powered-by-xyo": minor
"@xyo-network/react-price-forecast-plugin": minor
"@xyo-network/react-property": minor
"@xyo-network/react-sample-node": minor
"@xyo-network/react-schema": minor
"@xyo-network/react-schema-plugin": minor
"@xyo-network/react-sdk": minor
"@xyo-network/react-sentinel": minor
"@xyo-network/react-share": minor
"@xyo-network/react-shared": minor
"@xyo-network/react-standard-node": minor
"@xyo-network/react-storybook": minor
"@xyo-network/react-table": minor
"@xyo-network/react-theme": minor
"@xyo-network/react-typedoc": minor
"@xyo-network/react-user-events": minor
"@xyo-network/react-wallet": minor
"@xyo-network/react-wallet-service": minor
"@xyo-network/react-webapp": minor
"@xyo-network/react-witness": minor
"@xyo-network/react-xns": minor
"@xyo-network/sdk-xyo-react": minor
89 changes: 89 additions & 0 deletions .yarn/versions/cadd1b64.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
releases:
"@xyo-network/react-access-gate": minor
"@xyo-network/react-address": minor
"@xyo-network/react-address-history": minor
"@xyo-network/react-address-plugin": minor
"@xyo-network/react-address-render": minor
"@xyo-network/react-advertising": minor
"@xyo-network/react-aggregate-price-plugin": minor
"@xyo-network/react-app-settings": minor
"@xyo-network/react-appbar": minor
"@xyo-network/react-archivist": minor
"@xyo-network/react-block": minor
"@xyo-network/react-boundwitness-plugin": minor
"@xyo-network/react-card": minor
"@xyo-network/react-coin-gecko-prices-plugin": minor
"@xyo-network/react-connected-accounts": minor
"@xyo-network/react-crypto-market-uniswap-plugin": minor
"@xyo-network/react-crypto-prices-plugin": minor
"@xyo-network/react-default-plugin": minor
"@xyo-network/react-details-plugin": minor
"@xyo-network/react-diviner": minor
"@xyo-network/react-drawer": minor
"@xyo-network/react-elevation-map-quadkey-plugin": minor
"@xyo-network/react-embed": minor
"@xyo-network/react-error": minor
"@xyo-network/react-ethereum-gas-price-blocknative-plugin": minor
"@xyo-network/react-ethereum-gas-price-etherchain-plugins": minor
"@xyo-network/react-ethereum-gas-price-etherchain-v2-plugin": minor
"@xyo-network/react-ethereum-gas-price-ethers-plugin": minor
"@xyo-network/react-ethereum-gas-price-etherscan-plugin": minor
"@xyo-network/react-ethereum-gas-price-ethgasstation-plugin": minor
"@xyo-network/react-ethereum-gas-price-payload-plugins": minor
"@xyo-network/react-ethereum-gas-price-plugin": minor
"@xyo-network/react-event": minor
"@xyo-network/react-footer": minor
"@xyo-network/react-form": minor
"@xyo-network/react-form-credit-card": minor
"@xyo-network/react-form-group": minor
"@xyo-network/react-gas-price": minor
"@xyo-network/react-indexed-results": minor
"@xyo-network/react-location-heatmap-quadkey-plugin": minor
"@xyo-network/react-location-point-map-plugin": minor
"@xyo-network/react-location-points-map-plugin": minor
"@xyo-network/react-manifest": minor
"@xyo-network/react-map": minor
"@xyo-network/react-map-model": minor
"@xyo-network/react-module": minor
"@xyo-network/react-modules": minor
"@xyo-network/react-network": minor
"@xyo-network/react-nft-score-plugin": minor
"@xyo-network/react-node": minor
"@xyo-network/react-node-context": minor
"@xyo-network/react-node-provider": minor
"@xyo-network/react-node-renderer": minor
"@xyo-network/react-os": minor
"@xyo-network/react-payload": minor
"@xyo-network/react-payload-context": minor
"@xyo-network/react-payload-details": minor
"@xyo-network/react-payload-diviner": minor
"@xyo-network/react-payload-huri": minor
"@xyo-network/react-payload-plugin": minor
"@xyo-network/react-payload-plugin-resolver": minor
"@xyo-network/react-payload-raw-info": minor
"@xyo-network/react-payload-table": minor
"@xyo-network/react-pixel": minor
"@xyo-network/react-plugins": minor
"@xyo-network/react-pointer-plugin": minor
"@xyo-network/react-powered-by-xyo": minor
"@xyo-network/react-price-forecast-plugin": minor
"@xyo-network/react-property": minor
"@xyo-network/react-sample-node": minor
"@xyo-network/react-schema": minor
"@xyo-network/react-schema-plugin": minor
"@xyo-network/react-sdk": minor
"@xyo-network/react-sentinel": minor
"@xyo-network/react-share": minor
"@xyo-network/react-shared": minor
"@xyo-network/react-standard-node": minor
"@xyo-network/react-storybook": minor
"@xyo-network/react-table": minor
"@xyo-network/react-theme": minor
"@xyo-network/react-typedoc": minor
"@xyo-network/react-user-events": minor
"@xyo-network/react-wallet": minor
"@xyo-network/react-wallet-service": minor
"@xyo-network/react-webapp": minor
"@xyo-network/react-witness": minor
"@xyo-network/react-xns": minor
"@xyo-network/sdk-xyo-react": minor
2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v3"

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/sdk-xyo-react",
"version": "4.2.14",
"version": "4.3.0-rc.2",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -47,7 +47,6 @@
"start": "storybook dev -p 6006"
},
"resolutions": {
"eslint": "9.14.0",
"ethers": "^6",
"typedoc": "0.26.3"
},
Expand All @@ -67,7 +66,7 @@
"devDependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@eslint-react/eslint-plugin": "^1.20.1",
"@eslint-react/eslint-plugin": "^1.22.0",
"@mui/icons-material": "^6.2.1",
"@mui/material": "^6.2.1",
"@mui/styles": "^6.2.1",
Expand All @@ -81,8 +80,8 @@
"@storybook/test": "^8.4.7",
"@storybook/theming": "^8.4.7",
"@stylistic/eslint-plugin": "^2.12.1",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.18.2",
"@typescript-eslint/parser": "^8.18.2",
"@vitejs/plugin-react-swc": "^3.7.2",
"@xylabs/eslint-config-flat": "^4.2.6",
"@xylabs/eslint-config-react-flat": "^4.2.6",
Expand All @@ -101,7 +100,7 @@
"storybook-dark-mode": "^4.0.2",
"typedoc": "^0.27.5",
"typescript": "^5.7.2",
"vite": "^6.0.4",
"vite": "^6.0.5",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-top-level-await": "^1.4.4",
"vite-tsconfig-paths": "^5.1.4",
Expand All @@ -111,7 +110,7 @@
"@emotion/react": "^11",
"@emotion/styled": "^11"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].3",
"volta": {
"node": "22.3.0",
"yarn": "1.22.22"
Expand All @@ -123,5 +122,6 @@
"devDep"
],
"docs": "dist/docs.json",
"resolutions_comment": "We set the above resolutions to make sure we pull in the latest versions of these packages even if some sub packages request earlier versions"
"resolutions_comment": "We set the above resolutions to make sure we pull in the latest versions of these packages even if some sub packages request earlier versions",
"stableVersion": "4.2.14"
}
5 changes: 3 additions & 2 deletions packages/modules/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-modules",
"version": "4.2.14",
"version": "4.3.0-rc.2",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -76,5 +76,6 @@
"publishConfig": {
"access": "public"
},
"docs": "dist/docs.json"
"docs": "dist/docs.json",
"stableVersion": "4.2.14"
}
29 changes: 15 additions & 14 deletions packages/modules/packages/archivist/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-archivist",
"version": "4.2.14",
"version": "4.3.0-rc.2",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -43,20 +43,20 @@
"lint-pkg": "npmPkgJsonLint ."
},
"dependencies": {
"@xylabs/exists": "^4.4.25",
"@xylabs/hex": "^4.4.25",
"@xylabs/exists": "^4.4.26",
"@xylabs/hex": "^4.4.26",
"@xylabs/react-async-effect": "^5.3.13",
"@xylabs/react-button": "^5.3.13",
"@xylabs/react-flexbox": "^5.3.13",
"@xylabs/react-promise": "^5.3.13",
"@xyo-network/archivist-memory": "^3.5.2",
"@xyo-network/archivist-model": "^3.5.2",
"@xyo-network/boundwitness-builder": "^3.5.2",
"@xyo-network/boundwitness-model": "^3.5.2",
"@xyo-network/module-events": "^3.5.2",
"@xyo-network/module-model": "^3.5.2",
"@xyo-network/module-wrapper": "^3.5.2",
"@xyo-network/payload-model": "^3.5.2",
"@xyo-network/archivist-memory": "^3.6.0",
"@xyo-network/archivist-model": "^3.6.0",
"@xyo-network/boundwitness-builder": "^3.6.0",
"@xyo-network/boundwitness-model": "^3.6.0",
"@xyo-network/module-events": "^3.6.0",
"@xyo-network/module-model": "^3.6.0",
"@xyo-network/module-wrapper": "^3.6.0",
"@xyo-network/payload-model": "^3.6.0",
"@xyo-network/react-module": "workspace:^",
"@xyo-network/react-node": "workspace:^",
"@xyo-network/react-wallet": "workspace:^",
Expand All @@ -69,8 +69,8 @@
"@storybook/react": "^8.4.7",
"@xylabs/ts-scripts-yarn3": "^4.2.6",
"@xylabs/tsconfig-react": "^4.2.6",
"@xyo-network/account": "^3.5.2",
"@xyo-network/node-memory": "^3.5.2",
"@xyo-network/account": "^3.6.0",
"@xyo-network/node-memory": "^3.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"storybook": "^8.4.7",
Expand All @@ -86,5 +86,6 @@
"publishConfig": {
"access": "public"
},
"docs": "dist/docs.json"
"docs": "dist/docs.json",
"stableVersion": "4.2.14"
}
4 changes: 2 additions & 2 deletions packages/modules/packages/archivist/src/hooks/queries/useArchivistGet.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Hash } from '@xylabs/hex'
import { usePromise } from '@xylabs/react-promise'
import type { ArchivistInstance } from '@xyo-network/archivist-model'
import type { Payload, WithMeta } from '@xyo-network/payload-model'
import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
import type { RefreshCallback } from '@xyo-network/react-module'
import { useRefresh } from '@xyo-network/react-module'

Expand All @@ -13,7 +13,7 @@ export const useArchivistGet = <T extends Payload = Payload>(

const [payloads, error] = usePromise(async () => {
if (enabled && archivist && hashes) {
return (await archivist.get(hashes)) as WithMeta<T>[]
return (await archivist.get(hashes)) as WithStorageMeta<T>[]
}
}, [archivist, hashes, enabled])

Expand Down
4 changes: 2 additions & 2 deletions packages/modules/packages/archivist/src/hooks/queries/useWeakArchivistGet.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Hash } from '@xylabs/hex'
import { usePromise } from '@xylabs/react-promise'
import type { ArchivistInstance } from '@xyo-network/archivist-model'
import type { Payload, WithMeta } from '@xyo-network/payload-model'
import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
import type { RefreshCallback } from '@xyo-network/react-module'
import { useRefresh } from '@xyo-network/react-module'

Expand All @@ -14,7 +14,7 @@ export const useWeakArchivistGet = <T extends Payload = Payload>(
const [payloads, error] = usePromise(async () => {
const archivistInstance = archivist?.deref()
if (enabled && archivistInstance && hashes) {
return (await archivistInstance.get(hashes)) as WithMeta<T>[]
return (await archivistInstance.get(hashes)) as WithStorageMeta<T>[]
}
}, [archivist, hashes, enabled])

Expand Down
11 changes: 6 additions & 5 deletions packages/modules/packages/diviner/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-diviner",
"version": "4.2.14",
"version": "4.3.0-rc.2",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -43,9 +43,9 @@
"lint-pkg": "npmPkgJsonLint ."
},
"dependencies": {
"@xylabs/exists": "^4.4.25",
"@xyo-network/diviner-model": "^3.5.2",
"@xyo-network/module-model": "^3.5.2",
"@xylabs/exists": "^4.4.26",
"@xyo-network/diviner-model": "^3.6.0",
"@xyo-network/module-model": "^3.6.0",
"@xyo-network/react-node": "workspace:^"
},
"devDependencies": {
Expand All @@ -63,5 +63,6 @@
"publishConfig": {
"access": "public"
},
"docs": "dist/docs.json"
"docs": "dist/docs.json",
"stableVersion": "4.2.14"
}
Loading

0 comments on commit c471b0f

Please sign in to comment.