Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
jonesmac committed Sep 25, 2024
2 parents eaf9c24 + f4b331f commit 206d688
Show file tree
Hide file tree
Showing 94 changed files with 1,970 additions and 2,026 deletions.
8 changes: 0 additions & 8 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ nmHoistingLimits: none
nodeLinker: node-modules

packageExtensions:
"@storybook/mdx1-csf@*":
peerDependencies:
"@babel/core": "*"
react: "*"
eslint-config-react-app@*:
peerDependencies:
"@babel/plugin-syntax-flow": "*"
"@babel/plugin-transform-react-jsx": "*"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
Expand Down
53 changes: 26 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/sdk-xyo-react",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -47,14 +47,13 @@
"start": "storybook dev -p 6006"
},
"resolutions": {
"@mui/x-tree-view": "^6.0.0-alpha.1",
"ethers": "^6",
"typedoc": "0.26.3"
},
"dependencies": {
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@xyo-network/react-modules": "workspace:^",
"@xyo-network/react-plugins": "workspace:^",
"@xyo-network/react-sdk": "workspace:^",
Expand All @@ -71,36 +70,36 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@eslint-react/eslint-plugin": "^1.14.2",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@storybook/addon-actions": "^8.3.2",
"@storybook/addon-docs": "^8.3.2",
"@storybook/addon-essentials": "^8.3.2",
"@storybook/addon-interactions": "^8.3.2",
"@storybook/addon-links": "^8.3.2",
"@storybook/addon-mdx-gfm": "^8.3.2",
"@storybook/addon-onboarding": "^8.3.2",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@storybook/addon-actions": "^8.3.3",
"@storybook/addon-docs": "^8.3.3",
"@storybook/addon-essentials": "^8.3.3",
"@storybook/addon-interactions": "^8.3.3",
"@storybook/addon-links": "^8.3.3",
"@storybook/addon-mdx-gfm": "^8.3.3",
"@storybook/addon-onboarding": "^8.3.3",
"@storybook/addon-webpack5-compiler-swc": "^1.0.5",
"@storybook/blocks": "^8.3.2",
"@storybook/components": "^8.3.2",
"@storybook/core-events": "^8.3.2",
"@storybook/react": "^8.3.2",
"@storybook/react-vite": "^8.3.2",
"@storybook/test": "^8.3.2",
"@storybook/theming": "^8.3.2",
"@storybook/blocks": "^8.3.3",
"@storybook/components": "^8.3.3",
"@storybook/core-events": "^8.3.3",
"@storybook/react": "^8.3.3",
"@storybook/react-vite": "^8.3.3",
"@storybook/test": "^8.3.3",
"@storybook/theming": "^8.3.3",
"@stylistic/eslint-plugin": "^2.8.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"@xylabs/eslint-config-flat": "^4.0.7",
"@xylabs/eslint-config-react-flat": "^4.0.7",
"@xylabs/pixel": "^2.0.6",
"@xylabs/react-button": "^4.2.13",
"@xylabs/react-flexbox": "^4.2.13",
"@xylabs/react-invertible-theme": "^4.2.13",
"@xylabs/react-pixel": "^4.2.13",
"@xylabs/react-shared": "^4.2.13",
"@xylabs/react-button": "^5.0.0",
"@xylabs/react-flexbox": "^5.0.0",
"@xylabs/react-invertible-theme": "^5.0.0",
"@xylabs/react-pixel": "^5.0.0",
"@xylabs/react-shared": "^5.0.0",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"chromatic": "^11.10.4",
Expand Down
14 changes: 7 additions & 7 deletions packages/modules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-modules",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -53,9 +53,9 @@
"devDependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"geojson": "^0.5.0",
Expand All @@ -66,9 +66,9 @@
"peerDependencies": {
"@emotion/react": "^11",
"@emotion/styled": "^11",
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"geojson": "^0.5",
"react": "^18",
"react-dom": "^18"
Expand Down
24 changes: 12 additions & 12 deletions packages/modules/packages/archivist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-archivist",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -45,10 +45,10 @@
"dependencies": {
"@xylabs/exists": "^4.0.10",
"@xylabs/hex": "^4.0.10",
"@xylabs/react-async-effect": "^4.2.13",
"@xylabs/react-button": "^4.2.13",
"@xylabs/react-flexbox": "^4.2.13",
"@xylabs/react-promise": "^4.2.13",
"@xylabs/react-async-effect": "^5.0.0",
"@xylabs/react-button": "^5.0.0",
"@xylabs/react-flexbox": "^5.0.0",
"@xylabs/react-promise": "^5.0.0",
"@xyo-network/archivist-memory": "^3.1.13",
"@xyo-network/archivist-model": "^3.1.13",
"@xyo-network/boundwitness-builder": "^3.1.13",
Expand All @@ -63,10 +63,10 @@
"react-icons": "^5.3.0"
},
"devDependencies": {
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@storybook/react": "^8.3.2",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@storybook/react": "^8.3.3",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"@xyo-network/account": "^3.1.13",
Expand All @@ -77,9 +77,9 @@
"typescript": "^5.6.2"
},
"peerDependencies": {
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"react": "^18",
"react-dom": "^18"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/modules/packages/diviner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-diviner",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -54,9 +54,9 @@
"typescript": "^5.6.2"
},
"peerDependencies": {
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"react": "^18",
"react-dom": "^18"
},
Expand Down
26 changes: 13 additions & 13 deletions packages/modules/packages/module/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-module",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -44,20 +44,20 @@
},
"dependencies": {
"@xylabs/eth-address": "^4.0.10",
"@xylabs/react-button": "^4.2.13",
"@xylabs/react-crypto": "^4.2.13",
"@xylabs/react-flexbox": "^4.2.13",
"@xylabs/react-promise": "^4.2.13",
"@xylabs/react-button": "^5.0.0",
"@xylabs/react-crypto": "^5.0.0",
"@xylabs/react-flexbox": "^5.0.0",
"@xylabs/react-promise": "^5.0.0",
"@xyo-network/diviner-model": "^3.1.13",
"@xyo-network/module-model": "^3.1.13",
"@xyo-network/react-shared": "workspace:^"
},
"devDependencies": {
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@storybook/react": "^8.3.2",
"@xylabs/react-async-effect": "^4.2.13",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@storybook/react": "^8.3.3",
"@xylabs/react-async-effect": "^5.0.0",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"@xyo-network/archivist": "^3.1.13",
Expand All @@ -70,9 +70,9 @@
"typescript": "^5.6.2"
},
"peerDependencies": {
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"react": "^18",
"react-dom": "^18"
},
Expand Down
20 changes: 10 additions & 10 deletions packages/modules/packages/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-node",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -45,18 +45,18 @@
"dependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@mui/system": "^5.16.7",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@mui/system": "^6.1.1",
"@mui/x-tree-view": "^7.18.0",
"@xylabs/exists": "^4.0.10",
"@xylabs/logger": "^4.0.10",
"@xylabs/object": "^4.0.10",
"@xylabs/react-async-effect": "^4.2.13",
"@xylabs/react-flexbox": "^4.2.13",
"@xylabs/react-promise": "^4.2.13",
"@xylabs/react-shared": "^4.2.13",
"@xylabs/react-async-effect": "^5.0.0",
"@xylabs/react-flexbox": "^5.0.0",
"@xylabs/react-promise": "^5.0.0",
"@xylabs/react-shared": "^5.0.0",
"@xyo-network/module-abstract": "^3.1.13",
"@xyo-network/module-model": "^3.1.13",
"@xyo-network/node-model": "^3.1.13",
Expand All @@ -65,7 +65,7 @@
"@xyo-network/react-node-provider": "workspace:^"
},
"devDependencies": {
"@storybook/react": "^8.3.2",
"@storybook/react": "^8.3.3",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"@xyo-network/node-memory": "^3.1.13",
Expand Down
8 changes: 4 additions & 4 deletions packages/modules/packages/node/packages/context/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-node-context",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -53,9 +53,9 @@
"typescript": "^5.6.2"
},
"peerDependencies": {
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"react": "^18",
"react-dom": "^18"
},
Expand Down
18 changes: 9 additions & 9 deletions packages/modules/packages/node/packages/provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xyo-network/react-node-provider",
"version": "3.0.23",
"version": "4.0.0",
"description": "Common React library for all XYO projects that use React",
"keywords": [
"xyo",
Expand Down Expand Up @@ -44,28 +44,28 @@
},
"dependencies": {
"@xylabs/forget": "^4.0.10",
"@xylabs/react-async-effect": "^4.2.13",
"@xylabs/react-shared": "^4.2.13",
"@xylabs/react-async-effect": "^5.0.0",
"@xylabs/react-shared": "^5.0.0",
"@xyo-network/module-model": "^3.1.13",
"@xyo-network/node-memory": "^3.1.13",
"@xyo-network/node-model": "^3.1.13",
"@xyo-network/react-node-context": "workspace:^",
"@xyo-network/react-shared": "workspace:^"
},
"devDependencies": {
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@mui/icons-material": "^6.1.1",
"@mui/material": "^6.1.1",
"@mui/styles": "^6.1.1",
"@xylabs/ts-scripts-yarn3": "^4.0.7",
"@xylabs/tsconfig-react": "^4.0.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.6.2"
},
"peerDependencies": {
"@mui/icons-material": "^5",
"@mui/material": "^5",
"@mui/styles": "^5",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/styles": "^6",
"react": "^18",
"react-dom": "^18"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChevronRight as ChevronRightIcon, ExpandMore as ExpandMoreIcon } from '@mui/icons-material'
import { styled, Typography } from '@mui/material'
import { TreeView } from '@mui/x-tree-view'
import { SimpleTreeView } from '@mui/x-tree-view'
import type { FlexBoxProps } from '@xylabs/react-flexbox'
import type { ModuleInstance } from '@xyo-network/module-model'
import React, { useRef } from 'react'
Expand All @@ -21,8 +21,7 @@ export const ModuleDescriptionBox: React.FC<ModuleDescriptionProps> = ({ mod })
<Typography variant="h4">Node Configuration</Typography>
<StyledTreeView
aria-label="file system navigator"
defaultCollapseIcon={<ExpandMoreIcon />}
defaultExpandIcon={<ChevronRightIcon />}
slots={{ collapseIcon: ExpandMoreIcon, expandIcon: ChevronRightIcon }}
sx={{ flexGrow: 1 }}
>
<RenderModule mod={mod} idRef={idRef} />
Expand All @@ -36,7 +35,7 @@ export const ModuleDescriptionBox: React.FC<ModuleDescriptionProps> = ({ mod })
)
}

const StyledTreeView = styled(TreeView, { name: 'StyledTreeView' })(() => ({
const StyledTreeView = styled(SimpleTreeView, { name: 'StyledTreeView' })(() => ({
height: 'auto',
maxWidth: 'auto',
}))
Loading

0 comments on commit 206d688

Please sign in to comment.