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

Jump to bottom

chore: update dependencies #2

Merged
merged 2 commits into from
Jan 9, 2024
Merged

chore: update dependencies #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c9d624
feat: add cluster select to header
beeman Jan 9, 2024
c249ef4
chore: update dependencies
beeman Jan 9, 2024
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
3 changes: 2 additions & 1 deletion apps/web/src/app/app-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { UiHeader, UiLayout, UiMenu, UiThemeSwitch } from '@pubkey-ui/core'
import { IconSettings, IconUser, IconUserCog } from '@tabler/icons-react'
import { ReactNode } from 'react'
import { AccountChecker } from './features/account/account-ui'
import { ClusterChecker } from './features/cluster/cluster-ui'
import { ClusterChecker, ClusterUiSelect } from './features/cluster/cluster-ui'

export function AppLayout({ children }: { children: ReactNode }) {
return (
Expand All @@ -18,6 +18,7 @@ export function AppLayout({ children }: { children: ReactNode }) {
]}
profile={
<Group>
<ClusterUiSelect />
<UiThemeSwitch />
<UiMenu
position="bottom-end"
Expand Down
86 changes: 43 additions & 43 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,67 +15,67 @@
"dependencies": {
"@beeman/preset-anchor": "^2.0.0",
"@coral-xyz/anchor": "^0.29.0",
"@mantine/core": "^7.3.0",
"@mantine/dates": "^7.3.0",
"@mantine/dropzone": "^7.3.0",
"@mantine/form": "^7.3.0",
"@mantine/hooks": "^7.3.0",
"@mantine/modals": "^7.3.0",
"@mantine/notifications": "^7.3.0",
"@mantine/spotlight": "^7.3.0",
"@nx/devkit": "17.2.7",
"@mantine/core": "^7.4.1",
"@mantine/dates": "^7.4.1",
"@mantine/dropzone": "^7.4.1",
"@mantine/form": "^7.4.1",
"@mantine/hooks": "^7.4.1",
"@mantine/modals": "^7.4.1",
"@mantine/notifications": "^7.4.1",
"@mantine/spotlight": "^7.4.1",
"@nx/devkit": "17.2.8",
"@pubkeyapp/wallet-adapter-mantine-ui": "^2.3.0",
"@solana/spl-token": "^0.3.9",
"@solana/spl-token": "^0.3.11",
"@solana/wallet-adapter-base": "^0.9.23",
"@solana/wallet-adapter-react": "^0.15.35",
"@solana/wallet-adapter-react-ui": "^0.9.34",
"@solana/wallet-adapter-solflare": "^0.6.28",
"@solana/web3.js": "^1.87.6",
"@solana/web3.js": "^1.88.0",
"@swc/helpers": "~0.5.3",
"@tabler/icons-react": "^2.42.0",
"@tanstack/react-query": "^5.12.2",
"clsx": "^2.0.0",
"core-js": "^3.33.3",
"create-nx-workspace": "17.1.3",
"@tabler/icons-react": "^2.45.0",
"@tanstack/react-query": "^5.17.9",
"clsx": "^2.1.0",
"core-js": "^3.35.0",
"create-nx-workspace": "17.2.8",
"dayjs": "^1.11.10",
"jotai": "^2.6.0",
"jotai": "^2.6.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "^6.20.1",
"react-router-dom": "^6.21.1",
"timeago-react": "^3.0.6",
"tslib": "^2.6.2"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.7",
"@babel/preset-react": "^7.23.3",
"@nx/eslint": "17.2.7",
"@nx/eslint-plugin": "17.2.7",
"@nx/jest": "17.2.7",
"@nx/js": "17.2.7",
"@nx/plugin": "17.2.7",
"@nx/react": "17.2.7",
"@nx/rollup": "17.2.7",
"@nx/webpack": "17.2.7",
"@nx/workspace": "17.2.7",
"@nx/eslint": "17.2.8",
"@nx/eslint-plugin": "17.2.8",
"@nx/jest": "17.2.8",
"@nx/js": "17.2.8",
"@nx/plugin": "17.2.8",
"@nx/react": "17.2.8",
"@nx/rollup": "17.2.8",
"@nx/webpack": "17.2.8",
"@nx/workspace": "17.2.8",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@rollup/plugin-url": "^8.0.2",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@swc-node/register": "~1.6.8",
"@swc/cli": "~0.1.63",
"@swc/core": "~1.3.100",
"@swc/core": "~1.3.102",
"@testing-library/react": "14.1.2",
"@types/jest": "^29.5.10",
"@types/node": "18.16.9",
"@types/react": "18.2.42",
"@types/react-dom": "18.2.17",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@types/jest": "^29.5.11",
"@types/node": "20.10.8",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"babel-jest": "^29.7.0",
"commander": "^11.1.0",
"eslint": "8.48.0",
"eslint": "8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
Expand All @@ -84,17 +84,17 @@
"jest-environment-jsdom": "^29.7.0",
"json-schema-to-typescript": "^13.1.1",
"lint-staged": "^15.2.0",
"nx": "17.2.7",
"postcss": "^8.4.32",
"postcss-preset-mantine": "^1.11.1",
"nx": "17.2.8",
"postcss": "^8.4.33",
"postcss-preset-mantine": "^1.12.3",
"postcss-simple-vars": "^7.0.1",
"prettier": "^2.6.2",
"react-refresh": "^0.14.0",
"ts-jest": "^29.1.1",
"ts-node": "10.9.1",
"typescript": "~5.3.2",
"ts-node": "10.9.2",
"typescript": "~5.3.3",
"url-loader": "^4.1.1",
"verdaccio": "^5.27.1"
"verdaccio": "^5.29.0"
},
"lint-staged": {
"*.{js,json,css,scss,md,ts,tsx,html,graphql}": [
Expand Down
8 changes: 4 additions & 4 deletions packages/generators/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "@pubkey-ui/generators",
"version": "0.0.1",
"dependencies": {
"@nx/devkit": "17.2.7",
"@nx/devkit": "17.2.8",
"tslib": "^2.3.0",
"@nx/js": "17.2.7",
"@nx/react": "17.2.7",
"@nx/js": "17.2.8",
"@nx/react": "17.2.8",
"@beeman/preset-anchor": "2.0.0",
"@nx/eslint": "17.2.7"
"@nx/eslint": "17.2.8"
},
"type": "commonjs",
"main": "./src/index.js",
Expand Down
155 changes: 140 additions & 15 deletions packages/generators/src/generators/component/__snapshots__/component-generator.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,6 +1309,135 @@ exports[`component generator should create files for form 1`] = `
}
`;

exports[`component generator should create files for grid-routes 1`] = `
{
".prettierrc": {
"content": [
"{ "singleQuote": true }",
],
"isBinary": false,
"path": "./.prettierrc",
},
"nx.json": {
"content": [
"{",
""affected": { "defaultBase": "main" },",
""targetDefaults": { "build": { "cache": true }, "lint": { "cache": true } }",
"}",
],
"isBinary": false,
"path": "./nx.json",
},
"package.json": {
"content": [
"{",
""name": "@proj/source",",
""dependencies": {},",
""devDependencies": {}",
"}",
],
"isBinary": false,
"path": "./package.json",
},
"test": {
"children": {
"index.ts": {
"content": [
"export * from './ui-grid-routes';",
],
"isBinary": false,
"path": "./test/index.ts",
},
"ui-grid-routes.tsx": {
"content": [
"import {",
"Grid,",
"GridColProps,",
"GridProps,",
"NavLink,",
"NavLinkProps,",
"} from '@mantine/core';",
"import { ReactNode, useMemo } from 'react';",
"import { Link, Navigate, useLocation, useRoutes } from 'react-router-dom';",
"import { UiNotFound } from '../ui-not-found';",
"export interface UiGridRoute extends NavLinkProps {",
"path: string;",
"label?: ReactNode;",
"element: ReactNode;",
"}",
"export interface UiGridRoutesProps extends GridProps {",
"basePath: string;",
"routes: UiGridRoute[];",
"leftColProps?: GridColProps;",
"rightColProps?: GridColProps;",
"}",
"export function UiGridRoutes({",
"basePath,",
"routes,",
"leftColProps,",
"rightColProps,",
"...props",
"}: UiGridRoutesProps) {",
"const { pathname } = useLocation();",
"const links = useMemo(",
"() =>",
"routes",
".filter((app) => app.label)",
".map(({ path, label, element, ...props }) => {",
"const to = \`\${basePath}/\${path}\`;",
"return (",
"<NavLink",
"active={pathname.startsWith(to)}",
"component={Link}",
"key={path}",
"label={label}",
"to={to}",
"{...props}",
"/>",
");",
"}),",
"[basePath, pathname, routes]",
");",
"const router = useRoutes([",
"{ index: true, element: <Navigate to={routes[0].path} replace /> },",
"...routes.map((item) => ({",
"path: \`\${item.path}/*\`,",
"element: item.element,",
"})),",
"{ path: '*', element: <UiNotFound to={basePath} /> },",
"]);",
"return (",
"<Grid {...props}>",
"<Grid.Col span={{ base: 12, sm: 2 }} {...rightColProps}>",
"{links}",
"</Grid.Col>",
"<Grid.Col span={{ base: 12, sm: 10 }} {...leftColProps}>",
"{router}",
"</Grid.Col>",
"</Grid>",
");",
"}",
],
"isBinary": false,
"path": "./test/ui-grid-routes.tsx",
},
},
"path": "./test",
},
"tsconfig.base.json": {
"content": [
"{",
""compilerOptions": {",
""paths": {}",
"}",
"}",
],
"isBinary": false,
"path": "./tsconfig.base.json",
},
}
`;

exports[`component generator should create files for group 1`] = `
{
".prettierrc": {
Expand Down Expand Up @@ -2488,43 +2617,43 @@ exports[`component generator should create files for tab-routes 1`] = `
"useNavigate,",
"} from 'react-router-dom';",
"export interface UiTabRoute {",
"component: ReactNode;",
"element: ReactNode;",
"label: ReactElement | string;",
"value: string;",
"path: string;",
"}",
"export function UiTabRoutes({",
"grow = false,",
"tabs,",
"baseUrl,",
"basePath,",
"...props",
"}: Omit<TabsProps, 'children'> & {",
"children?: ReactNode;",
"baseUrl?: string;",
"basePath?: string;",
"grow?: boolean;",
"tabs: UiTabRoute[];",
"}) {",
"const navigate = useNavigate();",
"const location = useLocation();",
"// Set the active tab based on matching the location pathname with the tab value",
"// Set the active tab based on matching the location pathname with the tab path",
"const activeTab = tabs.find((tab) =>",
"location.pathname.includes(\`/\${tab.value}\`)",
")?.value;",
"location.pathname.includes(\`/\${tab.path}\`)",
")?.path;",
"// Set default redirect route to the first tab",
"const redirect =",
"tabs.length && tabs[0].value !== '' ? tabs[0].value : undefined;",
"tabs.length && tabs[0].path !== '' ? tabs[0].path : undefined;",
"return (",
"<Box>",
"<Tabs",
"value={activeTab}",
"onChange={(value) =>",
"navigate(\`\${baseUrl ? \`\${baseUrl}/\${value}\` : value}\`)",
"navigate(\`\${basePath ? \`\${basePath}/\${value}\` : value}\`)",
"}",
"mb="md"",
"{...props}",
">",
"<Tabs.List grow={grow}>",
"{tabs.map((tab) => (",
"<Tabs.Tab key={tab.value} value={tab.value}>",
"<Tabs.Tab key={tab.path} value={tab.path}>",
"<Text>{tab.label}</Text>",
"</Tabs.Tab>",
"))}",
Expand All @@ -2535,11 +2664,7 @@ exports[`component generator should create files for tab-routes 1`] = `
"<Route index element={<Navigate replace to={\`./\${redirect}\`} />} />",
") : null}",
"{tabs.map((tab) => (",
"<Route",
"key={tab.value}",
"path={\`\${tab.value}/*\`}",
"element={tab.component}",
"/>",
"<Route key={tab.path} path={\`\${tab.path}/*\`} element={tab.element} />",
"))}",
"<Route path="*" element={<Navigate replace to={\`./\${redirect}\`} />} />",
"</Routes>",
Expand Down
Loading
Loading